diff --git a/public/src/forum/admin/categories.js b/public/src/forum/admin/categories.js
index 2065149840..c7e57dd26b 100644
--- a/public/src/forum/admin/categories.js
+++ b/public/src/forum/admin/categories.js
@@ -122,7 +122,7 @@ define(['uploader'], function(uploader) {
 				}
 			});
 
-			$('#save').on('click', save);
+			$('.save').on('click', save);
 			$('#addNew').on('click', showCreateCategoryModal);
 			$('#create-category-btn').on('click', createNewCategory);
 
diff --git a/public/templates/admin/categories.tpl b/public/templates/admin/categories.tpl
index 8b2105cedc..ae6af7707c 100644
--- a/public/templates/admin/categories.tpl
+++ b/public/templates/admin/categories.tpl
@@ -3,6 +3,8 @@
 	<h1><i class="fa fa-folder"></i> Categories</h1>
 	<hr />
 
+	<button class="btn btn-primary" id="addNew">Add New</button>
+	<hr />
 	<ul class="nav nav-pills">
 		<li class='active'><a href='/admin/categories/active'>Active</a></li>
 		<li class=''><a href='/admin/categories/disabled'>Disabled</a></li>
@@ -50,7 +52,7 @@
 								</div>
 							</div>
 							<div class="row">
-								<div class="col-md-8 col-sm-6">
+								<div class="col-md-12 col-sm-12">
 									<div class="form-group">
 										<div class="form-group">
 											<label for="cid-{categories.cid}-description">Description</label>
@@ -58,22 +60,7 @@
 										</div>
 									</div>
 								</div>
-								<div class="col-md-4 col-sm-6">
-									<div class="form-group">
-										<div class="form-group">
-											<label>&nbsp;</label>
-											<div class="dropdown">
-												<button type="button" class="btn btn-default" data-toggle="dropdown"><i class="fa fa-cogs"></i> Options</button>
-												<ul class="dropdown-menu" role="menu">
-													<li class="permissions"><a href="#"><i class="fa fa-ban"></i> Access Control</a></li>
-													<hr />
-													<li data-disabled="{categories.disabled}"><a href="#"></a></li>
-												</ul>
-												<button type="button" data-name="image" data-value="{categories.image}" class="btn btn-default upload-button"><i class="fa fa-upload"></i> Image</button>
-											</div>
-										</div>
-									</div>
-								</div>
+
 							</div>
 							<div class="row">
 								<div class="col-sm-4 col-xs-12">
@@ -96,10 +83,27 @@
 								</div>
 								<div class="col-sm-4 col-xs-12">
 									<div class="form-group">
-										<label for="cid-{categories.cid}-link">Is Link (if set, category acts as external link)</label>
+										<label for="cid-{categories.cid}-link">External Link</label>
 										<input id="cid-{categories.cid}-link" type="text" class="form-control" placeholder="http://domain.com" data-name="link" value="{categories.link}" />
 									</div>
 								</div>
+								<div class="col-sm-4 col-xs-12">
+									<div class="form-group">
+
+										<label>&nbsp;</label>
+										<div class="dropdown">
+											<button type="button" class="btn btn-default" data-toggle="dropdown"><i class="fa fa-cogs"></i> Options</button>
+											<ul class="dropdown-menu" role="menu">
+												<li class="permissions"><a href="#"><i class="fa fa-ban"></i> Access Control</a></li>
+												<hr />
+												<li data-disabled="{categories.disabled}"><a href="#"></a></li>
+											</ul>
+											<button type="button" data-name="image" data-value="{categories.image}" class="btn btn-default upload-button"><i class="fa fa-upload"></i> Image</button>
+											<button class="btn btn-primary" class="save">Save</button>
+										</div>
+
+									</div>
+								</div>
 							</div>
 
 
@@ -112,8 +116,7 @@
 		<!-- END categories -->
 		</ul>
 
-		<button class="btn btn-lg btn-primary" id="save">Save</button>
-		<button class="btn btn-lg btn-primary" id="addNew">Add New</button>
+
 	</div>
 
 	<div id="new-category-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="Add New Modal" aria-hidden="true">
diff --git a/public/templates/admin/languages.tpl b/public/templates/admin/languages.tpl
index 3c4a266e6b..970c18f125 100644
--- a/public/templates/admin/languages.tpl
+++ b/public/templates/admin/languages.tpl
@@ -21,4 +21,4 @@
 	</form>
 </div>
 
-<button class="btn btn-lg btn-primary" id="save">Save</button>
\ No newline at end of file
+<button class="btn btn-primary" id="save">Save</button>
\ No newline at end of file
diff --git a/public/templates/admin/logger.tpl b/public/templates/admin/logger.tpl
index 8739d80896..b25f7799ce 100644
--- a/public/templates/admin/logger.tpl
+++ b/public/templates/admin/logger.tpl
@@ -37,7 +37,7 @@
 	</form>
 </div>
 
-<button class="btn btn-lg btn-primary" id="save">Save</button>
+<button class="btn btn-primary" id="save">Save</button>
 
 <script>
 	require(['forum/admin/settings'], function(Settings) {
diff --git a/public/templates/admin/motd.tpl b/public/templates/admin/motd.tpl
index 0bf0bb5ab4..ff56ba2bce 100644
--- a/public/templates/admin/motd.tpl
+++ b/public/templates/admin/motd.tpl
@@ -24,7 +24,7 @@
 	</form>
 </div>
 
-<button class="btn btn-lg btn-primary" id="save" checked>Save</button>
+<button class="btn btn-primary" id="save" checked>Save</button>
 
 <script>
 	require(['forum/admin/settings'], function(Settings) {
diff --git a/public/templates/admin/settings.tpl b/public/templates/admin/settings.tpl
index f4d13233b0..7ce4b4dd7f 100644
--- a/public/templates/admin/settings.tpl
+++ b/public/templates/admin/settings.tpl
@@ -29,6 +29,22 @@
 				<label>Favicon</label><br />
 				<input id="faviconUrl" type="text" class="form-control" placeholder="favicon.ico" data-field="brand:favicon" /><br />
 				<input id="uploadFaviconBtn" type="button" class="btn btn-default" value="Upload Favicon"></input> <br />
+				<hr/>
+				<div class="checkbox">
+					<label>
+						<input type="checkbox" data-field="allowGuestSearching"> <strong>Allow guests to search without logging in</strong>
+					</label>
+				</div>
+				<div class="checkbox">
+					<label>
+						<input type="checkbox" data-field="useOutgoingLinksPage"> <strong>Use Outgoing Links Warning Page</strong>
+					</label>
+				</div>
+				<div class="checkbox">
+					<label>
+						<input type="checkbox" data-field="disableSocialButtons"> <strong>Disable social buttons</strong>
+					</label>
+				</div>
 			</form>
 		</div>
 	</div>
@@ -127,21 +143,6 @@
 						<input type="checkbox" data-field="allowGuestPosting"> <strong>Allow guests to post without logging in</strong>
 					</label>
 				</div>
-				<div class="checkbox">
-					<label>
-						<input type="checkbox" data-field="allowGuestSearching"> <strong>Allow guests to search without logging in</strong>
-					</label>
-				</div>
-				<div class="checkbox">
-					<label>
-						<input type="checkbox" data-field="useOutgoingLinksPage"> <strong>Use Outgoing Links Warning Page</strong>
-					</label>
-				</div>
-				<div class="checkbox">
-					<label>
-						<input type="checkbox" data-field="disableSocialButtons"> <strong>Disable social buttons</strong>
-					</label>
-				</div>
 				<div class="checkbox">
 					<label>
 						<input type="checkbox" data-field="allowFileUploads"> <strong>Allow users to upload regular files</strong>
@@ -178,7 +179,7 @@
 </div>
 
 
-<button class="btn btn-lg btn-primary" id="save">Save</button>
+<button class="btn btn-primary" id="save">Save</button>
 
 <script>
 	require(['forum/admin/settings'], function(Settings) {
diff --git a/public/templates/admin/themes.tpl b/public/templates/admin/themes.tpl
index 6fdf593aad..331d85f6e8 100644
--- a/public/templates/admin/themes.tpl
+++ b/public/templates/admin/themes.tpl
@@ -47,7 +47,7 @@
 				</div>
 			</form>
 
-			<button class="btn btn-lg btn-primary" id="save">Save</button>
+			<button class="btn btn-primary" id="save">Save</button>
 		</div>
 	</div>
 </div>
diff --git a/public/templates/admin/topics.tpl b/public/templates/admin/topics.tpl
index 050b74b3b0..c2f2ecdbe6 100644
--- a/public/templates/admin/topics.tpl
+++ b/public/templates/admin/topics.tpl
@@ -26,7 +26,7 @@
 </div>
 <!-- ELSE -->
 <div class="text-center">
-	<button id="topics_loadmore" class="btn btn-primary btn-lg">Load More Topics</button>
+	<button id="topics_loadmore" class="btn btn-primary">Load More Topics</button>
 </div>
 <!-- ENDIF notopics -->