diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug
index 595fb64a29..0daff32865 100644
--- a/services/web/app/views/user/settings.pug
+++ b/services/web/app/views/user/settings.pug
@@ -46,7 +46,7 @@ block content
 															ng-if="!userEmail.default"
 															ng-click="removeUserEmail(userEmail.email)"
 														) Remove
-												tr(
+												tr.affiliations-table-highlighted-row(
 													ng-if="ui.isLoadingEmails"
 												)
 													td.text-center(colspan="3") 
@@ -60,13 +60,13 @@ block content
 														a(
 															href
 															ng-click="showAddEmailForm()"
-														) Add new email
+														) Add another email
 
-												tr(
+												tr.affiliations-table-highlighted-row(
 													ng-if="ui.showAddEmailUI"
 												)
 													td
-														p
+														.affiliations-form-group
 															input-suggestions(
 																ng-model="newAffiliation.email"
 																ng-model-options="{ allowInvalid: true }"
@@ -79,7 +79,7 @@ block content
 																input-required="true"
 															)
 													td
-														p(
+														div(
 															ng-if="newAffiliation.university && !ui.showManualUniversitySelectionUI"
 														)
 															| {{ newAffiliation.university.name }} (
@@ -88,10 +88,10 @@ block content
 																ng-click="selectUniversityManually();"
 															) change
 															| )
-														p(
+														div(
 															ng-if="!newAffiliation.university && !ui.isValidEmail && !ui.showManualUniversitySelectionUI"
 														) Start by adding your email address.
-														p(
+														div(
 															ng-if="!newAffiliation.university && ui.isValidEmail && !ui.isBlacklistedEmail && !ui.showManualUniversitySelectionUI"
 														)
 															| Is your email affiliated with an institution? 
@@ -102,21 +102,21 @@ block content
 															) Let us know
 														div(
 															ng-if="ui.showManualUniversitySelectionUI"
-														)
-															p
+														ss)
+															.affiliations-form-group
 																ui-select(
 																	ng-model="newAffiliation.country"
 																)
 																	ui-select-match(
-																		placeholder="Select your country"
+																		placeholder="Country"
 																	) {{ $select.selected.name }}
 																	ui-select-choices(
 																		repeat="country in countries | filter: $select.search"
 																	)
 																		span(
 																			ng-bind="country.name"
-																		)
-															p
+																		s)
+															.affiliations-form-group
 																ui-select(
 																	ng-model="newAffiliation.university"
 																	ng-disabled="!newAffiliation.country"
@@ -124,7 +124,7 @@ block content
 																	tagging-label="false"
 																)
 																	ui-select-match(
-																		placeholder="Select your university"
+																		placeholder="Institution"
 																	) {{ $select.selected.name }}
 																	ui-select-choices(
 																		repeat="university in universities | filter: $select.search"
@@ -132,17 +132,18 @@ block content
 																		span(
 																			ng-bind="university.name"
 																		)
-														div(
-															ng-if="ui.isValidEmail && newAffiliation.university"
-														)
-															p
+															.affiliations-form-group(
+																ng-if="ui.isValidEmail && newAffiliation.university"
+															)
 																input.form-control(
 																	type="text"
 																	id="affiliations-role"
 																	placeholder="Role"
 																	ng-model="newAffiliation.role"
-																)
-															p
+																s)
+															.affiliations-form-group(
+																ng-if="ui.isValidEmail && newAffiliation.university"
+															)
 																input.form-control(
 																	type="text"
 																	id="affiliations-department"
diff --git a/services/web/public/stylesheets/app/account-settings.less b/services/web/public/stylesheets/app/account-settings.less
index 1cd57d3291..f89d0a5a2b 100644
--- a/services/web/public/stylesheets/app/account-settings.less
+++ b/services/web/public/stylesheets/app/account-settings.less
@@ -23,4 +23,13 @@
 	.affiliations-table-inline-actions {
 		width: 20%;
 	}
-	
\ No newline at end of file
+	.affiliations-table-highlighted-row {
+		background-color: tint(@content-alt-bg-color, 6%);
+	}
+
+	.affiliations-form-group {
+		margin-bottom: @table-cell-padding;
+		:last-of-type {
+			margin-bottom: 0;
+		}
+	}
\ No newline at end of file
diff --git a/services/web/public/stylesheets/components/input-suggestions.less b/services/web/public/stylesheets/components/input-suggestions.less
index bf2fd4a253..93afe4cfa4 100644
--- a/services/web/public/stylesheets/components/input-suggestions.less
+++ b/services/web/public/stylesheets/components/input-suggestions.less
@@ -5,7 +5,7 @@
 	.input-suggestions-main {
 		position: absolute;
 		top: 0;
-		background-color: transparent;
+		// background-color: transparent;
 	}
 
 	.input-suggestions-shadow {
diff --git a/services/web/public/stylesheets/components/ui-select.less b/services/web/public/stylesheets/components/ui-select.less
index a1ce7ecc8f..5513378629 100644
--- a/services/web/public/stylesheets/components/ui-select.less
+++ b/services/web/public/stylesheets/components/ui-select.less
@@ -48,4 +48,13 @@
 			}
 		}
 	}
+}
+
+.ui-select-container[tagging] {
+	.ui-select-toggle {
+		cursor: text;
+		> i.caret.pull-right {
+			display: none;
+		}
+	}
 }
\ No newline at end of file
diff --git a/services/web/public/stylesheets/core/ol-variables.less b/services/web/public/stylesheets/core/ol-variables.less
index 114d07a5b1..9f4eb29c95 100644
--- a/services/web/public/stylesheets/core/ol-variables.less
+++ b/services/web/public/stylesheets/core/ol-variables.less
@@ -65,6 +65,8 @@
 @btn-info-bg             : @ol-blue;
 @btn-info-border         : transparent;
 
+@padding-xs-horizontal   : 8px;
+
 // Alerts
 @alert-padding : 15px;
 @alert-border-radius : @border-radius-base;