diff --git a/controllers.js b/controllers.js
index ef76d10..cef2718 100644
--- a/controllers.js
+++ b/controllers.js
@@ -3,7 +3,9 @@
 const Controllers = {};
 
 Controllers.renderAdminPage = function (req, res) {
-	res.render('admin/plugins/composer-default', {});
+	res.render('admin/plugins/composer-default', {
+		title: 'Composer (Default)',
+	});
 };
 
 module.exports = Controllers;
diff --git a/library.js b/library.js
index 9969c13..4ed36c0 100644
--- a/library.js
+++ b/library.js
@@ -23,11 +23,11 @@ const plugin = module.exports;
 plugin.socketMethods = socketMethods;
 
 plugin.init = async function (data) {
+	const { router } = data;
+	const routeHelpers = require.main.require('./src/routes/helpers');
 	const controllers = require('./controllers');
 	SocketPlugins.composer = socketMethods;
-
-	data.router.get('/admin/plugins/composer-default', data.middleware.admin.buildHeader, controllers.renderAdminPage);
-	data.router.get('/api/admin/plugins/composer-default', controllers.renderAdminPage);
+	routeHelpers.setupAdminPageRoute(router, '/admin/plugins/composer-default', controllers.renderAdminPage);
 };
 
 plugin.appendConfig = async function (config) {
diff --git a/static/templates/admin/plugins/composer-default.tpl b/static/templates/admin/plugins/composer-default.tpl
index 80286e9..a7fa31c 100644
--- a/static/templates/admin/plugins/composer-default.tpl
+++ b/static/templates/admin/plugins/composer-default.tpl
@@ -1,18 +1,22 @@
-<form role="form" class="composer-default-settings">
-	<div class="row">
-		<div class="col-sm-2 col-12 settings-header">General</div>
-		<div class="col-sm-10 col-12">
-			<div class="form-check form-switch">
-				<input id="composeRouteEnabled" class="form-check-input" type="checkbox" name="composeRouteEnabled" />
-				<label for="composeRouteEnabled" class="form-check-label">Use a separate route for the composer</label>
-			</div>
+<div class="acp-page-container">
+	<!-- IMPORT admin/partials/settings/header.tpl -->
 
-			<div class="form-check form-switch">
-				<input type="checkbox" class="form-check-input" id="hidePreviewOnOpen" name="hidePreviewOnOpen" />
-				<label for="hidePreviewOnOpen" class="form-check-label">Hide preview on open</label>
-			</div>
+	<div class="row m-0">
+		<div id="spy-container" class="col-12 col-md-8 px-0 mb-4" tabindex="0">
+			<form role="form" class="composer-default-settings mb-4">
+				<div class="form-check form-switch">
+					<input id="composeRouteEnabled" class="form-check-input" type="checkbox" name="composeRouteEnabled" />
+					<label for="composeRouteEnabled" class="form-check-label">Use a separate route for the composer</label>
+				</div>
+
+				<div class="form-check form-switch">
+					<input type="checkbox" class="form-check-input" id="hidePreviewOnOpen" name="hidePreviewOnOpen" />
+					<label for="hidePreviewOnOpen" class="form-check-label">Hide preview on open</label>
+				</div>
+			</form>
 		</div>
-	</div>
-</form>
 
-<!-- IMPORT admin/partials/save_button.tpl -->
\ No newline at end of file
+		<!-- IMPORT admin/partials/settings/toc.tpl -->
+	</div>
+</div>
+