diff --git a/dev/Styles/User/Layout.less b/dev/Styles/User/Layout.less
index fe4983127..106424510 100644
--- a/dev/Styles/User/Layout.less
+++ b/dev/Styles/User/Layout.less
@@ -346,13 +346,9 @@ html:not(.rl-mobile) .show-mobile {
 	display: none !important;
 }
 
-html.rl-mobile .width100-on-mobile {
-	width: 100% !important;
-}
-
 .e-paginator {
 
-	.e-page {
+	a {
 		opacity: 0.5;
 		text-decoration: none;
 		font-size: 22px;
diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js
index 62f8bdd64..b6eb202ee 100644
--- a/dev/View/Popup/Contacts.js
+++ b/dev/View/Popup/Contacts.js
@@ -460,7 +460,7 @@ class ContactsPopupView extends AbstractViewPopup {
 		const self = this;
 
 		dom.addEventListener('click', event => {
-			let el = event.target.closestWithin('.e-paginator .e-page', dom);
+			let el = event.target.closestWithin('.e-paginator a', dom);
 			if (el && ko.dataFor(el)) {
 				self.contactsPage(pInt(ko.dataFor(el).value));
 				self.reloadContactList();
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index f8358e7ea..fefc128a0 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -694,7 +694,7 @@ export class MailMessageList extends AbstractViewRight {
 				AppUserStore.focusedState(Scope.MessageList);
 			}
 
-			let el = eqs(event, '.e-paginator .e-page');
+			let el = eqs(event, '.e-paginator a');
 			el && this.gotoPage(ko.dataFor(el));
 
 			eqs(event, '.checkboxCheckAll') && this.checkAll(!this.checkAll());
diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html b/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html
index 902e37525..578645c69 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html
@@ -1,3 +1,3 @@
 <div class="e-paginator g-ui-user-select-none" data-bind="foreach: $data">
-	<a class="e-page" data-bind="css: { 'current': current, 'custom': custom }, title: title, text: name"></a>
+	<a data-bind="css: { 'current': current, 'custom': custom }, title: title, text: name"></a>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
index 901a7ac02..06a8844e0 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html
@@ -19,21 +19,13 @@
 			</div>
 		</div>
 
-		<div data-bind="visible: hasChanges">
-			<div class="span8 width100-on-mobile">
-				<div class="alert g-ui-user-select-none">
-					<i class="fontastic">⚠</i>
-					<span data-i18n="POPUPS_SIEVE_SCRIPT/CHANGES_NEED_TO_BE_SAVED_DESC"></span>
-				</div>
-			</div>
+		<div class="alert g-ui-user-select-none" data-bind="visible: hasChanges">
+			<i class="fontastic">⚠</i>
+			<span data-i18n="POPUPS_SIEVE_SCRIPT/CHANGES_NEED_TO_BE_SAVED_DESC"></span>
 		</div>
-		<div data-bind="visible: $root.saveError">
-			<div class="span8 width100-on-mobile">
-				<div class="alert alert-error g-ui-user-select-none">
-					<i class="fontastic">⚠</i>
-					<span data-bind="text: $root.saveErrorText"></span>
-				</div>
-			</div>
+		<div class="alert alert-error g-ui-user-select-none" data-bind="visible: $root.saveError">
+			<i class="fontastic">⚠</i>
+			<span data-bind="text: $root.saveErrorText"></span>
 		</div>
 
 		<div class="control-group" data-bind="visible: $root.rawActive">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
index 94f8012a6..a817b1522 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html
@@ -6,44 +6,36 @@
 			<i class="icon-spinner" style="margin-top: 5px" data-bind="visible: loading"></i>
 		</div>
 	</div>
-	<div class="row" data-bind="visible: serverError">
-		<div class="span8 width100-on-mobile">
-			<div class="alert alert-error g-ui-user-select-none" style="margin-bottom: 0">
-				<i class="fontastic">⚠</i>
-				<span data-bind="text: serverErrorDesc"></span>
-			</div>
-		</div>
-	</div>
-	<div class="row">
-		<div class="span8 width100-on-mobile">
-			<table class="table table-hover list-table g-ui-user-select-none"
-				data-bind="i18nUpdate: scripts">
-				<colgroup>
-					<col style="width: 30px" />
-					<col />
-					<col style="width: 140px" />
-					<col style="width: 1%" />
-				</colgroup>
-				<tbody data-bind="foreach: scripts">
-					<tr class="script-item">
-						<td>
-							<span class="disabled-script fontastic" data-bind="click: function (oScript) { $root.toggleScript(oScript); }, text: active() ? '☑' : '☐'"></span>
-						</td>
-						<td class="e-action" class="script-name" data-bind="text: name()"></td>
-						<td>
-							<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oScript) { $root.deleteScript(oScript); }"
-								data-i18n="GLOBAL/ARE_YOU_SURE"></a>
-						</td>
-						<td>
-							<span class="delete-script fontastic" data-bind="visible: !deleteAccess() && canBeDeleted(), click: function (oScript) { $root.scriptForDeletion(oScript); }">🗑</span>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-			<a class="btn" data-bind="click: $root.addScript">
-				<i class="fontastic">✚</i>
-				<span data-i18n="SETTINGS_FILTERS/BUTTON_ADD_SCRIPT"></span>
-			</a>
-		</div>
+	<div class="alert alert-error g-ui-user-select-none" data-bind="visible: serverError">
+		<i class="fontastic">⚠</i>
+		<span data-bind="text: serverErrorDesc"></span>
 	</div>
+	<table class="table table-hover list-table g-ui-user-select-none"
+		data-bind="i18nUpdate: scripts">
+		<colgroup>
+			<col style="width: 30px" />
+			<col />
+			<col style="width: 140px" />
+			<col style="width: 1%" />
+		</colgroup>
+		<tbody data-bind="foreach: scripts">
+			<tr class="script-item">
+				<td>
+					<span class="disabled-script fontastic" data-bind="click: function (oScript) { $root.toggleScript(oScript); }, text: active() ? '☑' : '☐'"></span>
+				</td>
+				<td class="e-action" class="script-name" data-bind="text: name()"></td>
+				<td>
+					<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oScript) { $root.deleteScript(oScript); }"
+						data-i18n="GLOBAL/ARE_YOU_SURE"></a>
+				</td>
+				<td>
+					<span class="delete-script fontastic" data-bind="visible: !deleteAccess() && canBeDeleted(), click: function (oScript) { $root.scriptForDeletion(oScript); }">🗑</span>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<a class="btn" data-bind="click: $root.addScript">
+		<i class="fontastic">✚</i>
+		<span data-i18n="SETTINGS_FILTERS/BUTTON_ADD_SCRIPT"></span>
+	</a>
 </div>
diff --git a/vendors/bootstrap/less/alerts.less b/vendors/bootstrap/less/alerts.less
index 7f3534cc2..773b2b174 100644
--- a/vendors/bootstrap/less/alerts.less
+++ b/vendors/bootstrap/less/alerts.less
@@ -14,6 +14,7 @@
   border: 1px solid @warningBorder;
   border-radius: 4px;
   color: @warningText;
+  max-width: 800px;
 }
 
 // Adjust close link position