diff --git a/config.codekit b/config.codekit
index b9114c8..509918f 100644
--- a/config.codekit
+++ b/config.codekit
@@ -538,22 +538,6 @@
 		"shouldRunBless": 0,
 		"useLibsass": 0
 		},
-	"\/scss\/_header.scss": {
-		"createSourceMap": 0,
-		"debugStyle": 0,
-		"decimalPrecision": 10,
-		"fileType": 4,
-		"ignore": 1,
-		"ignoreWasSetByUser": 0,
-		"inputAbbreviatedPath": "\/scss\/_header.scss",
-		"outputAbbreviatedPath": "\/css\/_header.css",
-		"outputPathIsOutsideProject": 0,
-		"outputPathIsSetByUser": 0,
-		"outputStyle": 0,
-		"shouldRunAutoprefixer": 0,
-		"shouldRunBless": 0,
-		"useLibsass": 0
-		},
 	"\/scss\/_jetpack.scss": {
 		"createSourceMap": 0,
 		"debugStyle": 0,
@@ -570,38 +554,6 @@
 		"shouldRunBless": 0,
 		"useLibsass": 0
 		},
-	"\/scss\/_navigation.scss": {
-		"createSourceMap": 0,
-		"debugStyle": 0,
-		"decimalPrecision": 10,
-		"fileType": 4,
-		"ignore": 1,
-		"ignoreWasSetByUser": 0,
-		"inputAbbreviatedPath": "\/scss\/_navigation.scss",
-		"outputAbbreviatedPath": "\/css\/_navigation.css",
-		"outputPathIsOutsideProject": 0,
-		"outputPathIsSetByUser": 0,
-		"outputStyle": 0,
-		"shouldRunAutoprefixer": 0,
-		"shouldRunBless": 0,
-		"useLibsass": 0
-		},
-	"\/scss\/_page.scss": {
-		"createSourceMap": 0,
-		"debugStyle": 0,
-		"decimalPrecision": 10,
-		"fileType": 4,
-		"ignore": 1,
-		"ignoreWasSetByUser": 0,
-		"inputAbbreviatedPath": "\/scss\/_page.scss",
-		"outputAbbreviatedPath": "\/css\/_page.css",
-		"outputPathIsOutsideProject": 0,
-		"outputPathIsSetByUser": 0,
-		"outputStyle": 0,
-		"shouldRunAutoprefixer": 0,
-		"shouldRunBless": 0,
-		"useLibsass": 0
-		},
 	"\/scss\/_portfolio.scss": {
 		"createSourceMap": 0,
 		"debugStyle": 0,
@@ -784,15 +736,6 @@
 		"outputPathIsOutsideProject": 0,
 		"outputPathIsSetByUser": 0
 		},
-	"\/style.css": {
-		"fileType": 16,
-		"ignore": 1,
-		"ignoreWasSetByUser": 0,
-		"inputAbbreviatedPath": "\/style.css",
-		"outputAbbreviatedPath": "No Output Path",
-		"outputPathIsOutsideProject": 0,
-		"outputPathIsSetByUser": 0
-		},
 	"\/tgm-plugin-activation.php": {
 		"fileType": 8192,
 		"ignore": 0,
diff --git a/scss/_footer.scss b/scss/_footer.scss
index 0a7551d..6daaf65 100644
--- a/scss/_footer.scss
+++ b/scss/_footer.scss
@@ -1,7 +1,5 @@
 .footer-widgets {
-    max-width: 710px;
     margin: 0 auto 1.5em;
-	width: 80%;
 	padding-top: 50px;
 }
 
@@ -71,16 +69,33 @@ body.single .padding {
  * Footer copyright
  */
 .site-info {
-	width: 80%;
-	max-width: 710px;
+	width: 100%;
+	max-width: 1200px;
 	margin: 0 auto;
 	padding: 1em 0;
 	font-size: .8em;
 	font-style: italic;
 }
 
+body.home .site-info .widget-area {
+    width: 400px;
+    display: inline-block;
+    padding: 0 30px;
+}
+
+body.page .footer-widgets {
+    padding: 0 40px;
+    max-width: 640px;
+}
+
+body.page .footer-widgets .widget-area {
+    width: 280px;
+    padding: 0 20px;
+    display: inline-block;
+}
 
 #site-navigation #main-menu .inner-menu .menu-widgets .widget_tag_cloud .tagcloud a {
     background: none;
     border: none;
-}
\ No newline at end of file
+}
+
diff --git a/scss/_header.scss b/scss/_header.scss
index 3672627..1a9fbaa 100644
--- a/scss/_header.scss
+++ b/scss/_header.scss
@@ -34,12 +34,13 @@ body.page, body.single, body.archive, body.search, body.error404 {
 	left: 0;
 	top: 0;
 	text-align: center;
+	padding-top: 32px;
 }
 #site-top a {
     background: none;
 }
 #site-top img {
-    height: 140px;
+    height: 100px;
     width: auto;
 }
 .site-title, .site-logo-link {
diff --git a/scss/_navigation.scss b/scss/_navigation.scss
index c3306a2..a68cade 100644
--- a/scss/_navigation.scss
+++ b/scss/_navigation.scss
@@ -44,4 +44,12 @@ body #site-navigation {
     top: -20px;
     position: fixed;
     z-index: 2;
+}
+
+body.admin-bar #site-navigation {
+    padding-top: 32px;
+}
+
+#site-navigation a, #site-navigation a:link, #site-navigation a:visited {
+    display: block;
 }
\ No newline at end of file
diff --git a/scss/_single.scss b/scss/_single.scss
index c40d939..924a8df 100644
--- a/scss/_single.scss
+++ b/scss/_single.scss
@@ -1,5 +1,7 @@
 body.single .main-menu, body.page .main-menu {
-    padding-left: 200px;
+   max-width: 1000px;
+   right: 0;
+   float: right;
 }
 
 body.single #site-top a, body.page #site-top a {
@@ -18,9 +20,13 @@ body.single #site-top img, body.page #site-top img {
 }
 
 body.single #site-top, body.page #site-top {
-    margin-top: 25px;
+    margin-top: 22px;
+    padding-top: 0;
 }
 
+body.single.admin-bar #site-top, body.page.admin-bar #site-top {
+    padding-top: 32px;
+}
 body.single #masthead, body.page #masthead{
     width: 50%;
     height: 100vh;
@@ -28,7 +34,7 @@ body.single #masthead, body.page #masthead{
     position: fixed;
 }
 
-body.single #content {
+body.single #content, body.page #content {
     margin-left: 50vw;
 }
 
diff --git a/sidebar-footer-frontpage.php b/sidebar-footer-frontpage.php
index b7f1325..ccf8afc 100755
--- a/sidebar-footer-frontpage.php
+++ b/sidebar-footer-frontpage.php
@@ -18,25 +18,19 @@
 
 <?php
 if ( is_active_sidebar( 'footer-frontpage-left' ) ) {
-	?>
-	<div id="footer-frontpage-left" class="widget-area" role="complementary">
+	?><div id="footer-frontpage-left" class="widget-area" role="complementary">
 		<?php dynamic_sidebar( 'footer-frontpage-left' ); ?>
-	</div><!-- #footer-left -->
-	<?php
+	</div><?php
 }
 if ( is_active_sidebar( 'footer-frontpage-mid' ) ) {
-	?>
-	<div id="footer-frontpage-mid" class="widget-area" role="complementary">
+	?><div id="footer-frontpage-mid" class="widget-area" role="complementary">
 		<?php dynamic_sidebar( 'footer-frontpage-mid' ); ?>
-	</div><!-- #footer-mid -->
-	<?php
+	</div><?php
 }
 if ( is_active_sidebar( 'footer-frontpage-right' ) ) {
-	?>
-	<div id="footer-frontpage-right" class="widget-area" role="complementary">
+	?><div id="footer-frontpage-right" class="widget-area" role="complementary">
 		<?php dynamic_sidebar( 'footer-frontpage-right' ); ?>
-	</div><!-- #footer-right -->
-	<?php
+	</div><?php
 }
 ?>
 
diff --git a/sidebar-footer-innerpage.php b/sidebar-footer-innerpage.php
index 1ddf73d..3d7506c 100644
--- a/sidebar-footer-innerpage.php
+++ b/sidebar-footer-innerpage.php
@@ -17,20 +17,15 @@
 
 <?php
 if ( is_active_sidebar( 'footer-innerpage-left' ) ) {
-	?>
-	<div id="footer-innerpage-left" class="widget-area" role="complementary">
+	?><div id="footer-innerpage-left" class="widget-area" role="complementary">
 		<?php dynamic_sidebar( 'footer-innerpage-left' ); ?>
-	</div><!-- #footer-left -->
-	<?php
+	</div><?php
 }
 if ( is_active_sidebar( 'footer-innerpage-right' ) ) {
-	?>
-	<div id="footer-innerpage-right" class="widget-area" role="complementary">
+	?><div id="footer-innerpage-right" class="widget-area" role="complementary">
 		<?php dynamic_sidebar( 'footer-innerpage-right' ); ?>
-	</div><!-- #footer-right -->
-	<?php
+	</div><?php
 }
-
 ?>
 
 </div>
\ No newline at end of file
diff --git a/style.css b/style.css
index bfcbba5..613fea4 100644
--- a/style.css
+++ b/style.css
@@ -954,6 +954,12 @@ body #site-navigation {
   position: fixed;
   z-index: 2; }
 
+body.admin-bar #site-navigation {
+  padding-top: 32px; }
+
+#site-navigation a, #site-navigation a:link, #site-navigation a:visited {
+  display: block; }
+
 header#masthead, body.home header#masthead, body.home.page header#masthead {
   height: 100vh;
   min-height: 600px; }
@@ -983,13 +989,14 @@ body.page #masthead, body.single #masthead, body.archive #masthead, body.search
   right: 0;
   left: 0;
   top: 0;
-  text-align: center; }
+  text-align: center;
+  padding-top: 32px; }
 
 #site-top a {
   background: none; }
 
 #site-top img {
-  height: 140px;
+  height: 100px;
   width: auto; }
 
 .site-title, .site-logo-link {
@@ -1201,9 +1208,7 @@ footer .widget-grofile {
   text-align: center; }
 
 .footer-widgets {
-  max-width: 710px;
   margin: 0 auto 1.5em;
-  width: 80%;
   padding-top: 50px; }
 
 .footer-widgets #footer-frontpage,
@@ -1258,13 +1263,27 @@ body.single .padding {
  * Footer copyright
  */
 .site-info {
-  width: 80%;
-  max-width: 710px;
+  width: 100%;
+  max-width: 1200px;
   margin: 0 auto;
   padding: 1em 0;
   font-size: .8em;
   font-style: italic; }
 
+body.home .site-info .widget-area {
+  width: 400px;
+  display: inline-block;
+  padding: 0 30px; }
+
+body.page .footer-widgets {
+  padding: 0 40px;
+  max-width: 640px; }
+
+body.page .footer-widgets .widget-area {
+  width: 280px;
+  padding: 0 20px;
+  display: inline-block; }
+
 #site-navigation #main-menu .inner-menu .menu-widgets .widget_tag_cloud .tagcloud a {
   background: none;
   border: none; }
@@ -1914,7 +1933,9 @@ body .saboxplugin-wrap {
   body .saboxplugin-wrap > div[class*=saboxplugin] {
     text-align: center; } }
 body.single .main-menu, body.page .main-menu {
-  padding-left: 200px; }
+  max-width: 1000px;
+  right: 0;
+  float: right; }
 
 body.single #site-top a, body.page #site-top a {
   position: absolute;
@@ -1930,7 +1951,11 @@ body.single #site-top img, body.page #site-top img {
   height: 70px; }
 
 body.single #site-top, body.page #site-top {
-  margin-top: 25px; }
+  margin-top: 22px;
+  padding-top: 0; }
+
+body.single.admin-bar #site-top, body.page.admin-bar #site-top {
+  padding-top: 32px; }
 
 body.single #masthead, body.page #masthead {
   width: 50%;
@@ -1938,7 +1963,7 @@ body.single #masthead, body.page #masthead {
   float: left;
   position: fixed; }
 
-body.single #content {
+body.single #content, body.page #content {
   margin-left: 50vw; }
 
 body.single article.hentry, body.page article.hentry {