diff --git a/src/views/admin/settings/group.tpl b/src/views/admin/settings/group.tpl
index 11a3c41f72..0d57b6c989 100644
--- a/src/views/admin/settings/group.tpl
+++ b/src/views/admin/settings/group.tpl
@@ -1,8 +1,8 @@
 <!-- IMPORT admin/settings/header.tpl -->
 
-<div class="panel panel-default">
-	<div class="panel-heading">General</div>
-	<div class="panel-body">
+<div class="row">
+	<div class="col-xs-2 settings-header">General</div>
+	<div class="col-xs-10">
 		<form role="form">
 			<div class="checkbox">
 				<label>
diff --git a/src/views/admin/settings/guest.tpl b/src/views/admin/settings/guest.tpl
index e338ce3553..7691cad216 100644
--- a/src/views/admin/settings/guest.tpl
+++ b/src/views/admin/settings/guest.tpl
@@ -1,24 +1,27 @@
 <!-- IMPORT admin/settings/header.tpl -->
 
-<div class="panel panel-default">
-	<div class="panel-heading">Guests</div>
-	<div class="panel-body">
-		<p class="alert alert-info">
-			These options affect guest users as a whole. Control over which categories a guest can see or post to is handled in
-			the categories themselves
-		</p>
-
+<div class="row">
+	<div class="col-xs-2 settings-header">Guest Handles</div>
+	<div class="col-xs-10">
 		<form role="form">
 			<div class="checkbox">
 				<label>
 					<input type="checkbox" data-field="allowGuestHandles"> <strong>Allow guest handles</strong>
 					<p class="help-block">
 						This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled,
-						the will simply be called "Guest" (or the equivalent in the forum&apos;s selected language)
+						the will simply be called "Guest"
 					</p>
 				</label>
 			</div>
+		</form>
+	</div>
+</div>
 
+
+<div class="row">
+	<div class="col-xs-2 settings-header">Guest Privileges</div>
+	<div class="col-xs-10">
+		<form role="form">
 			<div class="checkbox">
 				<label>
 					<input type="checkbox" data-field="allowGuestSearching"> <strong>Allow guests to search without logging in</strong>
@@ -31,8 +34,6 @@
 				</label>
 			</div>
 		</form>
-
-
 	</div>
 </div>