diff --git a/layouts/blogpost.erb b/layouts/blogpost.erb
index 428f12d..353ed17 100644
--- a/layouts/blogpost.erb
+++ b/layouts/blogpost.erb
@@ -1,27 +1,24 @@
-<div class="columns">
-  <article class="column is-8 is-offset-2">
-    <div class="heading">
-      <h1 class="title is-1 has-text-centered">
-        <%= item[:title] %>
-      </h1>
-      <% if item[:author] %>
-      <h2 class="subtitle is-3 has-text-centered">
-        <% if item[:lang] == :en %>
-        by
-        <% else %>
-        door
-        <% end %>
-        <%= item[:author] %>
-      </h2>
-      <% end %>
-      <p class="has-text-centered">
-        <small>Geschreven op <%= item[:created_at] %></small><br>
-        Leestijd: <%= reading_time @item %>
-      </p>
-      <hr>
-    </div>
-    <div class="content is-medium">
-      <%= yield %>
-    </div>
-  </article>
+<div class="heading">
+  <h1 class="title is-1 has-text-centered">
+    <%= item[:title] %>
+  </h1>
+  <% if item[:author] %>
+  <h2 class="subtitle is-3 has-text-centered">
+    <% if item[:lang] == :en %>
+    by
+    <% else %>
+    door
+    <% end %>
+    <%= item[:author] %>
+  </h2>
+  <% end %>
+  <p class="has-text-centered">
+    <small>Geschreven op <%= item[:created_at] %></small><br>
+    Leestijd: <%= reading_time @item %>
+  </p>
+  <hr>
+</div>
+
+<div class="columns">
+  <%= yield %>
 </div>
diff --git a/layouts/blogpost.md b/layouts/blogpost.md
index 0f06b28..3673c35 100644
--- a/layouts/blogpost.md
+++ b/layouts/blogpost.md
@@ -1,11 +1,20 @@
+<article class="column is-offset-2 is-8" markdown="1">
+<div class="content is-medium" markdown="1">
+<%= yield %>
+</div>
+</article>
+
 <% if item[:toc] %>
-<aside class="menu is-pulled-right" markdown="1">
+<div class="menu column" markdown="1">
   <p class="menu-label">
     Table of Contents
   </p>
+<% if item[:toc].is_a? Hash %>
 * x
 {:toc .toc-depth-<%= item[:toc][:depth] %>}
-</aside>
+<% else %>
+* x
+{:toc}
+<% end %>
+</div>
 <% end %>
-
-<%= yield %>