diff --git a/approot/admin-database.xml b/approot/admin-database.xml
index 6e2b08ec..e2d504a1 100644
--- a/approot/admin-database.xml
+++ b/approot/admin-database.xml
@@ -4,81 +4,69 @@
 <!--FORMS message blocks-->
 
 <message id="Lms.Admin.Database.template">
-	<legend>${tr:Lms.Admin.Database.database}</legend>
-	<div class="form-horizontal">
-
-		<div class="form-group">
-			<label class="control-label col-sm-2"  for="${id:media-directory}">
-				${tr:Lms.Admin.Database.path}
-			</label>
-			<div class="col-sm-5">
-				${media-directory}
+	<div class ="row">
+		<div class="col-lg-8">
+			<legend>${tr:Lms.Admin.Database.database}</legend>
+			<div class="form-horizontal">
+				<div class="form-group">
+					<label class="col-lg-3 control-label"  for="${id:media-directory}">
+						${tr:Lms.Admin.Database.path}
+					</label>
+					<div class="col-lg-9">
+						${media-directory}
+						${media-directory-info class="help-block"}
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-lg-3 control-label"  for="${id:update-period}">
+						${tr:Lms.Admin.Database.update-period}
+					</label>
+					<div class="col-lg-9">
+						${update-period}
+						${update-period-info class="help-block"}
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-lg-3 control-label"  for="${id:update-start-time}">
+						${tr:Lms.Admin.Database.update-start-time}
+					</label>
+					<div class="col-lg-9">
+						${update-start-time}
+						${update-start-time-info class="help-block"}
+					</div>
+				</div>
 			</div>
-			<div class="help-block col-sm-5">
-				${media-directory-info}
+			<legend>${tr:Lms.Admin.Database.scan-options}</legend>
+			<div class="form-horizontal">
+				<div class="form-group">
+					<label class="col-lg-3 control-label"  for="${id:recommendation-engine-type}">
+						${tr:Lms.Admin.Database.recommendation-engine-type}
+					</label>
+					<div class="col-lg-9">
+						${recommendation-engine-type}
+						${recommendation-engine-type-info class="help-block"}
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-lg-3 control-label"  for="${id:tags}">
+						${tr:Lms.Admin.Database.tags}
+					</label>
+					<div class="col-lg-9">
+						${tags}
+						${tags-info class="help-block"}
+					</div>
+				</div>
 			</div>
-		</div>
-
-		<div class="form-group">
-			<label class="control-label col-sm-2"  for="${id:update-period}">
-				${tr:Lms.Admin.Database.update-period}
-			</label>
-			<div class="col-sm-5">
-				${update-period}
-			</div>
-			<div class="help-block col-sm-5">
-				${update-period-info}
-			</div>
-		</div>
-
-		<div class="form-group">
-			<label class="control-label col-sm-2"  for="${id:update-start-time}">
-				${tr:Lms.Admin.Database.update-start-time}
-			</label>
-			<div class="col-sm-5">
-				${update-start-time}
-			</div>
-			<div class="help-block col-sm-5">
-				${update-start-time-info}
-			</div>
-		</div>
-	</div>
-	<legend>${tr:Lms.Admin.Database.scan-options}</legend>
-	<div class="form-horizontal">
-
-		<div class="form-group">
-			<label class="control-label col-sm-2"  for="${id:recommendation-engine-type}">
-				${tr:Lms.Admin.Database.recommendation-engine-type}
-			</label>
-			<div class="col-sm-5">
-				${recommendation-engine-type}
-			</div>
-			<div class="help-block col-sm-5">
-				${recommendation-engine-type-info}
-			</div>
-		</div>
-
-		<div class="form-group">
-			<label class="control-label col-sm-2"  for="${id:tags}">
-				${tr:Lms.Admin.Database.tags}
-			</label>
-			<div class="col-sm-5">
-				${tags}
-			</div>
-			<div class="help-block col-sm-5">
-				${tags-info}
-			</div>
-		</div>
-
-		<div class="form-group">
-			<div class="col-sm-offset-2 col-sm-10">
-				${apply-btn class="btn-primary"} ${discard-btn} ${immediate-scan-btn class="btn-info"}
+			<div class="form-group">
+				<div class="col-lg-offset-3 col-lg-9">
+					${apply-btn class="btn-primary"} ${discard-btn} ${immediate-scan-btn class="btn-info"}
+				</div>
 			</div>
 		</div>
 	</div>
 	<br/>
 	<div class="row">
-		<div class="col-sm-7">
+		<div class="col-lg-8">
 			<div class="panel panel-info">
 				<div class="panel-heading">${tr:Lms.Admin.Database.Status.status}</div>
 				<div class="panel-body">
@@ -92,27 +80,27 @@
 <message id="Lms.Admin.Database.Status.template">
 	<div class="form-horizontal">
 		<div class="form-group">
-			<label class="control-label col-sm-2">
+			<label class="col-lg-3 control-label">
 				${tr:Lms.Admin.Database.Status.status}
 			</label>
-			<div class="col-sm-10">
+			<div class="col-lg-9">
 				<div class="well well-sm">
 					${status}
 				</div>
 			</div>
 		</div>
 		<div class="form-group">
-			<label class="control-label col-sm-2">
+			<label class="col-lg-3 control-label">
 				${tr:Lms.Admin.Database.Status.last-scan}
 			</label>
-			<div class="col-sm-10">
+			<div class="col-lg-9">
 				<div class="well well-sm">
 					${last-scan}
 				</div>
 			</div>
 		</div>
 		<div class="form-group">
-			<div class="col-sm-offset-2 col-sm-10">
+			<div class="col-lg-offset-3 col-lg-9">
 				${btn-report class="btn"}
 			</div>
 		</div>
diff --git a/approot/admin-initwizard.xml b/approot/admin-initwizard.xml
index 5eb94e27..d58c2bb7 100644
--- a/approot/admin-initwizard.xml
+++ b/approot/admin-initwizard.xml
@@ -4,52 +4,49 @@
 
 <message id="Lms.Admin.InitWizard.template">
 	<div class="container">
-	<div class="page-header">
-		<h2>${tr:Lms.Admin.InitWizard.header}</h2>
-	</div>
-	<div class="form-horizontal">
-		<div class="form-group">
-			<label class="control-label col-sm-2"  for="${id:admin-login}">
-				${tr:Lms.login}
-			</label>
-			<div class="col-sm-5">
-				${admin-login}
-			</div>
-			<div class="help-block col-sm-5">
-				${admin-login-info}
-			</div>
-		</div>
+		<div class="row">
+			<div class="col-lg-8">
+				<div class="page-header">
+					<h2>${tr:Lms.Admin.InitWizard.header}</h2>
+				</div>
+				<div class="form-horizontal">
+					<div class="form-group">
+						<label class="col-lg-3 control-label"  for="${id:admin-login}">
+							${tr:Lms.login}
+						</label>
+						<div class="col-lg-9">
+							${admin-login}
+							${admin-login-info class="help-block"}
+						</div>
+					</div>
 
-		<div class="form-group">
-			<label class="control-label col-sm-2"  for="${id:password}">
-				${tr:Lms.password}
-			</label>
-			<div class="col-sm-5">
-				${password}
-			</div>
-			<div class="help-block col-sm-5">
-				${password-info}
-			</div>
-		</div>
+					<div class="form-group">
+						<label class="col-lg-3 control-label"  for="${id:password}">
+							${tr:Lms.password}
+						</label>
+						<div class="col-lg-9">
+							${password}
+							${password-info class="help-block"}
+						</div>
+					</div>
 
-		<div class="form-group">
-			<label class="control-label col-sm-2"  for="${id:password-confirm}">
-				${tr:Lms.password-confirm}
-			</label>
-			<div class="col-sm-5">
-				${password-confirm}
-			</div>
-			<div class="help-block col-sm-5">
-				${password-confirm-info}
+					<div class="form-group">
+						<label class="col-lg-3 control-label"  for="${id:password-confirm}">
+							${tr:Lms.password-confirm}
+						</label>
+						<div class="col-lg-9">
+							${password-confirm}
+							${password-confirm-info class="help-block"}
+						</div>
+					</div>
+					<div class="form-group">
+						<div class="col-lg-offset-3 col-lg-9">
+							${create-btn class="btn-primary"}
+						</div>
+					</div>
+				</div>
 			</div>
 		</div>
-
-		<div class="form-group">
-			<div class="col-sm-offset-2 col-sm-10">
-				${create-btn class="btn-primary"}
-			</div>
-		</div>
-	</div>
 	</div>
 </message>
 
diff --git a/approot/admin-user.xml b/approot/admin-user.xml
index 2274c278..9ce8c4f4 100644
--- a/approot/admin-user.xml
+++ b/approot/admin-user.xml
@@ -2,62 +2,57 @@
 <messages xmlns:if="Wt.WTemplate.conditions">
 
 <message id="Lms.Admin.User.template">
-	<div class="page-header">
-		<h2>${title}</h2>
-	</div>
-	<div class="form-horizontal">
-		${<if-has-last-login>}
-		<div class="form-group">
-			<label class="control-label col-sm-2" for="{id:last-login}">
-				${tr:Lms.Admin.User.last-login}
-			</label>
-			<div class="col-sm-5">
-				<div class="well well-sm">
-					${last-login}
+	<div class="row">
+		<div class="col-lg-8">
+			<legend>${title}</legend>
+			<div class="form-horizontal">
+				${<if-has-last-login>}
+					<div class="form-group">
+						<label class="control-label col-lg-3" for="{id:last-login}">
+							${tr:Lms.Admin.User.last-login}
+						</label>
+						<div class="col-lg-9">
+							<div class="well well-sm">
+								${last-login}
+							</div>
+						</div>
+					</div>
+					${</if-has-last-login>}
+				${<if-has-login>}
+					<div class="form-group">
+						<label class="control-label col-lg-3"  for="${id:login}">
+							${tr:Lms.login}
+						</label>
+						<div class="col-lg-9">
+							${login}
+							${login-info class="help-block"}
+						</div>
+					</div>
+					${</if-has-login>}
+				<div class="form-group">
+					<label class="control-label col-lg-3"  for="${id:password}">
+						${tr:Lms.password-new}
+					</label>
+					<div class="col-lg-9">
+						${password}
+						${password-info class="help-block"}
+					</div>
+				</div>
+				${<if-demo>}
+					<div class="form-group">
+						<div class="col-lg-offset-3 col-lg-3"  for="${id:demo}">
+							<div class="checkbox">
+								<label>${demo}${tr:Lms.Admin.User.demo-account}</label>
+								${demo-info class="help-block"}
+							</div>
+						</div>
+					</div>
+					${</if-demo>}
+				<div class="form-group">
+					<div class="col-lg-offset-3 col-lg-9">
+						${save-btn class="btn-primary"}
+					</div>
 				</div>
-			</div>
-		</div>
-		${</if-has-last-login>}
-		${<if-has-login>}
-		<div class="form-group">
-			<label class="control-label col-sm-2"  for="${id:login}">
-				${tr:Lms.login}
-			</label>
-			<div class="col-sm-5">
-				${login}
-			</div>
-			<div class="help-block col-sm-5">
-				${login-info}
-			</div>
-		</div>
-		${</if-has-login>}
-		<div class="form-group">
-			<label class="control-label col-sm-2"  for="${id:password}">
-				${tr:Lms.password-new}
-			</label>
-			<div class="col-sm-5">
-				${password}
-			</div>
-			<div class="help-block col-sm-5">
-				${password-info}
-			</div>
-		</div>
-		${<if-demo>}
-		<div class="form-group">
-			<label class="control-label col-sm-2"  for="${id:demo}">
-				${tr:Lms.Admin.User.demo-account}
-			</label>
-			<div class="col-sm-5">
-				${demo}
-			</div>
-			<div class="help-block col-sm-5">
-				${demo-info}
-			</div>
-		</div>
-		${</if-demo>}
-		<div class="form-group">
-			<div class="col-sm-offset-2 col-sm-10">
-				${save-btn class="btn-primary"}
 			</div>
 		</div>
 	</div>
diff --git a/approot/settings.xml b/approot/settings.xml
index 24bd864a..239b745e 100644
--- a/approot/settings.xml
+++ b/approot/settings.xml
@@ -32,7 +32,7 @@
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label col-lg-3"  for="${id:transcode-format}">
+					<label class="col-lg-3 control-label"  for="${id:transcode-format}">
 						${tr:Lms.Settings.transcode-format}
 					</label>
 					<div class="col-lg-9">
@@ -41,7 +41,7 @@
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label col-lg-3"  for="${id:transcode-bitrate}">
+					<label class="col-lg-3 control-label"  for="${id:transcode-bitrate}">
 						${tr:Lms.Settings.transcode-bitrate}
 					</label>
 					<div class="col-lg-9">
@@ -99,7 +99,7 @@
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label col-lg-3"  for="${id:subsonic-transcode-format}">
+					<label class="col-lg-3 control-label"  for="${id:subsonic-transcode-format}">
 						${tr:Lms.Settings.transcode-format}
 					</label>
 					<div class="col-lg-9">
@@ -108,7 +108,7 @@
 					</div>
 				</div>
 				<div class="form-group">
-				<label class="control-label col-lg-3"  for="${id:subsonic-transcode-bitrate}">
+				<label class="col-lg-3 control-label"  for="${id:subsonic-transcode-bitrate}">
 						${tr:Lms.Settings.transcode-bitrate}
 					</label>
 					<div class="col-lg-9">
@@ -120,7 +120,7 @@
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label col-lg-3"  for="${id:subsonic-artist-list-mode}">
+					<label class="col-lg-3 control-label"  for="${id:subsonic-artist-list-mode}">
 						${tr:Lms.Settings.subsonic-artist-list-mode}
 					</label>
 					<div class="col-lg-9">
@@ -134,7 +134,7 @@
 			<div class="form-horizontal">
 				${<if-has-old-password>}
 				<div class="form-group">
-					<label class="control-label col-lg-3" for="${id:password-old}">
+					<label class="col-lg-3 control-label" for="${id:password-old}">
 						${tr:Lms.password-old}
 					</label>
 					<div class="col-lg-9">
@@ -144,7 +144,7 @@
 				</div>
 				${</if-has-old-password>}
 				<div class="form-group">
-					<label class="control-label col-lg-3" for="${id:password}">
+					<label class="col-lg-3 control-label" for="${id:password}">
 						${tr:Lms.password-new}
 					</label>
 					<div class="col-lg-9">
@@ -153,7 +153,7 @@
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label col-lg-3" for="${id:password-confirm}">
+					<label class="col-lg-3 control-label" for="${id:password-confirm}">
 						${tr:Lms.password-confirm}
 					</label>
 					<div class="col-lg-9">