diff --git a/core/admin/views/blog.hbs b/core/admin/views/blog.hbs
index f0aa9bbe0e..730984d3b8 100644
--- a/core/admin/views/blog.hbs
+++ b/core/admin/views/blog.hbs
@@ -1,61 +1,59 @@
-{{!< default}}
-<main role="main">
+{{#contentFor 'bodyScripts'}}
+    <script src="/core/admin/assets/js/blog.js"></script>
+{{/contentFor}}
 
-  <section class="content-list">
-    <header class="floatingheader">
+{{!< default}}
+<section class="content-list">
+  <header class="floatingheader">
       <section class="content-filter">
-        <a class="dropdown" href="#" data-toggle=".menu-drop">All Posts</a>
-        <ul class="menu-drop">
-          <li class="active"><a href="#">All Posts</a></li>
-          <li><a href="#">Recently Edited</a></li>
-          <li><a href="#">By Author...</a></li>
-          <li><a href="#">Search</a></li>
-        </ul>
+          <a class="dropdown" href="#" data-toggle=".menu-drop">All Posts</a>
+          <ul class="menu-drop">
+              <li class="active"><a href="#">All Posts</a></li>
+              <li><a href="#">Recently Edited</a></li>
+              <li><a href="#">By Author...</a></li>
+              <li><a href="#">Search</a></li>
+          </ul>
       </section>
       <a href="/ghost/editor" class="button button-add"><span class="hidden">New Post</span></a>
-    </header>
-    <section class="content-list-content">
+  </header>
+  <section class="content-list-content">
       <ol>
-        {{#each posts}}
-            {{! #if featured class="featured"{{/if}}
-        <li data-id="{{id}}" data-content="{{content_html}}">
-          <a class="permalink" href="#">
-            <h3 class="entry-title">{{title}}</h3>
-            <section class="entry-meta">
-              <time datetime="2013-01-04" class="date">5 minutes ago</time>
-              {{!<span class="views">1,934</span>}}
-            </section>
-          </a>
-        </li>
-        {{/each}}
+          {{#each posts}}
+          {{! #if featured class="featured"{{/if}}
+              <li data-id="{{id}}" data-content="{{content_html}}">
+                  <a class="permalink" href="#">
+                      <h3 class="entry-title">{{title}}</h3>
+                      <section class="entry-meta">
+                          <time datetime="2013-01-04" class="date">5 minutes ago</time>
+                          {{!<span class="views">1,934</span>}}
+                      </section>
+                  </a>
+              </li>
+          {{/each}}
       </ol>
-    </section>
   </section>
+</section>
 
-  <section class="content-preview">
-    <header class="floatingheader">
+<section class="content-preview">
+<header class="floatingheader">
 
-      <a class="unfeatured" href="#"><span class="hidden">Star</span></a>
-      {{! TODO: JavaScript toggle featured/unfeatured}}
+    <a class="unfeatured" href="#"><span class="hidden">Star</span></a>
+    {{! TODO: JavaScript toggle featured/unfeatured}}
 
-      <span class="status">Published</span>
-      <span class="normal">by</span>
-      <span class="author">John O'Nolan</span>
-      <section class="post-controls">
+    <span class="status">Published</span>
+    <span class="normal">by</span>
+    <span class="author">John O'Nolan</span>
+    <section class="post-controls">
         <a class="post-edit" href="#"><span class="hidden">Edit Post</span></a>
         <a class="post-settings" href="#" data-toggle=".menu-drop-right"><span class="hidden">Post Settings</span></a>
         <ul class="menu-drop-right">
-          <li><a href="#">URL</a></li>
-          <li><a href="#">Something</a></li>
-          <li><a href="#">Delete</a></li>
+            <li><a href="#">URL</a></li>
+            <li><a href="#">Something</a></li>
+            <li><a href="#">Delete</a></li>
         </ul>
-      </section>
-    </header>
-    <section class="content-preview-content">
-      <div class="wrapper"></div>
     </section>
-  </section>
-
-</main>
-
-<script src="/core/admin/assets/js/blog.js"></script>
+</header>
+<section class="content-preview-content">
+    <div class="wrapper"></div>
+</section>
+</section>
\ No newline at end of file
diff --git a/core/admin/views/dashboard.hbs b/core/admin/views/dashboard.hbs
index ddead19500..71cf077760 100644
--- a/core/admin/views/dashboard.hbs
+++ b/core/admin/views/dashboard.hbs
@@ -1,254 +1,63 @@
-{{!< default}}
-<main role="main">
+{{#contentFor 'bodyScripts'}}
+    <script src="/core/admin/assets/lib/chart.min.js"></script>
+    <script>
+    $(document).ready(function(){
 
+      //$('body').click(function(){
+        $('.time').fadeIn(1000);
+        $('.image').delay(300).fadeIn(1000);
+        $('.posts').delay(600).fadeIn(900, function(){
+
+          var ctx = $("#poststats").get(0).getContext("2d");
+          var data = [
+            {
+              value: 9,
+              color:"#9ec14a"
+            },
+            {
+              value : 4,
+              color : "#f9e15d"
+            },
+            {
+              value : 2,
+              color : "#EB5700"
+            }
+          ];
+          var options = {
+            animationEasing: 'easeOutQuart',
+            percentageInnerCutout: 60,
+            segmentStrokeColor : "#efefef"
+          };
+          var poststats = new Chart(ctx).Doughnut(data, options);
+
+        });
+
+        $('.stats').delay(800).fadeIn(1000);
+        $('.facebook').delay(1000).fadeIn(1000);
+        $('.gplus').delay(1200).fadeIn(1000);
+        $('.twitter').delay(1300).fadeIn(1000);
+        $('.campaignmonitor').delay(1400).fadeIn(1000);
+      //});
+
+    });
+    </script>
+{{/contentFor}}
+
+{{!< default}}
 <div class="time widget"></div>
 <div class="image widget"></div>
 <div class="posts widget none">
-  <div class="chart">
-    <canvas id="poststats" width="250" height="250"></canvas>
-    <ul class="data">
-      <li><span class="ready">9</span> Ready</li>
-      <li><span class="pending">4</span> Pending</li>
-      <li><span class="draft">1</span> Draft</li>
-    </ul>
-  </div>
+    <div class="chart">
+        <canvas id="poststats" width="250" height="250"></canvas>
+        <ul class="data">
+            <li><span class="ready">9</span> Ready</li>
+            <li><span class="pending">4</span> Pending</li>
+            <li><span class="draft">1</span> Draft</li>
+        </ul>
+    </div>
 </div>
 <div class="stats widget"></div>
 <div class="facebook widget"></div>
 <div class="gplus widget none"></div>
 <div class="twitter widget"></div>
-<div class="campaignmonitor widget none"></div>
-
-{{!
-  <section class="dashboard-controls">
-    <div class="text left"><strong>Welcome back</strong>, John.</div>
-    <nav class="controls-nav">
-      <ul class="nav inline">
-        <li><a href="/ghost/editor"><span class="icon-new"></span> New Post</a></li>
-        <li><a href="#"><span class="icon-users"></span> Authors</a></li>
-        <li><a href="#"><span class="icon-analytics"></span> Analytics</a></li>
-      </ul>
-    </nav>
-    <div class="text right"><a href="#"><span class="icon-settings"></span><span class="hidden">Settings</span></a></div>
-    <div class="clearfix"></div><!--TODO: replace this later with something less shit-->
-  </section>
-
-  <section class="widget time-date">
-    <header>
-      London, United Kingdom
-    </header>
-    <section class="content">
-      <div class="time">
-        8:55<span>am</span>
-      </div>
-      <div class="date"><!--TODO: convert to html5 <date>-->
-        <span>Wednesday</span>
-        13 June 2012
-      </div>
-    </section>
-    <footer>
-      Timezone: UTC +1
-    </footer>
-  </section>
-
-  <section class="widget">
-    <header>
-      Top Authors This Month
-    </header>
-    <section class="content">
-      <table class="table">
-        <thead>
-          <tr>
-            <td>Name</td>
-            <td>Posts</td>
-            <td>Comments</td>
-            <td>tweets</td>
-            <td>Likes</td>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td><strong class="text-uppercase"><img class="user-img" src="/ghost/assets/img/user.jpg" width="34px" height="34px" alt=""> John</strong></td>
-            <td><strong class="callout">32</strong> <span>Posts</span></td>
-            <td><strong>231</strong> <span>Comments</span></td>
-            <td><strong>103</strong> <span>tweets</span></td>
-          </tr>
-          <tr>
-            <td><strong class="text-uppercase"><img class="user-img" src="/ghost/assets/img/user.jpg" width="34px" height="34px" alt=""> James</strong></td>
-            <td><strong>32</strong> <span>Posts</span></td>
-            <td><strong class="callout">231</strong> <span>Comments</span></td>
-            <td><strong>103</strong> <span>tweets</span></td>
-          </tr>
-          <tr>
-            <td><strong class="text-uppercase"><img class="user-img" src="/ghost/assets/img/user.jpg" width="34px" height="34px" alt=""> Jerry</strong></td>
-            <td><strong>32</strong> <span>Posts</span></td>
-            <td><strong>231</strong> <span>Comments</span></td>
-            <td><strong class="callout">103</strong> <span>tweets</span></td>
-          </tr>
-        </tbody>
-      </table>
-    </section>
-    <footer>
-      Ghost Stats
-    </footer>
-  </section>
-
-  <section class="widget post-statuses">
-    <header>
-      Post Statuses
-    </header>
-    <section class="content">
-      <div class="status-levels left">
-        <div class="scheduled" style="height: 30px;">Scheduled</div>
-        <div class="pending" style="height: 50px;">Pending</div>
-        <div class="draft" style="height: 60px;">Draft</div>
-      </div>
-      <div class="status-text left">
-        <div class="scheduled"><strong>5</strong> Scheduled</div>
-        <div class="pending"><strong>12</strong> Pending</div>
-        <div class="draft"><strong>32</strong> Draft</div>
-      </div>
-    </section>
-    <footer>
-      Ghost Stats
-    </footer>
-  </section>
-
-  <section class="widget total-views">
-    <header>
-      Total Page Views (Last 30 Days)
-    </header>
-    <section class="content">
-      <div class="widget-stats">
-        <span>37,921</span>
-        <span>
-          Previous <strong>32,419</strong> / <strong class="positive-text">+15.4%</strong>
-        </span>
-      </div>
-    </section>
-    <footer>
-      Google Analytics
-    </footer>
-  </section>
-
-  <section class="widget live-visitors">
-    <header>
-      Live Visitors
-    </header>
-    <section class="content">
-      <div class="widget-stats">
-        <span>124</span>
-        <span>
-          <strong>391</strong> max this month
-        </span>
-      </div>
-    </section>
-    <footer>
-      Woopra
-    </footer>
-  </section>
-
-  <section class="widget">
-    <header>
-      Twitter Followers
-    </header>
-    <section class="content">
-      <div class="widget-stats">
-        <span>12,304</span>
-        <span>
-          <strong class="positive-text">+123</strong> this month
-        </span>
-      </div>
-    </section>
-    <footer>
-      @ghost
-    </footer>
-  </section>
-
-  <section class="widget todays-traffic">
-    <header>
-      Today’s Traffic (Actions)
-    </header>
-    <section class="content">
-      <ul class="nav">
-        <li>
-          <div>Post Title Excerpt Which is Li... <strong class="right">327</strong></div>
-        </li>
-        <li>
-          <div>My homepage <strong class="right">327</strong></div>
-        </li>
-        <li>
-          <div>Another long ass post about som... <strong class="right">327</strong></div>
-        </li>
-        <li>
-          <div>Boracay time! <strong class="right">327</strong></div>
-        </li>
-      </ul>
-    </section>
-    <footer>
-      Woopra
-    </footer>
-  </section>
-
-  <section class="widget">
-    <header>
-      Total Likes
-    </header>
-    <section class="content">
-      <div class="widget-stats">
-        <span>6,931</span>
-        <span>
-          <strong class="negative-text">-23</strong> this month
-        </span>
-      </div>
-    </section>
-    <footer>
-      Facebook
-    </footer>
-  </section>
-  }}
-
-</main>
-
-<script src="/core/admin/assets/lib/chart.min.js"></script>
-<script>
-$(document).ready(function(){
-
-  //$('body').click(function(){
-    $('.time').fadeIn(1000);
-    $('.image').delay(300).fadeIn(1000);
-    $('.posts').delay(600).fadeIn(900, function(){
-
-      var ctx = $("#poststats").get(0).getContext("2d");
-      var data = [
-        {
-          value: 9,
-          color:"#9ec14a"
-        },
-        {
-          value : 4,
-          color : "#f9e15d"
-        },
-        {
-          value : 2,
-          color : "#EB5700"
-        }
-      ]
-      var options = {
-        animationEasing: 'easeOutQuart',
-        percentageInnerCutout: 60,
-        segmentStrokeColor : "#efefef"
-      }
-      var poststats = new Chart(ctx).Doughnut(data, options);
-
-    });
-
-    $('.stats').delay(800).fadeIn(1000);
-    $('.facebook').delay(1000).fadeIn(1000);
-    $('.gplus').delay(1200).fadeIn(1000);
-    $('.twitter').delay(1300).fadeIn(1000);
-    $('.campaignmonitor').delay(1400).fadeIn(1000);
-  //});
-
-});
-</script>
\ No newline at end of file
+<div class="campaignmonitor widget none"></div>
\ No newline at end of file
diff --git a/core/admin/views/debug.hbs b/core/admin/views/debug.hbs
index 080e463821..9369090278 100644
--- a/core/admin/views/debug.hbs
+++ b/core/admin/views/debug.hbs
@@ -1,41 +1,38 @@
 {{!< default}}
-<main role="main">
-
-  <div class="wrapper">
+<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="Data management"><a href="#">General</a></li>
-        </ul>
-      </nav>
+        <header>
+            <h1 class="title">Ugly Debug Tools</h1>
+        </header>
+        <nav class="settings-menu">
+            <ul>
+                <li class="Data management"><a href="#">General</a></li>
+            </ul>
+        </nav>
     </aside>
     <section class="settings-content">
-      <header>
-        <h2 class="title">General</h2>
-        <button class="button-save">Save</button>
-      </header>
-      <section class="content">
-        {{> flashes}}
-        <form id="settings-general">
-          <fieldset>
-            <label>
-              <b>Delete Database</b>
-                <a href="/ghost/debug/db/delete/" class="button-delete">Delete</a>
-              <p>Delete the entire database so you can start again with empty tables</p>
-            </label>
-            <label>
-              <b>Populate Database</b>
-              <a href="/ghost/debug/db/populate/" class="button-add">Populate</a>
-              <p>Populate the database with the default fixtures (<strong>Warning: </strong>only works on empty DB)</p>
-            </label>
-          </fieldset>
+        <header>
+            <h2 class="title">General</h2>
+            <button class="button-save">Save</button>
+        </header>
+        <section class="content">
+            {{> flashes}}
+            <form id="settings-general">
+                <fieldset>
+                    <label>
+                        <b>Delete Database</b>
+                        <a href="/ghost/debug/db/delete/" class="button-delete">Delete</a>
+                        <p>Delete the entire database so you can start again with empty tables</p>
+                    </label>
+                    <label>
+                        <b>Populate Database</b>
+                        <a href="/ghost/debug/db/populate/" class="button-add">Populate</a>
+                        <p>Populate the database with the default fixtures
+                            (<strong>Warning: </strong>only works on empty DB)</p>
+                    </label>
+                </fieldset>
 
-        </form>
-      </section>
+            </form>
+        </section>
     </section>
-  </div>
-
-</main>
+</div>
\ No newline at end of file
diff --git a/core/admin/views/default.hbs b/core/admin/views/default.hbs
index 23c133b076..5c82cbf8f0 100644
--- a/core/admin/views/default.hbs
+++ b/core/admin/views/default.hbs
@@ -2,6 +2,7 @@
 <!--[if lt IE 7]><html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
 <!--[if (IE 7)&!(IEMobile)]><html class="no-js lt-ie9 lt-ie8" lang="en"><![endif]-->
 <!--[if (IE 8)&!(IEMobile)]><html class="no-js lt-ie9" lang="en"><![endif]-->
+<!--[if (gte IE 9)| IEMobile |!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]-->
     <head>
         <meta charset="utf-8">
 
@@ -14,26 +15,31 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="apple-mobile-web-app-capable" content="yes" />
 
-        <!-- For all browsers -->
-        <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Lato:300,400,700">
-        <link rel="stylesheet" href="/core/admin/assets/css/screen.css">
-
         <link rel="shortcut icon" href="/favicon.ico">
-        <link rel="logo" type="image/svg" href="/core/admin/assets/images/logo.svg"/>
+        <link rel="logo" type="image/svg" href="/core/admin/assets/img/logo.svg"/>
         <meta http-equiv="cleartype" content="on">
 
-        <!-- need per file scripts and styles :/ -->
+        <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Lato:300,400,700">
+        <link rel="stylesheet" href="/core/admin/assets/css/screen.css">
         <link rel="stylesheet" type="text/css" href="/core/admin/assets/lib/codemirror/codemirror.css"> <!-- TODO: Kill this - #29 -->
         <link rel="stylesheet" type="text/css" href="/core/admin/assets/lib/icheck/css/icheck.css"> <!-- TODO: Kill this - #29 -->
+        {{{block "pageStyles"}}}
 
-        <!-- jQuery is for all so here for now -->
         <script type="text/javascript" src="/core/admin/assets/lib/jquery/jquery.min.js"></script>
+        <script type="text/javascript" src="/core/admin/assets/lib/icheck/jquery.icheck.min.js"></script> <!-- The right place for this? -->
         <script type="text/javascript" src="/core/admin/assets/js/toggle.js"></script>
         <script type="text/javascript" src="/core/admin/assets/js/admin-ui-temp.js"></script>
-        <script type="text/javascript" src="/core/admin/assets/lib/icheck/jquery.icheck.min.js"></script> <!-- The right place for this? -->
+        {{{block "headScripts"}}}
     </head>
     <body class="{{bodyClass}}">
         {{> navbar}}
-        {{{body}}}
+
+        <main role="main">
+            {{> flashes}}
+
+            {{{body}}}
+        </main>
+
+        {{{block "bodyScripts"}}}
     </body>
 </html>
\ No newline at end of file
diff --git a/core/admin/views/editor.hbs b/core/admin/views/editor.hbs
index 9722065128..0b972c6b01 100644
--- a/core/admin/views/editor.hbs
+++ b/core/admin/views/editor.hbs
@@ -1,65 +1,66 @@
+{{#contentFor 'bodyScripts'}}
+    <script src="/core/admin/assets/lib/codemirror/codemirror.js"></script>
+    <script src="/core/admin/assets/lib/codemirror/mode/markdown/markdown.js"></script>
+    <script src="/core/admin/assets/lib/showdown/showdown.js"></script>
+    <script src="/core/admin/assets/lib/showdown/extensions/ghostdown.js"></script>
+    <script src="/core/admin/assets/lib/shortcuts.js"></script>
+    <script src="/core/admin/assets/js/editor.js"></script>
+    <script src="/core/admin/assets/js/tagui.js"></script>
+{{/contentFor}}
+
 {{!< default}}
-<main role="main">
 {{! TODO: Add "scrolling" class only when one of the panels is scrolled down by 5px or more }}
-
-  <header>
+<header>
     <section class="box entry-title">
-      <input type="text" id="entry-title" placeholder="{{e "editor.entry_title.placeholder" "The Post Title Gets Inserted Up Here"}}" value="{{title}}">
+        <input type="text" id="entry-title"
+               placeholder="{{e "editor.entry_title.placeholder" "The Post Title Gets Inserted Up Here"}}"
+               value="{{title}}">
     </section>
-  </header>
+</header>
 
-  <section class="entry-markdown active">
+<section class="entry-markdown active">
     <header class="floatingheader">
-      {{e "editor.headers.markdown.label" "Markdown"}}
-      <a class="markdown-help" href="#"><span class="hidden">What is Markdown?</span></a>
+        {{e "editor.headers.markdown.label" "Markdown"}}
+        <a class="markdown-help" href="#"><span class="hidden">What is Markdown?</span></a>
     </header>
     <section class="entry-markdown-content">
-      <textarea id="entry-markdown">{{content}}</textarea>
+        <textarea id="entry-markdown">{{content}}</textarea>
     </section>
-  </section>{{!.entry-markdown}}
+</section>{{!.entry-markdown}}
 
-  <section class="entry-preview">
+<section class="entry-preview">
     <header class="floatingheader">
-      Preview <span class="entry-word-count">0 words</span>
+        Preview <span class="entry-word-count">0 words</span>
     </header>
     <section class="entry-preview-content">
-      <div class="rendered-markdown">
-        {{!The content gets inserted in here, bitches!}}
-      </div>
+        <div class="rendered-markdown">
+            {{!The content gets inserted in here, bitches!}}
+        </div>
     </section>
-  </section>{{!.entry-preview}}
+</section>{{!.entry-preview}}
 
-  <footer id="publish-bar">
+<footer id="publish-bar">
     <nav>
         <section id="entry-categories" href="#" class="left">
-          <label class="category-label" for="categories"><span class="hidden">Categories</span></label>
-          <div class="categories"></div>
-          <input type="hidden" class="category-holder" id="category-holder">
-          <input class="category-input" id="categories" type="text" data-populate-hidden="#category-holder" data-input-behaviour="tag" data-populate=".categories" />
-          <ul class="suggestions overlay" data-populate=".categories"></ul>
+            <label class="category-label" for="categories"><span class="hidden">Categories</span></label>
+            <div class="categories"></div>
+            <input type="hidden" class="category-holder" id="category-holder">
+            <input class="category-input" id="categories" type="text"
+                   data-populate-hidden="#category-holder" data-input-behaviour="tag" data-populate=".categories" />
+            <ul class="suggestions overlay" data-populate=".categories"></ul>
         </section>
         <div class="right">
-          <button id="entry-settings" href="#" class="button-link"><span class="hidden">Settings</span></button>
-          <section id="entry-actions" class="splitbutton-save">
-            <button type="button" class="button-save" data-state="save-draft">Save Draft</button>
-            <a class="options up" href="#"><span class="hidden">Options</span></a>
-            <ul class="editor-options overlay" style="display:none">
-              <li data-title="publish-now" data-url=""><a href="#">Publish Now</a></li>
-              <li data-title="queue" data-url=""><a href="#">Add to Queue</a></li>
-              <li data-title="publish-on" data-url=""><a href="#">Publish on...</a></li>
-              <li data-title="save-draft" data-url="" class="active"><a href="#">Save Draft</a></li>
-            </ul>
-          </section>
+            <button id="entry-settings" href="#" class="button-link"><span class="hidden">Settings</span></button>
+            <section id="entry-actions" class="splitbutton-save">
+                <button type="button" class="button-save" data-state="save-draft">Save Draft</button>
+                <a class="options up" href="#"><span class="hidden">Options</span></a>
+                <ul class="editor-options overlay" style="display:none">
+                    <li data-title="publish-now" data-url=""><a href="#">Publish Now</a></li>
+                    <li data-title="queue" data-url=""><a href="#">Add to Queue</a></li>
+                    <li data-title="publish-on" data-url=""><a href="#">Publish on...</a></li>
+                    <li data-title="save-draft" data-url="" class="active"><a href="#">Save Draft</a></li>
+                </ul>
+            </section>
         </div>
     </nav>
-  </footer>
-
-</main>
-
-<script src="/core/admin/assets/lib/codemirror/codemirror.js"></script>
-<script src="/core/admin/assets/lib/codemirror/mode/markdown/markdown.js"></script>
-<script src="/core/admin/assets/lib/showdown/showdown.js"></script>
-<script src="/core/admin/assets/lib/showdown/extensions/ghostdown.js"></script>
-<script src="/core/admin/assets/lib/shortcuts.js"></script>
-<script src="/core/admin/assets/js/editor.js"></script>
-<script src="/core/admin/assets/js/tagui.js"></script>
+</footer>
\ No newline at end of file
diff --git a/core/admin/views/partials/flashes.hbs b/core/admin/views/partials/flashes.hbs
index 74708c21a1..460bed84ed 100644
--- a/core/admin/views/partials/flashes.hbs
+++ b/core/admin/views/partials/flashes.hbs
@@ -1,4 +1,3 @@
-<div id="flashed"></div>
 {{#if messages}}
     {{#each messages.error}}
         <section class="notification-error">
diff --git a/core/admin/views/partials/navbar.hbs b/core/admin/views/partials/navbar.hbs
index f4543d6247..cd73c2313b 100644
--- a/core/admin/views/partials/navbar.hbs
+++ b/core/admin/views/partials/navbar.hbs
@@ -3,7 +3,7 @@
     <nav id="global-nav" role="navigation">
         <ul id="main-menu" >
             {{#each adminNav}}
-            <li class="{{navClass}}{{#if selected}} active{{/if}}"><a href="/ghost{{path}}">{{name}}</a></li>
+                <li class="{{navClass}}{{#if selected}} active{{/if}}"><a href="/ghost{{path}}">{{name}}</a></li>
             {{/each}}
 
             <li id="usermenu" class="subnav">
diff --git a/core/admin/views/settings.hbs b/core/admin/views/settings.hbs
index 7105f608ad..b8ad64409f 100644
--- a/core/admin/views/settings.hbs
+++ b/core/admin/views/settings.hbs
@@ -1,203 +1,202 @@
-{{!< default}}
-<main role="main">
+{{#contentFor 'bodyScripts'}}
+    <script src="/core/admin/assets/js/settings.js"></script>
+{{/contentFor}}
 
-  <div class="wrapper">
+{{!< default}}
+<div class="wrapper">
     <aside class="settings-sidebar" role="complementary">
-      <header>
-        <h1 class="title">Settings</h1>
-      </header>
-      <nav class="settings-menu">
-        <ul>
-          <li class="general active"><a href="#general">General</a></li>
-          <li class="publishing"><a href="#content">Content</a></li>
-          <li class="users"><a href="#users">Users</a></li>
-          <li class="appearance"><a href="#">Appearance</a></li>
-          <li class="services"><a href="#">Connected Services</a></li>
-          <li class="plugins"><a href="#">Plugins</a></li>
-        </ul>
-      </nav>
+        <header>
+            <h1 class="title">Settings</h1>
+        </header>
+        <nav class="settings-menu">
+            <ul>
+                <li class="general active"><a href="#general">General</a></li>
+                <li class="publishing"><a href="#content">Content</a></li>
+                <li class="users"><a href="#users">Users</a></li>
+                <li class="appearance"><a href="#">Appearance</a></li>
+                <li class="services"><a href="#">Connected Services</a></li>
+                <li class="plugins"><a href="#">Plugins</a></li>
+            </ul>
+        </nav>
     </aside>
     <section id="general" class="settings-content active">
-      <header>
-        <h2 class="title">General</h2>
-        <section class="page-actions">
-          <button class="button-save">Save</button>
+        <header>
+            <h2 class="title">General</h2>
+            <section class="page-actions">
+                <button class="button-save">Save</button>
+            </section>
+        </header>
+        <section class="content">
+            <form id="settings-general">
+                <fieldset>
+                    <label>
+                        <b>Blog Title</b>
+                        <input id="blog-title" type="text" value="John O'Nolan" />
+                        <p>How your blog name appears on the site</p>
+                    </label>
+
+                    <label>
+                        <b>Blog Logo</b>
+                        <img src="/core/admin/assets/img/logo.png" alt="logo" height="38" width="381"/>
+                        <p>Display a logo on your site in place of blog title</p>
+                    </label>
+
+                    <label>
+                        <b>Blog Icon</b>
+                        <img src="/core/admin/assets/img/test-icon.png" alt="logo" height="38" width="38"/>
+                        <p>The icon for your blog, used in your browser tab and elsewhere</p>
+                    </label>
+
+                    <label>
+                        <b>Email Address</b>
+                        <input id="email-address" type="text" value="john@tryghost.org" />
+                        <p>Address to use for <a href="#">admin notifications</a></p>
+                        <label class="checkbox">
+                            <input type="checkbox" value="1" /> Show my email address on my public profile
+                        </label>
+                    </label>
+
+                    <label>
+                        <b>URL Structure</b>
+                        <select id="url-structure" name="general[urlstructure]">
+                            <option value="post-name">Simple Post Name</option>
+                            <option value="date-based">Date Based</option>
+                            <option value="number based">Number Based</option>
+                            <option value="custom">Custom...</option>
+                        </select>
+                    </label>
+
+                </fieldset>
+
+                <hr />
+
+                <fieldset>
+
+                    <label>
+                        <b>Time Zone</b>
+                        <select id="url-structure" name="general[timezone]">
+                            <option value="1">Vienna (UTC+1)</option>
+                        </select>
+                    </label>
+
+                </fieldset>
+
+
+            </form>
         </section>
-      </header>
-      <section class="content">
-        <form id="settings-general">
-          <fieldset>
-            <label>
-              <b>Blog Title</b>
-              <input id="blog-title" type="text" value="John O'Nolan" />
-              <p>How your blog name appears on the site</p>
-            </label>
-
-            <label>
-              <b>Blog Logo</b>
-              <img src="/core/admin/assets/img/logo.png" alt="logo" height"38" width="381"/>
-              <p>Display a logo on your site in place of blog title</p>
-            </label>
-
-            <label>
-              <b>Blog Icon</b>
-              <img src="/core/admin/assets/img/test-icon.png" alt="logo" height"38" width="38"/>
-              <p>The icon for your blog, used in your browser tab and elsewhere</p>
-            </label>
-
-            <label>
-              <b>Email Address</b>
-              <input id="email-address" type="text" value="john@tryghost.org" />
-              <p>Address to use for <a href="#">admin notifications</a></p>
-              <label class="checkbox">
-                <input type="checkbox" value="1" /> Show my email address on my public profile
-              </label>
-            </label>
-
-            <label>
-              <b>URL Structure</b>
-              <select id="url-structure" name="general[urlstructure]">
-                <option value="post-name">Simple Post Name</option>
-                <option value="date-based">Date Based</option>
-                <option value="number based">Number Based</option>
-                <option value="custom">Custom...</option>
-              </select>
-            </label>
-
-          </fieldset>
-
-          <hr />
-
-          <fieldset>
-
-            <label>
-              <b>Time Zone</b>
-              <select id="url-structure" name="general[timezone]">
-                <option value="1">Vienna (UTC+1)</option>
-              </select>
-            </label>
-
-          </fieldset>
-
-
-        </form>
-      </section>
     </section>
     <section id="content" class="settings-content">
-      <header>
-        <h2 class="title">Content</h2>
-        <section class="page-actions">
-          <button class="button-save">Save</button>
+        <header>
+            <h2 class="title">Content</h2>
+            <section class="page-actions">
+                <button class="button-save">Save</button>
+            </section>
+        </header>
+        <section class="content">
+            <form id="settings-general">
+                <fieldset>
+                    <label>
+                        <b>Typography</b>
+                        <select id="url-structure" name="general[urlstructure]">
+                            <option value="post-name">Lato (Light)</option>
+                        </select>
+                        <p>Sexy sans-serif font that will make your toes tickle.</p>
+                        <label class="checkbox">
+                            <input type="checkbox" value="1" /> Load fonts directly from Google
+                        </label>
+                    </label>
+
+                    <label>
+                        <b>Post Options</b>
+                        <label class="checkbox">
+                            <input type="checkbox" value="1" /> Display Post Meta
+                            <p>Post Author / Date / Views</p>
+                        </label>
+                        <label class="checkbox">
+                            <input type="checkbox" value="1" /> Show Author Box After Post
+                        </label>
+                        <label class="checkbox">
+                            <input type="checkbox" value="1" /> Enable Comments
+                        </label>
+                    </label>
+
+                </fieldset>
+
+                <hr />
+
+                <fieldset>
+
+                    <label>
+                        <b>SEO Title Pattern</b>
+                        <input id="blog-title" type="text" value="[Post Name] - [Site Title]" />
+                        <p>The pattern used to display your title tags</p>
+                    </label>
+
+                    <label>
+                        <b>SEO Description Pattern</b>
+                        <input id="blog-title" type="text" value="Auto" />
+                        <p>The pattern used to display your meta descriptions</p>
+                    </label>
+
+                    <label>
+                        <b>Google+</b>
+                        <label class="checkbox">
+                            <input type="checkbox" value="1" /> Connect to author profile on Google
+                        </label>
+                    </label>
+
+                    <label>
+                        <b>Home Page Description</b>
+                        <textarea></textarea>
+                        <p>Display a logo on your site in place of blog title</p>
+                    </label>
+
+                </fieldset>
+
+            </form>
         </section>
-      </header>
-      <section class="content">
-        <form id="settings-general">
-          <fieldset>
-            <label>
-              <b>Typography</b>
-              <select id="url-structure" name="general[urlstructure]">
-                <option value="post-name">Lato (Light)</option>
-              </select>
-              <p>Sexy sans-serif font that will make your toes tickle.</p>
-              <label class="checkbox">
-                <input type="checkbox" value="1" /> Load fonts directly from Google
-              </label>
-            </label>
-
-            <label>
-              <b>Post Options</b>
-              <label class="checkbox">
-                <input type="checkbox" value="1" /> Display Post Meta
-                <p>Post Author / Date / Views</p>
-              </label>
-              <label class="checkbox">
-                <input type="checkbox" value="1" /> Show Author Box After Post
-              </label>
-              <label class="checkbox">
-                <input type="checkbox" value="1" /> Enable Comments
-              </label>
-            </label>
-
-          </fieldset>
-
-          <hr />
-
-          <fieldset>
-
-            <label>
-              <b>SEO Title Pattern</b>
-              <input id="blog-title" type="text" value="[Post Name] - [Site Title]" />
-              <p>The pattern used to display your title tags</p>
-            </label>
-
-            <label>
-              <b>SEO Description Pattern</b>
-              <input id="blog-title" type="text" value="Auto" />
-              <p>The pattern used to display your meta descriptions</p>
-            </label>
-
-            <label>
-              <b>Google+</b>
-              <label class="checkbox">
-                <input type="checkbox" value="1" /> Connect to author profile on Google
-              </label>
-            </label>
-
-            <label>
-              <b>Home Page Description</b>
-              <textarea></textarea>
-              <p>Display a logo on your site in place of blog title</p>
-            </label>
-
-          </fieldset>
-
-        </form>
-      </section>
     </section>
     <section id="users" class="settings-content">
-      <header>
-        <h2 class="title">Users</h2>
-        <section class="page-actions">
-          <button class="button-add">Add User</button>
+        <header>
+            <h2 class="title">Users</h2>
+            <section class="page-actions">
+                <button class="button-add">Add User</button>
+            </section>
+        </header>
+        <section class="content">
+            <h6 class="sub">Invited Users</h6>
+            <ul class="users">
+                <li class="clearfix">
+                    <div class="user_image"></div>
+                    <div class="user_info">
+                        <span class="name">Some Name</span>
+                        <span class="timestamp">Invitation Sent: 7 hours ago</span>
+                    </div>
+                </li>
+            </ul>
+            <h6 class="sub">Active Users</h6>
+            <ul class="users">
+                <li class="clearfix">
+                    <div class="user_image">
+                        <img src="/core/admin/assets/img/user.jpg" alt="user"/>
+                    </div>
+                    <div class="user_info">
+                        <span class="name">Some Name</span>
+                        <span class="timestamp">Last Seen: 7 hours ago</span>
+                    </div>
+                    <label class="admin">Admin</label>
+                </li>
+                <li class="clearfix">
+                    <div class="user_image">
+                        <img src="/core/admin/assets/img/user.jpg" alt="user"/>
+                    </div>
+                    <div class="user_info">
+                        <span class="name">Some Name</span>
+                        <span class="timestamp">Last Seen: 2 days ago</span>
+                    </div>
+                    <label class="editor">Editor</label>
+                </li>
+            </ul>
         </section>
-      </header>
-      <section class="content">
-        <h6 class="sub">Invited Users</h6>
-        <ul class="users">
-            <li class="clearfix">
-                <div class="user_image"></div>
-                <div class="user_info">
-                    <span class="name">Some Name</span>
-                    <span class"timestamp">Invitation Sent: 7 hours ago</span>
-                </div>
-            </li>
-        </ul>
-        <h6 class="sub">Active Users</h6>
-        <ul class="users">
-            <li class="clearfix">
-                <div class="user_image">
-                    <img src="/core/admin/assets/img/user.jpg" alt="user"/>
-                </div>
-                <div class="user_info">
-                    <span class="name">Some Name</span>
-                    <span class"timestamp">Last Seen: 7 hours ago</span>
-                </div>
-                <label class="admin">Admin</label>
-            </li>
-            <li class="clearfix">
-                <div class="user_image">
-                      <img src="/core/admin/assets/img/user.jpg" alt="user"/>
-                </div>
-                <div class="user_info">
-                    <span class="name">Some Name</span>
-                    <span class"timestamp">Last Seen: 2 days ago</span>
-                </div>
-                <label class="editor">Editor</label>
-            </li>
-        </ul>
-      </section>
     </section>
-  </div>
-
-</main>
-<script src="/core/admin/assets/js/settings.js"></script>
\ No newline at end of file
+</div>
\ No newline at end of file