diff --git a/lib/site_template/_sass/_base.scss b/lib/site_template/_sass/_base.scss
index 587bf8cd..d2d58537 100644
--- a/lib/site_template/_sass/_base.scss
+++ b/lib/site_template/_sass/_base.scss
@@ -1,15 +1,3 @@
-/**
- * The box model how it should be
- */
-*,
-*:before,
-*:after {
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-}
-
-
-
 /**
  * Reset some basic elements
  */
@@ -77,7 +65,8 @@ li {
  * Wrapper
  */
 .wrapper {
-    max-width: 800px;
+    max-width: -webkit-calc(800px - (#{$spacing-unit} * 2));
+    max-width:         calc(800px - (#{$spacing-unit} * 2));
     margin-right: auto;
     margin-left: auto;
     padding-right: $spacing-unit;
@@ -85,6 +74,8 @@ li {
     @extend %clearfix;
 
     @include media-query($on-laptop) {
+        max-width: -webkit-calc(800px - (#{$spacing-unit}));
+        max-width:         calc(800px - (#{$spacing-unit}));
         padding-right: $spacing-unit / 2;
         padding-left: $spacing-unit / 2;
     }
diff --git a/lib/site_template/_sass/_site-footer.scss b/lib/site_template/_sass/_site-footer.scss
index f9febbf8..6f1c4aad 100644
--- a/lib/site_template/_sass/_site-footer.scss
+++ b/lib/site_template/_sass/_site-footer.scss
@@ -31,31 +31,37 @@
 }
 
 .footer-col-1 {
-    width: 35%;
+    width: -webkit-calc(35% - (#{$spacing-unit} / 2));
+    width:         calc(35% - (#{$spacing-unit} / 2));
 }
 
 .footer-col-2 {
-    width: 20%;
+    width: -webkit-calc(20% - (#{$spacing-unit} / 2));
+    width:         calc(20% - (#{$spacing-unit} / 2));
 }
 
 .footer-col-3 {
-    width: 45%;
+    width: -webkit-calc(45% - (#{$spacing-unit} / 2));
+    width:         calc(45% - (#{$spacing-unit} / 2));
 }
 
 @include media-query($on-laptop) {
     .footer-col-1,
     .footer-col-2 {
-        width: 50%;
+        width: -webkit-calc(50% - (#{$spacing-unit} / 2));
+        width:         calc(50% - (#{$spacing-unit} / 2));
     }
 
     .footer-col-3 {
-        width: 100%;
+        width: -webkit-calc(100% - (#{$spacing-unit} / 2));
+        width:         calc(100% - (#{$spacing-unit} / 2));
     }
 }
 
 @include media-query($on-palm) {
     .footer-col {
         float: none;
-        width: 100%;
+        width: -webkit-calc(100% - (#{$spacing-unit} / 2));
+        width:         calc(100% - (#{$spacing-unit} / 2));
     }
 }
diff --git a/lib/site_template/_sass/_site-header.scss b/lib/site_template/_sass/_site-header.scss
index 5fa4ca60..b7617bd3 100644
--- a/lib/site_template/_sass/_site-header.scss
+++ b/lib/site_template/_sass/_site-header.scss
@@ -54,7 +54,7 @@
             display: block;
             float: right;
             width: 36px;
-            height: 36px;
+            height: 26px;
             line-height: 0;
             padding-top: 10px;
             text-align: center;