diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js
index 3c380aa213..8f0523d32d 100644
--- a/public/src/admin/admin.js
+++ b/public/src/admin/admin.js
@@ -38,6 +38,12 @@ require('../app');
 		hooks.on('action:ajaxify.end', () => {
 			showCorrectNavTab();
 			startLogoutTimer();
+			if ($('.settings').length) {
+				require(['admin/settings'], function (Settings) {
+					Settings.prepare();
+					Settings.populateTOC();
+				});
+			}
 		});
 	});
 
diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js
index c3b682e96f..d678a89edd 100644
--- a/public/src/admin/manage/categories.js
+++ b/public/src/admin/manage/categories.js
@@ -9,6 +9,7 @@ define('admin/manage/categories', [
 	'bootbox',
 	'alerts',
 ], function (translator, Benchpress, categorySelector, api, Sortable, bootbox, alerts) {
+	Sortable = Sortable.default;
 	const Categories = {};
 	let newCategoryId = -1;
 	let sortables;
diff --git a/src/views/admin/advanced/cache.tpl b/src/views/admin/advanced/cache.tpl
index 46205e5fef..8de6734da0 100644
--- a/src/views/admin/advanced/cache.tpl
+++ b/src/views/admin/advanced/cache.tpl
@@ -1,4 +1,4 @@
-
+<!-- IMPORT admin/partials/settings/header.tpl -->
 <div class="row post-cache">
 	<div class="col-lg-12">
 		<div class="row">
@@ -118,7 +118,4 @@
 	</div>
 </div>
 
-
-<button id="save" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
-    <i class="material-icons">save</i>
-</button>
+<!-- IMPORT admin/partials/settings/footer.tpl -->
diff --git a/src/views/admin/development/logger.tpl b/src/views/admin/development/logger.tpl
index 01c9688718..04e2004154 100644
--- a/src/views/admin/development/logger.tpl
+++ b/src/views/admin/development/logger.tpl
@@ -1,5 +1,6 @@
+<!-- IMPORT admin/partials/settings/header.tpl -->
 <div class="row logger">
-	<div class="col-lg-9">
+	<div class="col-lg-12">
 		<div class="panel panel-default">
 			<div class="panel-heading">[[admin/development/logger:logger-settings]]</div>
 			<div class="panel-body">
@@ -31,22 +32,7 @@
 				</form>
 			</div>
 		</div>
-
-	</div>
-
-	<div class="col-lg-3 acp-sidebar">
-		<div class="panel panel-default">
-			<div class="panel-heading">[[admin/development/logger:control-panel]]</div>
-			<div class="panel-body">
-				<button class="btn btn-primary" id="save">[[admin/development/logger:update-settings]]</button>
-			</div>
-		</div>
 	</div>
 </div>
 
-
-<script>
-	require(['admin/settings'], function(Settings) {
-		Settings.prepare();
-	});
-</script>
+<!-- IMPORT admin/partials/settings/footer.tpl -->
diff --git a/src/views/admin/partials/settings/footer.tpl b/src/views/admin/partials/settings/footer.tpl
index af46d0ad59..c8e884c6ab 100644
--- a/src/views/admin/partials/settings/footer.tpl
+++ b/src/views/admin/partials/settings/footer.tpl
@@ -3,10 +3,3 @@
 <button id="save" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
 	<i class="material-icons">save</i>
 </button>
-
-<script>
-	require(['admin/settings'], function(Settings) {
-		Settings.prepare();
-		Settings.populateTOC();
-	});
-</script>
diff --git a/src/views/admin/settings/homepage.tpl b/src/views/admin/settings/homepage.tpl
index 625a59aa62..dbf30482d9 100644
--- a/src/views/admin/settings/homepage.tpl
+++ b/src/views/admin/settings/homepage.tpl
@@ -1,3 +1,4 @@
+<!-- IMPORT admin/partials/settings/header.tpl -->
 <div class="row">
 	<div class="col-sm-2 col-xs-12 settings-header">[[admin/settings/homepage:home-page]]</div>
 	<div class="col-sm-10 col-xs-12">
@@ -33,12 +34,4 @@
 	</div>
 </div>
 
-<button id="save" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
-	<i class="material-icons">save</i>
-</button>
-
-<script>
-	require(['admin/settings'], function(Settings) {
-		Settings.prepare();
-	});
-</script>
+<!-- IMPORT admin/partials/settings/footer.tpl -->