diff --git a/content/css/screen.scss b/content/css/screen.scss
index b8c4e29..a53a11c 100644
--- a/content/css/screen.scss
+++ b/content/css/screen.scss
@@ -44,25 +44,30 @@ header#title {
     background-color: $peterriver;
 
     margin: 0;
-    padding: 12px;
+    padding: 12px 12px 0 12px;
 
     text-align: center;
 
-    h1 {
-        margin: 12px 0;
+    #header-wrapper {
+        @include grid-row;
+        padding-bottom: 0;
 
-        font-family: "Lato", arial;
-        font-weight: 900;
-        font-size: 52px;
-        letter-spacing: 4px;
+        h1 {
+            margin: 12px 0;
 
-        display: inline-block;
-        color: $peterriver;
-        background-color: #fff;
-        padding: 4px 16px;
-        border-radius: $border-radius;
+            font-family: "Lato", arial;
+            font-weight: 900;
+            font-size: 28px;
+            letter-spacing: 4px;
 
-        text-transform: uppercase;
+            display: inline-block;
+            color: $peterriver;
+            background-color: #fff;
+            padding: 4px 16px;
+            border-radius: $border-radius;
+
+            text-transform: uppercase;
+        }
     }
 }
 
@@ -98,7 +103,6 @@ nav#primary {
     background-color: $peterriver;
 
     padding-bottom: 24px;
-    margin-bottom: 12px;
 
     ol {
         list-style-type: none;
@@ -114,7 +118,7 @@ nav#primary {
 
             background-color: $belizehole;
             padding: 4px 8px;
-            margin: 0 3px;
+            margin: 3px;
 
             border-radius: $border-radius;
 
diff --git a/layouts/default.haml b/layouts/default.haml
index 47e9801..af12897 100644
--- a/layouts/default.haml
+++ b/layouts/default.haml
@@ -35,23 +35,24 @@
       })();
 
     %header#title
-      %h1= link_to "ariejan.net", "https://ariejan.net/"
+      #header-wrapper
+        %h1= link_to "ariejan.net", "https://ariejan.net/"
 
-    %nav#social
-      %ol
-        %li= link_to "<i class='icon-github'></i>", "https://github.com/ariejan"
-        %li= link_to "<i class='icon-twitter'></i>", "https://twitter.com/ariejan"
-        %li= link_to "<i class='icon-linkedin'></i>", "http://www.linkedin.com/in/ariejan"
-        %li= link_to "<i class='icon-rss'></i>", "https://ariejan.net/rss.xml"
-        %li= link_to "<i class='icon-envelope'></i>", "mailto:ariejan@ariejan.net"
+        %nav#social
+          %ol
+            %li= link_to "<i class='icon-github'></i>", "https://github.com/ariejan"
+            %li= link_to "<i class='icon-twitter'></i>", "https://twitter.com/ariejan"
+            %li= link_to "<i class='icon-linkedin'></i>", "http://www.linkedin.com/in/ariejan"
+            %li= link_to "<i class='icon-rss'></i>", "https://ariejan.net/rss.xml"
+            %li= link_to "<i class='icon-envelope'></i>", "mailto:ariejan@ariejan.net"
 
-    %nav#primary
-      %ol.interal
-        %li= link_to "Home", "/"
-        %li= link_to "Projects", "/projects/"
-        %li= link_to "Craftsmanship", "/craftsmanship/"
-        %li= link_to "Talks", "/talks/"
-        %li= link_to "About", "/about/"
+        %nav#primary
+          %ol.interal
+            %li= link_to "Home", "/"
+            %li= link_to "Projects", "/projects/"
+            %li= link_to "Craftsmanship", "/craftsmanship/"
+            %li= link_to "Talks", "/talks/"
+            %li= link_to "About", "/about/"
 
     #wrapper
       = yield