diff --git a/page.hbs b/page.hbs
index 6cfcbea..15dc6ca 100644
--- a/page.hbs
+++ b/page.hbs
@@ -1,12 +1,30 @@
 {{!< default}}
+
 {{#post}}
-  <article class="post-wrapper">
-    <h2 class="post-title">{{{title}}}</h2>
+<article class="post-wrapper">
+    <div class="row">
+        <div class="eight columns">
+            {{#if feature_image}}
+            <section class="post-media text-center">
+                <img src="{{img_url feature_image}}" class="cover-image">
+            </section>
+            {{/if}}
+
+            <header class="entry-header">
+                <h1 class="entry-title">{{{title}}}</h1>
+            </header>
 
-    <section class="post-full-content">
-        <div class="post-content">
-            {{content}}
+            <section class="post-full-content">
+                <div class="post-content">
+                    {{content}}
+                </div>
+            </section>
+        </div>
+        <div class="four columns">
+            <aside class="sidebar">
+                {{> "sidebar"}}
+            </aside>
         </div>
-    </section>
-  </article>
+    </div>
+</article>
 {{/post}}
\ No newline at end of file
diff --git a/partials/sidebar.hbs b/partials/sidebar.hbs
index d397872..21d99bf 100644
--- a/partials/sidebar.hbs
+++ b/partials/sidebar.hbs
@@ -5,7 +5,6 @@
     </div>
 </section>
 
-{{#post}}
 <section class="widget recent-posts">
     <h6 class="widget-title">Recent posts</h6>
     <div class="widget-content">
@@ -20,7 +19,6 @@
         {{/get}}
     </div>
 </section>
-{{/post}}
 
 {{#if tags}}
 <section class="widget tags">
diff --git a/post.hbs b/post.hbs
index 0eb5991..2e84bed 100644
--- a/post.hbs
+++ b/post.hbs
@@ -1,70 +1,70 @@
 {{!< default}}
-{{#post}}
 
+{{#post}}
 {{#if featured}}
 <article class="post-wrapper featured-post">
-    {{else}}
-    <article class="post-wrapper">
-        {{/if}}
+{{else}}
+<article class="post-wrapper">
+{{/if}}
 
-        <div class="row">
-            <div class="eight columns">
-                {{#if feature_image}}
-                <section class="post-media text-center">
-                    <img src="{{img_url feature_image}}" class="cover-image">
-                </section>
-                {{/if}}
+    <div class="row">
+        <div class="eight columns">
+            {{#if feature_image}}
+            <section class="post-media text-center">
+                <img src="{{img_url feature_image}}" class="cover-image">
+            </section>
+            {{/if}}
 
-                <header class="entry-header">
-                    <p class="entry-author">
-                        {{#primary_author}}
-                        By <a href="{{url}}">{{name}}</a>
-                        {{/primary_author}}
-                    </p>
-                    <h1 class="entry-title">{{{title}}}</h1>
-                    <time class="entry-date"
-                        datetime="{{date format='YYYY-MM-DD'}}">{{date format="DD MMMM YYYY"}}</time> - <time
-                        class="entry-reading-time">{{reading_time}}</time>
-                </header>
+            <header class="entry-header">
+                <p class="entry-author">
+                    {{#primary_author}}
+                    By <a href="{{url}}">{{name}}</a>
+                    {{/primary_author}}
+                </p>
+                <h1 class="entry-title">{{{title}}}</h1>
+                <time class="entry-date"
+                    datetime="{{date format='YYYY-MM-DD'}}">{{date format="DD MMMM YYYY"}}</time> - <time
+                    class="entry-reading-time">{{reading_time}}</time>
+            </header>
 
-                <section class="post-full-content">
-                    <div class="post-content">
-                        {{content}}
-                    </div>
-                </section>
+            <section class="post-full-content">
+                <div class="post-content">
+                    {{content}}
+                </div>
+            </section>
 
-                <div class="post-spacer"></div>
+            <div class="post-spacer"></div>
 
-                <aside class="read-next">
-                    <div class="row">
-                        <div class="one-half column">
-                            {{#next_post}}
-                            <p><em>Next story</em></p>
-                            <a class="read-next-story" href="{{url}}">
-                                <section class="post">
-                                    <h3>{{title}}</h3>
-                                </section>
-                            </a>
-                            {{/next_post}}
-                        </div>
-                        <div class="one-half column text-right">
-                            <p><em>Previous story</em></p>
-                            {{#prev_post}}
-                            <a class="read-next-story prev" href="{{url}}">
-                                <section class="post">
-                                    <h4>{{title}}</h4>
-                                </section>
-                            </a>
-                            {{/prev_post}}
-                        </div>
+            <aside class="read-next">
+                <div class="row">
+                    <div class="one-half column">
+                        {{#next_post}}
+                        <p><em>Next story</em></p>
+                        <a class="read-next-story" href="{{url}}">
+                            <section class="post">
+                                <h3>{{title}}</h3>
+                            </section>
+                        </a>
+                        {{/next_post}}
                     </div>
-                </aside>
-            </div>
-            <div class="four columns">
-                <aside class="sidebar">
-                    {{> "sidebar"}}
-                </aside>
-            </div>
+                    <div class="one-half column text-right">
+                        <p><em>Previous story</em></p>
+                        {{#prev_post}}
+                        <a class="read-next-story prev" href="{{url}}">
+                            <section class="post">
+                                <h4>{{title}}</h4>
+                            </section>
+                        </a>
+                        {{/prev_post}}
+                    </div>
+                </div>
+            </aside>
+        </div>
+        <div class="four columns">
+            <aside class="sidebar">
+                {{> "sidebar"}}
+            </aside>
         </div>
-    </article>
-    {{/post}}
\ No newline at end of file
+    </div>
+</article>
+{{/post}}
\ No newline at end of file