diff --git a/views/options/index.jade b/views/options/index.jade
index b1112b03c6..fec523470a 100644
--- a/views/options/index.jade
+++ b/views/options/index.jade
@@ -52,4 +52,4 @@
       tab-heading
         i.icon-wrench
         | Settings
-      app:settings:settings-pane
\ No newline at end of file
+      include ./settings
\ No newline at end of file
diff --git a/views/options/settings.jade b/views/options/settings.jade
new file mode 100644
index 0000000000..090af28120
--- /dev/null
+++ b/views/options/settings.jade
@@ -0,0 +1,33 @@
+.row-fluid
+  .personal-options.span6.border-right
+    h2 Settings
+    h4 Custom Day Start
+    .option-group.option-short
+      input.option-content.option-time(type='number', min='0', max='24', value='{{user.preferences.dayStart}}')
+      span.input-suffix :00 (24h clock)
+      span(class='alert alert-warning') Doesn't save yet
+    div
+      small
+        | Habit defaults to check and reset your dailies at midnight in your time zone each day. You can customize the hour here (enter a number between 0 and 24).
+    hr
+    h4 Misc
+    button.btn(ng-hide='user.preferences.hideHeader', ng-click='set("user.preferences.hideHeader",true)') Show Header
+    button.btn(ng-show='user.preferences.hideHeader', ng-click='set("user.preferences.hideHeader",false)') Hide Header
+    div(ng-show='user.auth.local')
+      hr
+      h4 Change Password
+      derby-auth:changepassword
+    hr
+    h4 Danger Zone
+    a.btn.btn-danger(data-target='#reset-modal', data-toggle='modal', rel='tooltip', title='Resets your entire account (dangerous).') Reset
+    a.btn.btn-danger(data-target='#restore-modal', data-toggle='modal', rel='tooltip', title='Restores attributes to your character.') Restore
+    a.btn.btn-danger(data-target='#delete-modal', data-toggle='modal', rel='tooltip', title='Delete your account.') Delete
+  .span6
+    h2 API
+    small Copy these for use in third party applications.
+    h6 User ID
+    pre.prettyprint {{user.id}}
+    h6 API Token
+    pre.prettyprint {{user.apiToken}}
+    h6 QR Code
+    img(src='https://chart.googleapis.com/chart?cht=qr&chs=200x200&chl=%7Baddress%3A%22https%3A%2F%2Fhabitrpg.com%22%2Cuser%3A%22{{user.id}}%22%2Ckey%3A%22{{user.apiToken}}%22%7D,&choe=UTF-8&chld=L', alt='qrcode')
diff --git a/views/options/settings.html b/views/shared/modals/settings.html
similarity index 66%
rename from views/options/settings.html
rename to views/shared/modals/settings.html
index 33a902492e..b8e7a4e0f2 100644
--- a/views/options/settings.html
+++ b/views/shared/modals/settings.html
@@ -1,48 +1,3 @@
-<settings-pane:>
-    <div class='row-fluid'>
-        <div class="personal-options span6 border-right">
-            <h2>Settings</h2>
-            <h4>Custom Day Start</h4>
-            <div class="option-group option-short">
-                <input class="option-content option-time" type="number" min=0 max=24 value={_user.preferences.dayStart}>
-                <span class="input-suffix">:00 (24h clock)</span>
-            </div>
-            <div>
-                <small>Habit defaults to check and reset your dailies at midnight in your time zone each day. You can customize the hour here (enter a number between 0 and 24).</small>
-            </div>
-
-            <hr/>
-            <h4>Misc</h4>
-            <button x-bind="click:toggleHeader" class="btn">{#if _user.preferences.hideHeader}Show Header{else}Hide Header{/}</button>
-
-            {{#if _user.auth.local}}
-            <hr/>
-            <h4>Change Password</h4>
-            <derby-auth:changePassword />
-            {{/}}
-
-            <hr/>
-            <h4>Danger Zone</h4>
-            <a class='btn btn-danger' data-target="#reset-modal" data-toggle="modal" rel=tooltip title="Resets your entire account (dangerous).">Reset</a>
-            &nbsp;<a class='btn btn-danger' data-target="#restore-modal" data-toggle="modal" rel=tooltip title="Restores attributes to your character.">Restore</a>
-            &nbsp;<a class='btn btn-danger' data-target="#delete-modal" data-toggle="modal" rel=tooltip title="Delete your account.">Delete</a>
-        </div>
-        <div class='span6'>
-            <h2>API</h2>
-            <small>Copy these for use in third party applications.</small>
-            <h6>User ID</h6>
-            <pre class=prettyprint>{_user.id}</pre>
-
-            <h6>API Token</h6>
-            <pre class=prettyprint>{_user.apiToken}</pre>
-			
-			<h6>QR Code</h6>
-			<img src='https://chart.googleapis.com/chart?cht=qr&chs=200x200&chl=
-			%7Baddress%3A%22https%3A%2F%2Fhabitrpg.com%22%2Cuser%3A%22{{_user.id}}%22%2Ckey%3A%22{{_user.apiToken}}%22%7D,&choe=UTF-8&chld=L' alt="qrcode"/>
-			
-        </div>
-    </div>
-
 <modals:>
     {{#if _loggedIn}}
         <app:modals:modal modalId="reset-modal" header="Reset">