diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
index 2d4f30a3b..9bc993922 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
@@ -8,11 +8,9 @@
 <div class="row" data-bind="visible: dataFolderAccess">
 	<div class="alert alert-error span8" style="margin-top: 10px;">
 		<h4 data-i18n="TAB_GENERAL/ALERT_WARNING"></h4>
-		<br>
-		<span data-i18n="TAB_GENERAL/ALERT_DATA_ACCESS"></span>
-		&nbsp;
-		<a href="https://www.rainloop.net/docs/installation/#notice"
-			target="_blank"><strong>https://www.rainloop.net/docs/installation</strong></a>
+		<div data-i18n="TAB_GENERAL/ALERT_DATA_ACCESS"></div>
+		<a href="https://github.com/the-djmaze/snappymail/wiki/Installation-instructions#secure-data-folder"
+			target="_blank"><strong>https://github.com/the-djmaze/snappymail/wiki/Installation-instructions</strong></a>
 	</div>
 </div>
 <div class="form-horizontal">
@@ -97,7 +95,7 @@
 			<br>
 			<br>
 			<div class="alert alert-info">
-				<b>PHP:</b>&nbsp;<!-- ko text: uploadDataDesc --><!-- /ko -->
+				<b>PHP: </b><!-- ko text: uploadDataDesc --><!-- /ko -->
 			</div>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
index b56b24597..41e06a9c7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
@@ -22,7 +22,7 @@
 
 <div data-bind="visible: packagesUpdate().length">
 	<div class="legend">
-		<span data-i18n="TAB_PACKAGES/LEGEND_AVAILABLE_FOR_UPDATE"></span>&nbsp;
+		<span data-i18n="TAB_PACKAGES/LEGEND_AVAILABLE_FOR_UPDATE"></span>
 		(<span data-bind="text: packagesUpdate().length"></span>)
 	</div>
 	<div data-bind="template: { name: 'AdminSettingsPackagesTable', data: {f: packagesUpdate} }"></div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
index d670d3152..711348514 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
@@ -65,8 +65,7 @@
 					inline: true
 				}
 			}"></div>
-			&nbsp;&nbsp;
-			<span style="color:red">(<span data-i18n="HINTS/UNSTABLE"></span>)</span>
+			<span style="color:red"> (<span data-i18n="HINTS/UNSTABLE"></span>)</span>
 			<br>
 			<div data-bind="component: {
 				name: 'Checkbox',
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index e68aa6685..4422f2a66 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -6,8 +6,7 @@
 	<div class="row" data-bind="visible: !edit()" style="margin-bottom: 20px;">
 		<div class="span5">
 			<span data-i18n="POPUPS_DOMAIN/LABEL_NAME"></span>
-			&nbsp;
-			<span style="color: #aaa">(<span data-i18n="POPUPS_DOMAIN/NAME_HELPER"></span>)</span>
+			<span style="opacity:0.7"> (<span data-i18n="POPUPS_DOMAIN/NAME_HELPER"></span>)</span>
 			<br>
 			<input type="text" class="span4" autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 				data-bind="textInput: name">
@@ -56,8 +55,7 @@
 						inline: true
 					}
 				}"></div>
-				&nbsp;&nbsp;
-				<span style="color: #aaa">(user@domain.com → user)</span>
+				<span style="opacity:0.7"> (user@domain.com → user)</span>
 			</div>
 
 			<input type="radio" name="helptabs" id="tab-help2">
@@ -98,8 +96,7 @@
 							inline: true
 						}
 					}"></div>
-					&nbsp;&nbsp;
-					<span style="color: #aaa">(user@domain.com → user)</span>
+					<span style="opacity:0.7"> (user@domain.com → user)</span>
 					<div data-bind="component: {
 						name: 'Checkbox',
 						params: {
@@ -126,8 +123,7 @@
 						inline: true
 					}
 				}"></div>
-				&nbsp;&nbsp;
-				<span style="color:red">(<span data-i18n="HINTS/BETA"></span>)</span>
+				<span style="color:red"> (<span data-i18n="HINTS/BETA"></span>)</span>
 			</div>
 
 			<input type="radio" name="helptabs" id="tab-help3">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
index 3b68bacae..03488ac4e 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
@@ -2,7 +2,6 @@
 	<a href="#" class="close" data-bind="click: close">×</a>
 	<h4>
 		<span data-i18n="POPUPS_PLUGIN/TITLE_PLUGIN"></span>
-		&nbsp;
 		"<span data-bind="text: name"></span>"
 	</h4>
 	<span data-bind="visible: hasReadme, text: readme"></span>