[locationinfo] Clean up styling a bit more

13 files changed, 527 insertions, 576 deletions

diff --git a/modules-available/locationinfo/lang/de/template-tags.json b/modules-available/locationinfo/lang/de/template-tags.json
index c9cbe6c8..b376b905 100644
--- a/modules-available/locationinfo/lang/de/template-tags.json
+++ b/modules-available/locationinfo/lang/de/template-tags.json
@@ -5,6 +5,7 @@
     "lang_autoScale": "Auto Tage",
     "lang_autoscaleTooltip": "Berechnet anhand der Bildschirmbreite die optimale Anzahl an Tagen, die der Kalender anzeigt",
     "lang_backend": "Backend",
+    "lang_backendSettings": "Backend konfigurieren",
     "lang_backends": "Backends",
     "lang_blacklist": "Blacklist",
     "lang_bookmarks": "Lesezeichen",
diff --git a/modules-available/locationinfo/lang/en/template-tags.json b/modules-available/locationinfo/lang/en/template-tags.json
index b4d2a516..27315bea 100644
--- a/modules-available/locationinfo/lang/en/template-tags.json
+++ b/modules-available/locationinfo/lang/en/template-tags.json
@@ -5,6 +5,7 @@
     "lang_autoScale": "Auto Days",
     "lang_autoscaleTooltip": "Calculates the optimum amount of days to show from the display width",
     "lang_backend": "Backend",
+    "lang_backendSettings": "Configure backend",
     "lang_backends": "Backends",
     "lang_blacklist": "Blacklist",
     "lang_bookmarks": "Bookmarks",
diff --git a/modules-available/locationinfo/style.css b/modules-available/locationinfo/style.css
index ec6b3dd0..dce47c42 100644
--- a/modules-available/locationinfo/style.css
+++ b/modules-available/locationinfo/style.css
@@ -1,14 +1,4 @@
-.btn-static {
-  background-color: white;
-  border: 1px solid lightgrey;
-  cursor: default;
-}
-.btn-static:active{
-  -moz-box-shadow:    inset 0 0 0px white;
-  -webkit-box-shadow: inset 0 0 0px white;
-  box-shadow:         inset 0 0 0px white;
-}
 .spacebottop {
-  margin-bottom: 0.3em;
+  margin-bottom: 0;
   margin-top: 0.5em;
 }
diff --git a/modules-available/locationinfo/templates/ajax-config-location.html b/modules-available/locationinfo/templates/ajax-config-location.html
index 2ae049d1..530207f6 100644
--- a/modules-available/locationinfo/templates/ajax-config-location.html
+++ b/modules-available/locationinfo/templates/ajax-config-location.html
@@ -87,9 +87,8 @@
 
 <div class="row" style="margin-top: 20px; margin-right: 15px;">
 	<a class="pull-right" title="{{lang_goToLocationWarning}}" href='?do=locations#{{id}}'>
-		<span class="glyphicon glyphicon-new-window">
-			{{lang_goToLocation}}
-		</span>
+		{{lang_goToLocation}}
+		<span class="glyphicon glyphicon-arrow-right"></span>
 	</a>
 </div>
 <hr>
@@ -97,10 +96,10 @@
 
 <h3>{{lang_remoteSchedule}}</h3>
 <div class="row">
-	<div class="col-sm-3">
+	<div class="col-sm-4">
 		<label for="backend-select">{{lang_backend}}</label>
 	</div>
-	<div class="col-sm-7">
+	<div class="col-sm-8">
 		<select id="backend-select" class="form-control" name="serverid">
 			<option value="0">{{lang_noServer}}</option>
 			{{#serverlist}}
@@ -108,37 +107,31 @@
 			{{/serverlist}}
 		</select>
 	</div>
-	<div class="col-sm-2">
-		<p class="btn btn-static helptext" title="{{lang_serverTooltip}}">
-			<span class="glyphicon glyphicon-question-sign"></span>
-		</p>
+	<div class="col-sm-12 small text-muted slx-smallspace">
+		{{lang_serverTooltip}}
 	</div>
 </div>
 <div class="row">
-	<div class="col-sm-3"></div>
-	<div class="col-sm-7">
+	<div class="col-sm-4"></div>
+	<div class="col-sm-8">
 		<div class="checkbox">
 			<input type="checkbox" name="recursive" id="recursive-check">
 			<label for="recursive-check">{{lang_recursiveServerSet}}</label>
 		</div>
 	</div>
-	<div class="col-sm-2">
-		<p class="btn btn-static helptext" title="{{lang_recursiveSetTooltip}}">
-			<span class="glyphicon glyphicon-question-sign"></span>
-		</p>
+	<div class="col-sm-12 small text-muted slx-smallspace">
+		{{lang_recursiveSetTooltip}}
 	</div>
 </div>
 <div class="row">
-	<div class="col-sm-3">
+	<div class="col-sm-4">
 		<label for="roomid-input">{{lang_roomId}}</label>
 	</div>
-	<div class="col-sm-7">
+	<div class="col-sm-8">
 		<input id="roomid-input" class="form-control" name="serverlocationid" id="serverlocationid" value="{{serverlocationid}}">
 	</div>
-	<div class="col-sm-2">
-		<p class="btn btn-static helptext" title="{{lang_roomIdTooltip}}">
-			<span class="glyphicon glyphicon-question-sign"></span>
-		</p>
+	<div class="col-sm-12 small text-muted slx-smallspace">
+		{{lang_roomIdTooltip}}
 	</div>
 </div>
 
@@ -196,8 +189,6 @@
 
 		setTimepicker($('#settings-outer').find('.timepicker2'));
 
-		$('p.helptext').tooltip();
-
 		$('#new-openingtime').click(function (e) {
 			e.preventDefault();
 			setTimepicker(newOpeningTime({}).find('.timepicker2'));
diff --git a/modules-available/locationinfo/templates/ajax-config-server.html b/modules-available/locationinfo/templates/ajax-config-server.html
index 8c2cb3ba..c61927c0 100644
--- a/modules-available/locationinfo/templates/ajax-config-server.html
+++ b/modules-available/locationinfo/templates/ajax-config-server.html
@@ -1,43 +1,37 @@
 <div class="panel panel-default">
 	<div class="panel-heading">{{lang_general}}</div>
-	<div class="panel-body">
-		<div class="list-group">
-			<div class="list-group-item">
-				<div class="row">
-					<div class="col-md-3">
-						<label>{{lang_entryName}}</label>
-					</div>
-					<div class="col-md-7">
-						<input required class="form-control" name="name" type="text" value="{{name}}" id="name-input"
-								 form="form-{{currentbackend}}">
-					</div>
-					<div class="col-md-2">
-						<p class="btn btn-static" title="{{lang_nameTooltip}}">
-							<span class="glyphicon glyphicon-question-sign"></span>
-						</p>
-					</div>
+	<div class="list-group">
+		<div class="list-group-item">
+			<div class="row">
+				<div class="col-md-4">
+					<label>{{lang_entryName}}</label>
+				</div>
+				<div class="col-md-8">
+					<input required class="form-control" name="name" type="text" value="{{name}}" id="name-input"
+							 form="form-{{currentbackend}}">
+				</div>
+				<div class="col-sm-12 small text-muted spacebottop">
+					{{lang_nameTooltip}}
 				</div>
 			</div>
-			<div class="list-group-item">
-				<div class="row">
-					<div class="col-md-3">
-						<label>{{lang_serverType}}</label>
-					</div>
-					<div class="col-md-7">
-						<select class="form-control" onchange="servertype_changed(this.value)">
-							{{#defaultBlank}}
-								<option value="" selected>{{lang_pleaseSelect}}</option>
-							{{/defaultBlank}}
-							{{#backendList}}
-								<option value="{{backendtype}}" {{#active}}selected{{/active}}>{{display}}</option>
-							{{/backendList}}
-						</select>
-					</div>
-					<div class="col-md-2">
-						<p class="btn btn-static" id="help-type" title="{{lang_typeTooltip}}">
-							<span class="glyphicon glyphicon-question-sign"></span>
-						</p>
-					</div>
+		</div>
+		<div class="list-group-item">
+			<div class="row">
+				<div class="col-md-4">
+					<label>{{lang_serverType}}</label>
+				</div>
+				<div class="col-md-8">
+					<select class="form-control" onchange="servertype_changed(this.value)">
+						{{#defaultBlank}}
+							<option value="" selected>{{lang_pleaseSelect}}</option>
+						{{/defaultBlank}}
+						{{#backendList}}
+							<option value="{{backendtype}}" {{#active}}selected{{/active}}>{{display}}</option>
+						{{/backendList}}
+					</select>
+				</div>
+				<div class="col-sm-12 small text-muted spacebottop">
+					{{lang_typeTooltip}}
 				</div>
 			</div>
 		</div>
@@ -57,12 +51,10 @@
 
 		<div class="panel panel-default">
 			<div class="panel-heading">{{lang_credentials}}</div>
-			<div class="panel-body">
-				<div class="list-group">
-					{{#credentials}}
-					{{{credentialsHtml}}}
-					{{/credentials}}
-				</div>
+			<div class="list-group">
+				{{#credentials}}
+				{{{credentialsHtml}}}
+				{{/credentials}}
 			</div>
 		</div>
 	</form>
@@ -92,7 +84,6 @@
 		currentBackend = value;
 	}
 
-	$('p.btn[title]').tooltip();
 	$('#myModalSubmitButton').attr('form', 'form-' + currentBackend);
 	$('.settings-bs-switch').bootstrapSwitch({size:'small'});
 
diff --git a/modules-available/locationinfo/templates/page-config-panel-default.html b/modules-available/locationinfo/templates/page-config-panel-default.html
index 29fd0f16..1ffef408 100644
--- a/modules-available/locationinfo/templates/page-config-panel-default.html
+++ b/modules-available/locationinfo/templates/page-config-panel-default.html
@@ -20,96 +20,94 @@
 			<div class="col-md-6">
 				<div class="panel panel-default">
 					<div class="panel-heading">{{lang_generalSettings}}</div>
-					<div class="panel-body">
-						<div class="list-group">
-
-							<div class="list-group-item">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="panel-title">{{lang_displayName}}</label>
-									</div>
-									<div class="col-sm-8">
-										<input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_displayNameTooltip}}
-									</div>
+					<div class="list-group">
+
+						<div class="list-group-item">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="panel-title">{{lang_displayName}}</label>
+								</div>
+								<div class="col-sm-8">
+									<input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_displayNameTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="language">{{lang_language}}</label>
-									</div>
-									<div class="col-sm-8">
-										<select class="form-control" name="language" id="language">
-											{{#languages}}
-											<option value="{{cc}}" id="lang-{{cc}}" {{selected}}>{{name}}</option>
-											{{/languages}}
-										</select>
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_languageTooltip}}
-									</div>
+						<div class="list-group-item">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="language">{{lang_language}}</label>
+								</div>
+								<div class="col-sm-8">
+									<select class="form-control" name="language" id="language">
+										{{#languages}}
+										<option value="{{cc}}" id="lang-{{cc}}" {{selected}}>{{name}}</option>
+										{{/languages}}
+									</select>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_languageTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="input-eco">{{lang_ecoMode}}</label>
-									</div>
-									<div class="col-sm-8">
-										<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_ecoTooltip}}
-									</div>
+						<div class="list-group-item">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="input-eco">{{lang_ecoMode}}</label>
+								</div>
+								<div class="col-sm-8">
+									<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_ecoTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="input-prettytime">{{lang_prettytime}}</label>
-									</div>
-									<div class="col-sm-8">
-										<input id="input-prettytime" type="checkbox" name="prettytime" {{prettytime_checked}}>
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_prettytimeTooltip}}
-									</div>
+						<div class="list-group-item">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="input-prettytime">{{lang_prettytime}}</label>
+								</div>
+								<div class="col-sm-8">
+									<input id="input-prettytime" type="checkbox" name="prettytime" {{prettytime_checked}}>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_prettytimeTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="input-calupdate">{{lang_calendarUpdate}}</label>
-									</div>
-									<div class="col-sm-8">
-										<input class="form-control" name="calupdate" type="number" min="30" id="input-calupdate"
-												 max="1440" value="{{calupdate}}" required>
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_calupdateTooltip}}
-									</div>
+						<div class="list-group-item">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="input-calupdate">{{lang_calendarUpdate}}</label>
+								</div>
+								<div class="col-sm-8">
+									<input class="form-control" name="calupdate" type="number" min="30" id="input-calupdate"
+											 max="1440" value="{{calupdate}}" required>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_calupdateTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="form-roomupdate">{{lang_roomUpdate}}</label>
-									</div>
-									<div class="col-sm-8">
-										<input class="form-control" name="roomupdate" type="number" min="15" id="form-roomupdate"
-												 max="86400" value="{{roomupdate}}" required>
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_roomupdateTooltip}}
-									</div>
+						<div class="list-group-item">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="form-roomupdate">{{lang_roomUpdate}}</label>
+								</div>
+								<div class="col-sm-8">
+									<input class="form-control" name="roomupdate" type="number" min="15" id="form-roomupdate"
+											 max="86400" value="{{roomupdate}}" required>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_roomupdateTooltip}}
 								</div>
 							</div>
 						</div>
@@ -120,177 +118,175 @@
 			<div class="col-md-6">
 				<div class="panel panel-default" id="extra-div">
 					<div class="panel-heading">{{lang_mode}}</div>
-					<div class="panel-body">
-						<div class="list-group" id="overridableConfigs">
-							<div class="list-group-item">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="mode">{{lang_mode}}</label>
-									</div>
-									<div class="col-sm-8">
-										<select class="form-control" name="mode" id="mode" onchange="modeChange(id)">
-											<option value="1" id="mode1">{{lang_mode1}}</option>
-											<option value="2" id="mode2">{{lang_mode2}}</option>
-											<option value="3" id="mode3">{{lang_mode3}}</option>
-											<option value="4" id="mode4">{{lang_mode4}}</option>
-										</select>
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_modeTooltip}}
-									</div>
+					<div class="list-group" id="overridableConfigs">
+						<div class="list-group-item">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="mode">{{lang_mode}}</label>
+								</div>
+								<div class="col-sm-8">
+									<select class="form-control" name="mode" id="mode" onchange="modeChange(id)">
+										<option value="1" id="mode1">{{lang_mode1}}</option>
+										<option value="2" id="mode2">{{lang_mode2}}</option>
+										<option value="3" id="mode3">{{lang_mode3}}</option>
+										<option value="4" id="mode4">{{lang_mode4}}</option>
+									</select>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_modeTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="input-roomplanner">{{lang_useRoomplanner}}</label>
-									</div>
-									<div class="col-sm-8">
-										<select class="form-control" name="roomplanner" id="input-roomplanner">
-											<option value="0" id="roomplanner0">{{lang_countIp}}</option>
-											<option value="1" id="roomplanner1">{{lang_countRoomplan}}</option>
-										</select>
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_roomplannerTooltip}}
-									</div>
+						<div class="list-group-item">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="input-roomplanner">{{lang_useRoomplanner}}</label>
+								</div>
+								<div class="col-sm-8">
+									<select class="form-control" name="roomplanner" id="input-roomplanner">
+										<option value="0" id="roomplanner0">{{lang_countIp}}</option>
+										<option value="1" id="roomplanner1">{{lang_countRoomplan}}</option>
+									</select>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_roomplannerTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item m1-s m2-h m3-h m4-h">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="input-vertical">{{lang_vertical}}</label>
-									</div>
-									<div class="col-sm-8">
-										<input id="input-vertical" class="btstrpCheckbox" type="checkbox" name="vertical" {{vertical_checked}}>
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_verticalTooltip}}
-									</div>
+						<div class="list-group-item m1-s m2-h m3-h m4-h">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="input-vertical">{{lang_vertical}}</label>
+								</div>
+								<div class="col-sm-8">
+									<input id="input-vertical" class="btstrpCheckbox" type="checkbox" name="vertical" {{vertical_checked}}>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_verticalTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item m1-s m2-s m3-h m4-s">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="startday">{{lang_startDay}}</label>
-									</div>
-									<div class="col-sm-8">
-										<select class="form-control" id="startday" name="startday">
-											<option value="0">{{lang_currentDay}}</option>
-											<option value="1">{{lang_monday}}</option>
-											<option value="2">{{lang_thuesday}}</option>
-											<option value="3">{{lang_wednesday}}</option>
-											<option value="4">{{lang_thursday}}</option>
-											<option value="5">{{lang_friday}}</option>
-											<option value="6">{{lang_saturday}}</option>
-											<option value="7">{{lang_sunday}}</option>
-										</select>
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_startDayTooltip}}
-									</div>
+						<div class="list-group-item m1-s m2-s m3-h m4-s">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="startday">{{lang_startDay}}</label>
+								</div>
+								<div class="col-sm-8">
+									<select class="form-control" id="startday" name="startday">
+										<option value="0">{{lang_currentDay}}</option>
+										<option value="1">{{lang_monday}}</option>
+										<option value="2">{{lang_thuesday}}</option>
+										<option value="3">{{lang_wednesday}}</option>
+										<option value="4">{{lang_thursday}}</option>
+										<option value="5">{{lang_friday}}</option>
+										<option value="6">{{lang_saturday}}</option>
+										<option value="7">{{lang_sunday}}</option>
+									</select>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_startDayTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item m1-s m2-s m3-h m4-s">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="scaledaysauto">{{lang_autoScale}}</label>
-									</div>
-									<div class="col-sm-8">
-										<input id="scaledaysauto" class="btstrpCheckbox" type="checkbox" name="scaledaysauto" {{scaledaysauto_checked}}>
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_autoscaleTooltip}}
-									</div>
+						<div class="list-group-item m1-s m2-s m3-h m4-s">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="scaledaysauto">{{lang_autoScale}}</label>
+								</div>
+								<div class="col-sm-8">
+									<input id="scaledaysauto" class="btstrpCheckbox" type="checkbox" name="scaledaysauto" {{scaledaysauto_checked}}>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_autoscaleTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item m1-s m2-s m3-h m4-s">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="daystoshow">{{lang_daysToShow}}</label>
-									</div>
-									<div class="col-sm-8">
-										<select class="form-control" id="daystoshow" name="daystoshow">
-											<option value="1">1</option>
-											<option value="2">2</option>
-											<option value="3">3</option>
-											<option value="4">4</option>
-											<option value="5">5</option>
-											<option value="6">6</option>
-											<option value="7">7</option>
-										</select>
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_daysToShowTooltip}}
-									</div>
+						<div class="list-group-item m1-s m2-s m3-h m4-s">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="daystoshow">{{lang_daysToShow}}</label>
+								</div>
+								<div class="col-sm-8">
+									<select class="form-control" id="daystoshow" name="daystoshow">
+										<option value="1">1</option>
+										<option value="2">2</option>
+										<option value="3">3</option>
+										<option value="4">4</option>
+										<option value="5">5</option>
+										<option value="6">6</option>
+										<option value="7">7</option>
+									</select>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_daysToShowTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item m1-s m2-h m3-s m4-s">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="rotation">{{lang_rotation}}</label>
-									</div>
-									<div class="col-sm-8">
-										<select class="form-control" id="rotation" name="rotation">
-											<option value="0">{{lang_rotation0}}</option>
-											<option value="3">{{lang_rotation3}}</option>
-											<option value="2">{{lang_rotation2}}</option>
-											<option value="1">{{lang_rotation1}}</option>
-										</select>
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_rotationTooltip}}
-									</div>
+						<div class="list-group-item m1-s m2-h m3-s m4-s">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="rotation">{{lang_rotation}}</label>
+								</div>
+								<div class="col-sm-8">
+									<select class="form-control" id="rotation" name="rotation">
+										<option value="0">{{lang_rotation0}}</option>
+										<option value="3">{{lang_rotation3}}</option>
+										<option value="2">{{lang_rotation2}}</option>
+										<option value="1">{{lang_rotation1}}</option>
+									</select>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_rotationTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item m1-s m2-h m3-s m4-s">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="show-hostname">{{lang_showHostname}}</label>
-									</div>
-									<div class="col-sm-8">
-										<input id="show-hostname" class="btstrpCheckbox" type="checkbox" name="hostname" {{hostname_checked}}>
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_hostnameTooltip}}
-									</div>
+						<div class="list-group-item m1-s m2-h m3-s m4-s">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="show-hostname">{{lang_showHostname}}</label>
+								</div>
+								<div class="col-sm-8">
+									<input id="show-hostname" class="btstrpCheckbox" type="checkbox" name="hostname" {{hostname_checked}}>
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_hostnameTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item m1-s m2-h m3-h m4-h">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="input-scale">{{lang_scale}}</label>
-									</div>
-									<div class="col-sm-8">
-										<span><span class="range-display"></span>&thinsp;%</span>
-										<input id="input-scale" name="scale" type="range" step="1" min="10" max="90" value="{{scale}}">
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_scaleTooltip}}
-									</div>
+						<div class="list-group-item m1-s m2-h m3-h m4-h">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="input-scale">{{lang_scale}}</label>
+								</div>
+								<div class="col-sm-8">
+									<span><span class="range-display"></span>&thinsp;%</span>
+									<input id="input-scale" name="scale" type="range" step="1" min="10" max="90" value="{{scale}}">
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_scaleTooltip}}
 								</div>
 							</div>
+						</div>
 
-							<div class="list-group-item m1-h m2-h m3-h m4-s">
-								<div class="row">
-									<div class="col-sm-4">
-										<label for="input-switchtime">{{lang_switchTime}}</label>
-									</div>
-									<div class="col-sm-8">
-										<span><span class="range-display"></span>&thinsp;{{lang_sec}}</span>
-										<input id="input-switchtime" name="switchtime" type="range" step="1" min="1" max="120" value="{{switchtime}}">
-									</div>
-									<div class="col-sm-12 small text-muted spacebottop">
-										{{lang_switchTimeTooltip}}
-									</div>
+						<div class="list-group-item m1-h m2-h m3-h m4-s">
+							<div class="row">
+								<div class="col-sm-4">
+									<label for="input-switchtime">{{lang_switchTime}}</label>
+								</div>
+								<div class="col-sm-8">
+									<span><span class="range-display"></span>&thinsp;{{lang_sec}}</span>
+									<input id="input-switchtime" name="switchtime" type="range" step="1" min="1" max="120" value="{{switchtime}}">
+								</div>
+								<div class="col-sm-12 small text-muted spacebottop">
+									{{lang_switchTimeTooltip}}
 								</div>
 							</div>
 						</div>
@@ -435,12 +431,12 @@ document.addEventListener("DOMContentLoaded", function () {
 		// Add Panel for overwriting room specific config
 		$owPanels.find('#overrideRoom' + id).remove();
 		$owPanels.append('<div class="col-md-6" id="overrideRoom' + id + '">' +
-			'<div class="panel panel-default">' +
+			'<div class="panel panel-default body-dest">' +
 			'<div class="panel-heading clearfix">' +
 			name + ' {{lang_configOverride}}' +
 			'<div class="checkbox-inline pull-right">' +
 			'<input type="checkbox" id="override' + id + '" name="override' + id + '"/>' +
-			'</div></div><div class="panel-body"></div></div></div>');
+			'</div></div></div></div>');
 
 
 		// Load content into panel
@@ -514,7 +510,7 @@ document.addEventListener("DOMContentLoaded", function () {
 		});
 
 		// Append copied content to location specific <div>
-		var $panelBody = $('#overrideRoom' + locId).find('div.panel-body');
+		var $panelBody = $('#overrideRoom' + locId).find('div.body-dest');
 		$panelBody.append($contentCopy);
 
 		// Specific extra stuff needed
@@ -534,7 +530,7 @@ document.addEventListener("DOMContentLoaded", function () {
 	}
 
 	function unloadOverrideContent(id) {
-		var $panelBody = $('#overrideRoom' + id).find('div.panel-body');
+		var $panelBody = $('#overrideRoom' + id).find('div.body-dest');
 		$panelBody.find('div.list-group').remove();
 		if (overrides !== null && overrides[id] !== undefined) delete overrides[id]
 	}
diff --git a/modules-available/locationinfo/templates/page-config-panel-summary.html b/modules-available/locationinfo/templates/page-config-panel-summary.html
index 6af20351..b909f873 100644
--- a/modules-available/locationinfo/templates/page-config-panel-summary.html
+++ b/modules-available/locationinfo/templates/page-config-panel-summary.html
@@ -16,87 +16,85 @@
 		<div class="col-md-6">
 			<div class="modify-inputs panel panel-default">
 				<div class="panel-heading">{{lang_display}}</div>
-				<div class="panel-body">
-					<div class="list-group">
-
-						<div class="list-group-item">
-							<div class="row">
-								<div class="col-sm-4">
-									<label for="panel-title">{{lang_displayName}}</label>
-								</div>
-								<div class="col-sm-8">
-									<input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
-								</div>
-								<div class="col-sm-12 small text-muted spacebottop">
-									{{lang_displayNameTooltip}}
-								</div>
+				<div class="list-group">
+
+					<div class="list-group-item">
+						<div class="row">
+							<div class="col-sm-4">
+								<label for="panel-title">{{lang_displayName}}</label>
+							</div>
+							<div class="col-sm-8">
+								<input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
+							</div>
+							<div class="col-sm-12 small text-muted spacebottop">
+								{{lang_displayNameTooltip}}
 							</div>
 						</div>
+					</div>
 
-						<div class="list-group-item">
-							<div class="row">
-								<div class="col-sm-4">
-									<label for="language">{{lang_language}}</label>
-								</div>
-								<div class="col-sm-8">
-									<select class="form-control" name="language" id="language">
-										{{#languages}}
-										<option value="{{cc}}" id="lang-{{cc}}" {{selected}}>{{name}}</option>
-										{{/languages}}
-									</select>
-								</div>
-								<div class="col-sm-12 small text-muted spacebottop">
-									{{lang_languageTooltip}}
-								</div>
+					<div class="list-group-item">
+						<div class="row">
+							<div class="col-sm-4">
+								<label for="language">{{lang_language}}</label>
+							</div>
+							<div class="col-sm-8">
+								<select class="form-control" name="language" id="language">
+									{{#languages}}
+									<option value="{{cc}}" id="lang-{{cc}}" {{selected}}>{{name}}</option>
+									{{/languages}}
+								</select>
+							</div>
+							<div class="col-sm-12 small text-muted spacebottop">
+								{{lang_languageTooltip}}
 							</div>
 						</div>
+					</div>
 
-						<div class="list-group-item">
-							<div class="row">
-								<div class="col-sm-4">
-									<label for="input-eco">{{lang_ecoMode}}</label>
-								</div>
-								<div class="col-sm-8">
-									<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
-								</div>
-								<div class="col-sm-12 small text-muted spacebottop">
-									{{lang_ecoTooltip}}
-								</div>
+					<div class="list-group-item">
+						<div class="row">
+							<div class="col-sm-4">
+								<label for="input-eco">{{lang_ecoMode}}</label>
+							</div>
+							<div class="col-sm-8">
+								<input id="input-eco" type="checkbox" name="eco" {{eco_checked}}>
+							</div>
+							<div class="col-sm-12 small text-muted spacebottop">
+								{{lang_ecoTooltip}}
 							</div>
 						</div>
+					</div>
 
-						<div class="list-group-item">
-							<div class="row">
-								<div class="col-sm-4">
-									<label for="input-roomplanner">{{lang_useRoomplanner}}</label>
-								</div>
-								<div class="col-sm-8">
-									<select class="form-control" name="roomplanner" id="input-roomplanner">
-										<option value="0" id="roomplanner0">{{lang_countIp}}</option>
-										<option value="1" id="roomplanner1">{{lang_countRoomplan}}</option>
-									</select>
-								</div>
-								<div class="col-sm-12 small text-muted spacebottop">
-									{{lang_roomplannerTooltip}}
-								</div>
+					<div class="list-group-item">
+						<div class="row">
+							<div class="col-sm-4">
+								<label for="input-roomplanner">{{lang_useRoomplanner}}</label>
+							</div>
+							<div class="col-sm-8">
+								<select class="form-control" name="roomplanner" id="input-roomplanner">
+									<option value="0" id="roomplanner0">{{lang_countIp}}</option>
+									<option value="1" id="roomplanner1">{{lang_countRoomplan}}</option>
+								</select>
+							</div>
+							<div class="col-sm-12 small text-muted spacebottop">
+								{{lang_roomplannerTooltip}}
 							</div>
 						</div>
+					</div>
 <!--
-						<div class="list-group-item">
-							<div class="row">
-								<div class="col-sm-4">
-									<label for="input-prettytime">{{lang_prettytime}}</label>
-								</div>
-								<div class="col-sm-8">
-									<input id="input-prettytime" type="checkbox" name="prettytime" {{prettytime_checked}}>
-								</div>
-								<div class="col-sm-12 small text-muted spacebottop">
-									{{lang_prettytimeTooltip}}
-								</div>
+					<div class="list-group-item">
+						<div class="row">
+							<div class="col-sm-4">
+								<label for="input-prettytime">{{lang_prettytime}}</label>
+							</div>
+							<div class="col-sm-8">
+								<input id="input-prettytime" type="checkbox" name="prettytime" {{prettytime_checked}}>
+							</div>
+							<div class="col-sm-12 small text-muted spacebottop">
+								{{lang_prettytimeTooltip}}
 							</div>
 						</div>
--->
 					</div>
+-->
 				</div>
 			</div>
 		</div>
@@ -104,25 +102,23 @@
 		<div class="col-md-6">
 			<div class="panel panel-default">
 				<div class="panel-heading">{{lang_updateRates}}</div>
-				<div class="panel-body">
-					<div class="list-group">
-
-						<div class="list-group-item">
-							<div class="row">
-								<div class="col-sm-4">
-									<label for="form-panelupdate">{{lang_panel}}</label>
-								</div>
-								<div class="col-sm-8">
-									<input class="form-control" name="panelupdate" type="number" min="15" id="form-panelupdate"
-											 max="86400" value="{{panelupdate}}" required>
-								</div>
-								<div class="col-sm-12 small text-muted spacebottop">
-									{{lang_summaryUpdateIntervalTooltip}}
-								</div>
+				<div class="list-group">
+
+					<div class="list-group-item">
+						<div class="row">
+							<div class="col-sm-4">
+								<label for="form-panelupdate">{{lang_panel}}</label>
+							</div>
+							<div class="col-sm-8">
+								<input class="form-control" name="panelupdate" type="number" min="15" id="form-panelupdate"
+										 max="86400" value="{{panelupdate}}" required>
+							</div>
+							<div class="col-sm-12 small text-muted spacebottop">
+								{{lang_summaryUpdateIntervalTooltip}}
 							</div>
 						</div>
-
 					</div>
+
 				</div>
 			</div>
 		</div>
diff --git a/modules-available/locationinfo/templates/page-config-panel-url.html b/modules-available/locationinfo/templates/page-config-panel-url.html
index b17347ad..365e15db 100644
--- a/modules-available/locationinfo/templates/page-config-panel-url.html
+++ b/modules-available/locationinfo/templates/page-config-panel-url.html
@@ -13,211 +13,209 @@
 
 	<div class="panel panel-default">
 		<div class="panel-heading">{{lang_display}}</div>
-		<div class="panel-body">
-			<div class="list-group">
+		<div class="list-group">
 
-				<div class="list-group-item">
-					<div class="row">
-						<div class="col-sm-4">
-							<label for="panel-title">{{lang_displayName}}</label>
-						</div>
-						<div class="col-sm-8">
-							<input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
-						</div>
-						<div class="col-sm-12 small text-muted spacebottop">
-							{{lang_displayNameTooltip}}
-						</div>
+			<div class="list-group-item">
+				<div class="row">
+					<div class="col-sm-4">
+						<label for="panel-title">{{lang_displayName}}</label>
+					</div>
+					<div class="col-sm-8">
+						<input class="form-control" name="name" id="panel-title" type="text" value="{{panelname}}">
+					</div>
+					<div class="col-sm-12 small text-muted spacebottop">
+						{{lang_displayNameTooltip}}
 					</div>
 				</div>
+			</div>
 
-				<div class="list-group-item">
-					<div class="row">
-						<div class="col-sm-4">
-							<label for="panel-url">{{lang_url}}</label>
-						</div>
-						<div class="col-sm-8">
-							<input class="form-control" name="url" id="panel-url" type="text" value="{{url}}"
-									 placeholder="http://www.bwlehrpool.de/" pattern=".*://.*" required>
-						</div>
-						<div class="col-sm-12 small text-muted spacebottop">
-							{{lang_urlTooltip}}
-						</div>
+			<div class="list-group-item">
+				<div class="row">
+					<div class="col-sm-4">
+						<label for="panel-url">{{lang_url}}</label>
+					</div>
+					<div class="col-sm-8">
+						<input class="form-control" name="url" id="panel-url" type="text" value="{{url}}"
+								 placeholder="http://www.bwlehrpool.de/" pattern=".*://.*" required>
+					</div>
+					<div class="col-sm-12 small text-muted spacebottop">
+						{{lang_urlTooltip}}
 					</div>
 				</div>
+			</div>
 
-				<div class="list-group-item">
-					<div class="row">
-						<div class="col-sm-4">
-							<label for="input-ssl">{{lang_insecureSsl}}</label>
-						</div>
-						<div class="col-sm-8">
-							<div class="checkbox">
-								<input id="input-ssl" type="checkbox" name="insecure-ssl" {{ssl_checked}} value="1">
-								<label></label>
-							</div>
-						</div>
-						<div class="col-sm-12 small text-muted spacebottop">
-							{{lang_ignoreSslTooltip}}
+			<div class="list-group-item">
+				<div class="row">
+					<div class="col-sm-4">
+						<label for="input-ssl">{{lang_insecureSsl}}</label>
+					</div>
+					<div class="col-sm-8">
+						<div class="checkbox">
+							<input id="input-ssl" type="checkbox" name="insecure-ssl" {{ssl_checked}} value="1">
+							<label></label>
 						</div>
 					</div>
+					<div class="col-sm-12 small text-muted spacebottop">
+						{{lang_ignoreSslTooltip}}
+					</div>
 				</div>
+			</div>
 
-				<div class="list-group-item">
-					<div class="row">
-						<div class="col-sm-4">
-							<label>{{lang_allowTtySwitch}}</label>
+			<div class="list-group-item">
+				<div class="row">
+					<div class="col-sm-4">
+						<label>{{lang_allowTtySwitch}}</label>
+					</div>
+					<div class="col-sm-8">
+						<div class="radio">
+							<input id="tty1" type="radio" name="allow-tty" {{allow-tty__checked}} value="">
+							<label for="tty1">{{lang_useDefault}}</label>
 						</div>
-						<div class="col-sm-8">
-							<div class="radio">
-								<input id="tty1" type="radio" name="allow-tty" {{allow-tty__checked}} value="">
-								<label for="tty1">{{lang_useDefault}}</label>
-							</div>
-							<div class="radio">
-								<input id="tty2" type="radio" name="allow-tty" {{allow-tty_yes_checked}} value="yes">
-								<label for="tty2">{{lang_yes}}</label>
-							</div>
-							<div class="radio">
-								<input id="tty3" type="radio" name="allow-tty" {{allow-tty_no_checked}} value="no">
-								<label for="tty3">{{lang_no}}</label>
-							</div>
+						<div class="radio">
+							<input id="tty2" type="radio" name="allow-tty" {{allow-tty_yes_checked}} value="yes">
+							<label for="tty2">{{lang_yes}}</label>
 						</div>
-						<div class="col-sm-12 small text-muted spacebottop">
-							{{lang_allowTtySwitchTooltip}}
+						<div class="radio">
+							<input id="tty3" type="radio" name="allow-tty" {{allow-tty_no_checked}} value="no">
+							<label for="tty3">{{lang_no}}</label>
 						</div>
 					</div>
+					<div class="col-sm-12 small text-muted spacebottop">
+						{{lang_allowTtySwitchTooltip}}
+					</div>
 				</div>
+			</div>
 
-				<div class="list-group-item">
-					<div class="row">
-						<div class="col-sm-4">
-							<label for="input-reload">{{lang_reloadIntervalMins}}</label>
-						</div>
-						<div class="col-sm-8">
-							<input class="form-control" id="input-reload" type="number" min="0" max="999" name="reloadminutes" pattern="\d*" value="{{reloadminutes}}">
-						</div>
-						<div class="col-sm-12 small text-muted spacebottop">
-							{{lang_reloadIntervalTooltip}}
-						</div>
+			<div class="list-group-item">
+				<div class="row">
+					<div class="col-sm-4">
+						<label for="input-reload">{{lang_reloadIntervalMins}}</label>
+					</div>
+					<div class="col-sm-8">
+						<input class="form-control" id="input-reload" type="number" min="0" max="999" name="reloadminutes" pattern="\d*" value="{{reloadminutes}}">
+					</div>
+					<div class="col-sm-12 small text-muted spacebottop">
+						{{lang_reloadIntervalTooltip}}
 					</div>
 				</div>
+			</div>
 
-				<div class="list-group-item">
-					<div class="row">
-						<div class="col-sm-6">
-							<label for="whitelist">{{lang_whitelist}}</label>
-							<textarea id="whitelist" name="whitelist" rows="10" class="form-control">{{whitelist}}</textarea>
-						</div>
-						<div class="col-sm-6">
-							<label for="blacklist">{{lang_blacklist}}</label>
-							<textarea id="blacklist" name="blacklist" rows="10" class="form-control">{{blacklist}}</textarea>
-						</div>
-						<div class="col-sm-12">
-							<p>{{lang_urlListHelp}}</p>
-						</div>
+			<div class="list-group-item">
+				<div class="row">
+					<div class="col-sm-6">
+						<label for="whitelist">{{lang_whitelist}}</label>
+						<textarea id="whitelist" name="whitelist" rows="10" class="form-control">{{whitelist}}</textarea>
+					</div>
+					<div class="col-sm-6">
+						<label for="blacklist">{{lang_blacklist}}</label>
+						<textarea id="blacklist" name="blacklist" rows="10" class="form-control">{{blacklist}}</textarea>
+					</div>
+					<div class="col-sm-12 slx-smallspace">
+						{{lang_urlListHelp}}
 					</div>
 				</div>
+			</div>
 
-				<div class="list-group-item">
-					<div class="row">
-						<div class="col-sm-4">
-							<label for="split-login">{{lang_splitlogin}}</label>
-						</div>
-						<div class="col-sm-8">
-							<div class="checkbox">
-								<input id="split-login" type="checkbox" name="split-login" {{split-login_checked}} value="1">
-								<label></label>
-							</div>
-						</div>
-						<div class="col-sm-12 small text-muted spacebottop">
-							{{lang_splitloginTooltip}}
+			<div class="list-group-item">
+				<div class="row">
+					<div class="col-sm-4">
+						<label for="split-login">{{lang_splitlogin}}</label>
+					</div>
+					<div class="col-sm-8">
+						<div class="checkbox">
+							<input id="split-login" type="checkbox" name="split-login" {{split-login_checked}} value="1">
+							<label></label>
 						</div>
 					</div>
+					<div class="col-sm-12 small text-muted spacebottop">
+						{{lang_splitloginTooltip}}
+					</div>
 				</div>
+			</div>
 
-				<div class="list-group-item">
-					<div class="row">
-						<div class="col-sm-4">
-							<label for="browser">{{lang_browser}}</label>
-						</div>
-						<div class="col-sm-8">
-							<select class="form-control" name="browser" id="browser" onchange="browserChange()">
-								<option value="slx-browser" id="slx">{{lang_slxbrowser}}</option>
-								<option value="chromium" id="chrome">{{lang_chromium}}</option>
-							</select>
-						</div>
-						<div class="col-sm-12 small text-muted spacebottop">
-							{{lang_browserTooltip}}
-						</div>
+			<div class="list-group-item">
+				<div class="row">
+					<div class="col-sm-4">
+						<label for="browser">{{lang_browser}}</label>
+					</div>
+					<div class="col-sm-8">
+						<select class="form-control" name="browser" id="browser" onchange="browserChange()">
+							<option value="slx-browser" id="slx">{{lang_slxbrowser}}</option>
+							<option value="chromium" id="chrome">{{lang_chromium}}</option>
+						</select>
+					</div>
+					<div class="col-sm-12 small text-muted spacebottop">
+						{{lang_browserTooltip}}
 					</div>
 				</div>
+			</div>
 
-				<div class="list-group-item b0-h">
-					<div class="row">
-						<div class="col-sm-4">
-							<label for="interactive">{{lang_interactive}}</label>
-						</div>
-						<div class="col-sm-8">
-							<div class="checkbox">
-								<input id="interactive" type="checkbox" name="interactive" {{interactive_checked}} value="1">
-								<label></label>
-							</div>
-						</div>
-						<div class="col-sm-12 small text-muted spacebottop">
-							{{lang_interactiveTooltip}}
+			<div class="list-group-item b0-h">
+				<div class="row">
+					<div class="col-sm-4">
+						<label for="interactive">{{lang_interactive}}</label>
+					</div>
+					<div class="col-sm-8">
+						<div class="checkbox">
+							<input id="interactive" type="checkbox" name="interactive" {{interactive_checked}} value="1">
+							<label></label>
 						</div>
 					</div>
+					<div class="col-sm-12 small text-muted spacebottop">
+						{{lang_interactiveTooltip}}
+					</div>
 				</div>
+			</div>
 
-				<div class="list-group-item b0-h" id="bookmarks">
-					<div class="row">
-						<div class="col-sm-4">
-							<label for="bookmarks">{{lang_bookmarks}}</label>
-						</div>
-						<div class="col-sm-8">
-							<button type="button" class="btn btn-success" onclick="addBookmark()">
-								<span class="glyphicon glyphicon-plus"></span>
-							</button>
-						</div>
-						<div class="col-sm-12 small text-muted spacebottop">
-							{{lang_bookmarksTooltip}}
-						</div>
+			<div class="list-group-item b0-h" id="bookmarks">
+				<div class="row">
+					<div class="col-sm-4">
+						<label for="bookmarks">{{lang_bookmarks}}</label>
 					</div>
-					<div class="row" style="margin-top: 1em;" id="bookmarkRow" hidden>
-						<div class="col-sm-3 col-sm-offset-3">
-							<input class="form-control" name="bookmarkNames[]" type="text" value=""
-									 placeholder="bwLehrpool">
-						</div>
-						<div class="col-sm-3">
-							<input class="form-control" name="bookmarkUrls[]" type="text" value=""
-									 placeholder="http://www.bwlehrpool.de/" pattern=".*://.*">
-						</div>
-						<div class="col-sm-1">
-							<button type="button" class="btn btn-danger" onclick="this.closest('.row').remove()">
-								<span class="glyphicon glyphicon-minus"></span>
-							</button>
-						</div>
+					<div class="col-sm-8">
+						<button type="button" class="btn btn-success" onclick="addBookmark()">
+							<span class="glyphicon glyphicon-plus"></span>
+						</button>
 					</div>
-
-					{{#bookmarks}}
-					<div class="row" style="margin-top: 1em;">
-						<div class="col-sm-3 col-sm-offset-3">
-							<input class="form-control" name="bookmarkNames[]" type="text" value="{{name}}"
-									 placeholder="bwLehrpool" required>
-						</div>
-						<div class="col-sm-3">
-							<input class="form-control" name="bookmarkUrls[]" type="text" value="{{url}}"
-									 placeholder="http://www.bwlehrpool.de/" pattern=".*://.*" required>
-						</div>
-						<div class="col-sm-1">
-							<button type="button" class="btn btn-danger" onclick="this.closest('.row').remove()">
-								<span class="glyphicon glyphicon-minus"></span>
-							</button>
-						</div>
+					<div class="col-sm-12 small text-muted spacebottop">
+						{{lang_bookmarksTooltip}}
+					</div>
+				</div>
+				<div class="row" style="margin-top: 1em;" id="bookmarkRow" hidden>
+					<div class="col-sm-3 col-sm-offset-3">
+						<input class="form-control" name="bookmarkNames[]" type="text" value=""
+								 placeholder="bwLehrpool">
+					</div>
+					<div class="col-sm-3">
+						<input class="form-control" name="bookmarkUrls[]" type="text" value=""
+								 placeholder="http://www.bwlehrpool.de/" pattern=".*://.*">
+					</div>
+					<div class="col-sm-1">
+						<button type="button" class="btn btn-danger" onclick="this.closest('.row').remove()">
+							<span class="glyphicon glyphicon-minus"></span>
+						</button>
 					</div>
-					{{/bookmarks}}
 				</div>
 
+				{{#bookmarks}}
+				<div class="row" style="margin-top: 1em;">
+					<div class="col-sm-3 col-sm-offset-3">
+						<input class="form-control" name="bookmarkNames[]" type="text" value="{{name}}"
+								 placeholder="bwLehrpool" required>
+					</div>
+					<div class="col-sm-3">
+						<input class="form-control" name="bookmarkUrls[]" type="text" value="{{url}}"
+								 placeholder="http://www.bwlehrpool.de/" pattern=".*://.*" required>
+					</div>
+					<div class="col-sm-1">
+						<button type="button" class="btn btn-danger" onclick="this.closest('.row').remove()">
+							<span class="glyphicon glyphicon-minus"></span>
+						</button>
+					</div>
+				</div>
+				{{/bookmarks}}
 			</div>
+
 		</div>
 	</div>
 	<div class="text-right">
diff --git a/modules-available/locationinfo/templates/page-locations.html b/modules-available/locationinfo/templates/page-locations.html
index 26f0b621..553df648 100644
--- a/modules-available/locationinfo/templates/page-locations.html
+++ b/modules-available/locationinfo/templates/page-locations.html
@@ -50,7 +50,7 @@
 				<input type="hidden" name="token" value="{{token}}">
 				<input type="hidden" name="action" value="writeLocationConfig">
 				<input type="hidden" name="openingtimes" id="json-openingtimes" value="">
-				<div class="modal-header"><h2 id="location-modal-header"></h2></div>
+				<div class="modal-header"><h3 id="location-modal-header"></h3></div>
 				<div class="modal-body"></div>
 				<div class="modal-footer">
 					<a class="btn btn-default" data-dismiss="modal">{{lang_close}}</a>
@@ -76,7 +76,7 @@ document.addEventListener("DOMContentLoaded", function () {
 		var locationId = $(this).data('locationid');
 		var locationName = $(this).text();
 		$('#location-modal-header').text("[" + locationId + "] " + locationName);
-		$('#location-modal').modal('show').find('.modal-body').load("?do=locationinfo&action=config-location&id=" + locationId);
+		$('#location-modal').modal('show').find('.modal-body').text('...').load("?do=locationinfo&action=config-location&id=" + locationId);
 	});
 });
 
diff --git a/modules-available/locationinfo/templates/page-servers.html b/modules-available/locationinfo/templates/page-servers.html
index 2f692078..86adecca 100644
--- a/modules-available/locationinfo/templates/page-servers.html
+++ b/modules-available/locationinfo/templates/page-servers.html
@@ -66,7 +66,7 @@
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog">
 	<div class="modal-dialog">
 		<div class="modal-content">
-			<div class="modal-header" id="myModalHeader"></div>
+			<div class="modal-header" id="myModalHeader"><h3>{{lang_backendSettings}}</h3></div>
 			<div class="modal-body" id="myModalBody"></div>
 			<div class="modal-footer">
 				<a class="btn btn-default" data-dismiss="modal">{{lang_close}}</a>
@@ -102,10 +102,9 @@
 	 * @param serverid The id of the server.
 	 */
 	function loadServerSettingsModal(serverid) {
-		$('#myModalHeader').text("{{lang_locationSettings}}").css("font-weight", "Bold");
 		$('#myModal .modal-dialog').css('width', '');
 		$('#myModal').modal('show');
-		$('#myModalBody').load("?do=locationinfo&action=serverSettings&id=" + serverid);
+		$('#myModalBody').text('...').load("?do=locationinfo&action=serverSettings&id=" + serverid);
 	}
 
 	// ########### Server Table ###########
diff --git a/modules-available/locationinfo/templates/server-prop-bool.html b/modules-available/locationinfo/templates/server-prop-bool.html
index bd9dcc64..ee2b8121 100644
--- a/modules-available/locationinfo/templates/server-prop-bool.html
+++ b/modules-available/locationinfo/templates/server-prop-bool.html
@@ -1,16 +1,12 @@
 <div class="list-group-item">
 	<div class="row">
-		<div class="col-md-3"><label for="prop-{{property}}">{{title}}</label></div>
-		<div class="col-md-7">
+		<div class="col-md-4"><label for="prop-{{property}}">{{title}}</label></div>
+		<div class="col-md-8">
 			<input class="settings-bs-switch" id="prop-{{property}}" type="checkbox" name="prop-{{property}}" value="1"
 					 {{#currentvalue}}checked{{/currentvalue}}>
 		</div>
-		<div class="col-md-2">
-			{{#helptext}}
-				<p class="btn btn-static" title="{{helptext}}">
-					<span class="glyphicon glyphicon-question-sign"></span>
-				</p>
-			{{/helptext}}
+		<div class="col-sm-12 small text-muted spacebottop">
+			{{helptext}}
 		</div>
 	</div>
 </div>
diff --git a/modules-available/locationinfo/templates/server-prop-dropdown.html b/modules-available/locationinfo/templates/server-prop-dropdown.html
index d1351551..bcb0cd5a 100644
--- a/modules-available/locationinfo/templates/server-prop-dropdown.html
+++ b/modules-available/locationinfo/templates/server-prop-dropdown.html
@@ -1,19 +1,15 @@
 <div class="list-group-item">
 	<div class="row">
-		<div class="col-md-3"><label for="prop-{{property}}">{{title}}</label></div>
-		<div class="col-md-7">
+		<div class="col-md-4"><label for="prop-{{property}}">{{title}}</label></div>
+		<div class="col-md-8">
 			<select class="form-control" id="prop-{{property}}" name="prop-{{property}}">
 				{{#select_list}}
 					<option {{#active}}selected{{/active}}>{{option}}</option>
 				{{/select_list}}
 			</select>
 		</div>
-		<div class="col-md-2">
-			{{#helptext}}
-				<p class="btn btn-static" title="{{helptext}}">
-					<span class="glyphicon glyphicon-question-sign"></span>
-				</p>
-			{{/helptext}}
+		<div class="col-sm-12 small text-muted spacebottop">
+			{{helptext}}
 		</div>
 	</div>
 </div>
diff --git a/modules-available/locationinfo/templates/server-prop-generic.html b/modules-available/locationinfo/templates/server-prop-generic.html
index 23ff1e4e..ca8234fe 100644
--- a/modules-available/locationinfo/templates/server-prop-generic.html
+++ b/modules-available/locationinfo/templates/server-prop-generic.html
@@ -1,16 +1,12 @@
 <div class="list-group-item">
 	<div class="row">
-		<div class="col-md-3"><label for="prop-{{property}}">{{title}}</label></div>
-		<div class="col-md-7">
+		<div class="col-md-4"><label for="prop-{{property}}">{{title}}</label></div>
+		<div class="col-md-8">
 			<input class="form-control" id="prop-{{property}}" type="{{inputtype}}" name="prop-{{property}}"
 					 value="{{currentvalue}}">
 		</div>
-		<div class="col-md-2">
-			{{#helptext}}
-				<p class="btn btn-static" title="{{helptext}}">
-					<span class="glyphicon glyphicon-question-sign"></span>
-				</p>
-			{{/helptext}}
+		<div class="col-sm-12 small text-muted spacebottop">
+			{{helptext}}
 		</div>
 	</div>
 </div>