diff --git a/app/styles/app/layout.sass b/app/styles/app/layout.sass
index 5d455793..61fe2bd9 100644
--- a/app/styles/app/layout.sass
+++ b/app/styles/app/layout.sass
@@ -47,11 +47,13 @@
 
 .wrapper
   overflow: hidden
+.wrapper.non-centered
   #main,
   #left
     margin-bottom: -99999px
     padding-bottom: 100034px
 
+
 @media #{$large-up}
 
   #left, #right, .wrapper-main
diff --git a/app/styles/app/layouts/footer.sass b/app/styles/app/layouts/footer.sass
index 36896cf7..982ebbdb 100644
--- a/app/styles/app/layouts/footer.sass
+++ b/app/styles/app/layouts/footer.sass
@@ -2,6 +2,8 @@
  * Footer on the dashboard
  */
 
+$footer-height: 204px
+
 a
   color           : $color-link
   text-decoration : none
@@ -25,11 +27,11 @@ footer
   height: auto
 @media (min-width: 640px)
   .wrapper
-    padding-bottom: 244px //footer height plus some extra padding
+    padding-bottom: $footer-height + 50
 
   footer
-    margin-top: -204px
-    min-height: 204px
+    margin-top: - $footer-height
+    min-height: $footer-height
 
 footer h3
   font-size   : 15px
@@ -87,5 +89,3 @@ footer a:active
 .status-circle.major
   background: #e74c3c
 
-.wrapper:not(.centered) ~ footer
-  display: none
diff --git a/app/styles/app/modules/tabs.sass b/app/styles/app/modules/tabs.sass
index 0bb9bbbd..c0a02746 100644
--- a/app/styles/app/modules/tabs.sass
+++ b/app/styles/app/modules/tabs.sass
@@ -25,7 +25,7 @@
       content: ""
       position: absolute
       left: 0
-      bottom: -4px
+      bottom: -0.25em
       width: 100%
       height: 2px
       background-color: $teal2
diff --git a/app/templates/layouts/dashboard.hbs b/app/templates/layouts/dashboard.hbs
index ebbffe2c..c1a87f20 100644
--- a/app/templates/layouts/dashboard.hbs
+++ b/app/templates/layouts/dashboard.hbs
@@ -1,14 +1,15 @@
-<div class="centered">
-  <div class="wrapper wrapper-dashboard">
-    <header id="top" class="top">
+<div class="wrapper wrapper-dashboard">
+  <header id="top" class="top">
+    <div class="centered">
       {{render "top"}}
-    </header>
+    </div>
+  </header>
 
+  <div class="centered">
     {{yield}}
-
   </div>
-
-  <footer>
-    {{render "footer"}}
-  </footer>
 </div>
+
+<footer>
+  {{render "footer"}}
+</footer>
diff --git a/app/templates/layouts/home.hbs b/app/templates/layouts/home.hbs
index d26758de..cb1e693f 100644
--- a/app/templates/layouts/home.hbs
+++ b/app/templates/layouts/home.hbs
@@ -17,6 +17,6 @@
   </aside>
 </div>
 
-<footer>
+<footer {{bind-attr class="auth.signedIn:hidden"}}>
   {{render "footer"}}
 </footer>
diff --git a/app/templates/layouts/profile.hbs b/app/templates/layouts/profile.hbs
index 47623eb8..027246bc 100644
--- a/app/templates/layouts/profile.hbs
+++ b/app/templates/layouts/profile.hbs
@@ -1,15 +1,17 @@
-<header id="top" class="topbar">
+<div class="wrapper">
+  <header id="top" class="topbar">
+    <div class="centered">
+      {{render "top"}}
+    </div>
+  </header>
+
   <div class="centered">
-    {{render "top"}}
-  </div>
-</header>
+    {{render "flash"}}
+    <div id="main" class="main" role="main">
+      {{yield}}
 
-<div class="wrapper centered">
-  {{render "flash"}}
-  <div id="main" class="main" role="main">
-    {{yield}}
-
-    {{outlet "left"}}
+      {{outlet "left"}}
+    </div>
   </div>
 </div>