diff --git a/src/views/admin/settings/advanced.tpl b/src/views/admin/settings/advanced.tpl
index 89a7efed79..7d9d8fceb7 100644
--- a/src/views/admin/settings/advanced.tpl
+++ b/src/views/admin/settings/advanced.tpl
@@ -1,8 +1,8 @@
 <!-- IMPORT admin/settings/header.tpl -->
 
-<div class="panel panel-default">
-	<div class="panel-heading">Maintenance Mode</div>
-	<div class="panel-body">
+<div class="row">
+	<div class="col-xs-2 settings-header">Maintenance Mode</div>
+	<div class="col-xs-10">
 		<form>
 			<div class="checkbox">
 				<label>
@@ -21,9 +21,9 @@
 	</div>
 </div>
 
-<div class="panel panel-default">
-	<div class="panel-heading">Domain Settings</div>
-	<div class="panel-body">
+<div class="row">
+	<div class="col-xs-2 settings-header">Domain Settings</div>
+	<div class="col-xs-10">
 		<form>
 			<div class="form-group">
 				<label for="allow-from-uri">Set ALLOW-FROM to Place NodeBB in an iFrame:</label>
diff --git a/src/views/admin/settings/header.tpl b/src/views/admin/settings/header.tpl
index 115c222965..3a6521a787 100644
--- a/src/views/admin/settings/header.tpl
+++ b/src/views/admin/settings/header.tpl
@@ -1,5 +1,5 @@
 <div class="settings">
-	<h1 id="settings-title">General Settings</h1>
+	<h1 id="settings-title"></h1>
 
 	<div class="row">
 		<div class="col-xs-2">
diff --git a/src/views/admin/settings/sockets.tpl b/src/views/admin/settings/sockets.tpl
index 94ef41bf56..cf4dede341 100644
--- a/src/views/admin/settings/sockets.tpl
+++ b/src/views/admin/settings/sockets.tpl
@@ -1,8 +1,8 @@
 <!-- IMPORT admin/settings/header.tpl -->
 
-<div class="panel panel-default">
-	<div class="panel-heading">Web Socket Settings</div>
-	<div class="panel-body">
+<div class="row">
+	<div class="col-xs-2 settings-header">Reconnection Settings</div>
+	<div class="col-xs-10">
 		<form>
 			<div class="form-group">
 				<label for="maxReconnectionAttempts">Max Reconnection Attempts</label>