diff --git a/core/client/controllers/settings/debug.js b/core/client/controllers/debug.js
similarity index 100%
rename from core/client/controllers/settings/debug.js
rename to core/client/controllers/debug.js
diff --git a/core/client/router.js b/core/client/router.js
index a82e078e89..1f7cc03568 100644
--- a/core/client/router.js
+++ b/core/client/router.js
@@ -21,7 +21,6 @@ Router.map(function () {
     this.resource('settings', function () {
         this.route('general');
         this.route('user');
-        this.route('debug');
         this.route('apps');
     });
     this.route('debug');
diff --git a/core/client/routes/debug.js b/core/client/routes/debug.js
index 3fcacfec8b..1a503b2fa1 100644
--- a/core/client/routes/debug.js
+++ b/core/client/routes/debug.js
@@ -1,6 +1,12 @@
-var DebugRoute = Ember.Route.extend({
-    beforeModel: function () {
-        this.transitionTo('settings.debug');
+import styleBody from 'ghost/mixins/style-body';
+import SettingsModel from 'ghost/models/settings';
+
+var settingsModel = SettingsModel.create();
+
+var DebugRoute = Ember.Route.extend(styleBody, {
+    classNames: ['settings'],
+    model: function () {
+        return settingsModel;
     }
 });
 
diff --git a/core/client/routes/settings/debug.js b/core/client/routes/settings/debug.js
deleted file mode 100644
index e6f18b64b4..0000000000
--- a/core/client/routes/settings/debug.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import SettingsModel from 'ghost/models/settings';
-
-var settingsModel = SettingsModel.create();
-
-var DebugRoute = Ember.Route.extend({
-    model: function () {
-        return settingsModel;
-    }
-});
-
-export default DebugRoute;
diff --git a/core/client/templates/debug.hbs b/core/client/templates/debug.hbs
new file mode 100644
index 0000000000..016bc988e3
--- /dev/null
+++ b/core/client/templates/debug.hbs
@@ -0,0 +1,56 @@
+<div class="wrapper">
+    <aside class="settings-sidebar" role="complementary">
+        <header>
+            <h1 class="title">Ugly Debug Tools</h1>
+        </header>
+        <nav class="settings-menu">
+            <ul>
+                <li class="general"><a href="javascript:void(0);">General</a></li>
+            </ul>
+        </nav>
+    </aside>
+
+    <section class="settings-content active">
+        <header>
+            <h2 class="title">General</h2>
+        </header>
+        <section class="content">
+            <form id="settings-export">
+                <fieldset>
+                    <div class="form-group">
+                        <label>Export</label>
+                        <a class="button-save" {{bind-attr href=model.exportPath}}>Export</a>
+                        <p>Export the blog settings and data.</p>
+                    </div>
+                </fieldset>
+            </form>
+            {{#gh-form id="settings-import" enctype="multipart/form-data"}}
+                <fieldset>
+                    <div class="form-group">
+                        <label>Import</label>
+                        {{file-upload onUpload="importData" uploadButtonText=uploadButtonText}}
+                        <p>Import from another Ghost installation. If you import a user, this will replace the current user & log you out.</p>
+                    </div>
+                </fieldset>
+            {{/gh-form}}
+            <form id="settings-resetdb">
+                <fieldset>
+                    <div class="form-group">
+                        <label>Delete all Content</label>
+                        <a href="javascript:void(0);" class="button-delete js-delete" {{action "openModal" "deleteAll"}}>Delete</a>
+                        <p>Delete all posts and tags from the database.</p>
+                    </div>
+                </fieldset>
+            </form>
+            <form id="settings-testmail">
+                <fieldset>
+                    <div class="form-group">
+                        <label>Send a test email</label>
+                        <button type="submit" id="sendtestmail" class="button-save" {{action "sendTestEmail"}}>Send</button>
+                        <p>Sends a test email to your address.</p>
+                    </div>
+                </fieldset>
+            </form>
+        </section>
+    </section>
+</div>
diff --git a/core/client/templates/settings/debug.hbs b/core/client/templates/settings/debug.hbs
deleted file mode 100644
index 03e67dccf1..0000000000
--- a/core/client/templates/settings/debug.hbs
+++ /dev/null
@@ -1,41 +0,0 @@
-<header class="fade-in">
-    <h2 class="title">General</h2>
-</header>
-<section class="content fade-in">
-    <form id="settings-export">
-        <fieldset>
-            <div class="form-group">
-                <label>Export</label>
-                <a class="button-save" {{bind-attr href=model.exportPath}}>Export</a>
-                <p>Export the blog settings and data.</p>
-            </div>
-        </fieldset>
-    </form>
-    {{#gh-form id="settings-import" enctype="multipart/form-data"}}
-        <fieldset>
-            <div class="form-group">
-                <label>Import</label>
-                {{file-upload onUpload="importData" uploadButtonText=uploadButtonText}}
-                <p>Import from another Ghost installation. If you import a user, this will replace the current user & log you out.</p>
-            </div>
-        </fieldset>
-    {{/gh-form}}
-    <form id="settings-resetdb">
-        <fieldset>
-            <div class="form-group">
-                <label>Delete all Content</label>
-                <a href="javascript:void(0);" class="button-delete js-delete" {{action "openModal" "deleteAll"}}>Delete</a>
-                <p>Delete all posts and tags from the database.</p>
-            </div>
-        </fieldset>
-    </form>
-    <form id="settings-testmail">
-        <fieldset>
-            <div class="form-group">
-                <label>Send a test email</label>
-                <button type="submit" id="sendtestmail" class="button-save" {{action "sendTestEmail"}}>Send</button>
-                <p>Sends a test email to your address.</p>
-            </div>
-        </fieldset>
-    </form>
-</section>