diff --git a/assets/stylesheets/coursemology.org/layout.scss b/assets/stylesheets/coursemology.org/layout.scss
index c1d5193..574f645 100644
--- a/assets/stylesheets/coursemology.org/layout.scss
+++ b/assets/stylesheets/coursemology.org/layout.scss
@@ -1,22 +1,16 @@
-@import 'coursemology.org/variables';
-@import 'application';
-@import 'pygments-css/github';
+@import "coursemology.org/variables";
+@import "application";
+@import "pygments-css/github";
 
 @mixin box-shadow($v-shadow, $blur, $spread) {
   box-shadow: 0 $v-shadow $blur $spread $gray-light;
 }
 
-html {
-  min-height: 100%;
-  position: relative;
-}
-
-body {
+.root.container-fluid.footer-buffer {
   padding-top: $navbar-height + $navbar-margin-bottom;
 }
 
 .footer-buffer {
-
   @media screen and (max-width: 937px) {
     padding-bottom: 120px;
   }
@@ -57,7 +51,6 @@ footer {
   }
 
   .nav-pills {
-
     .footer-link {
       a {
         color: $gray-light;
diff --git a/views/layouts/coursemology.org.html.slim b/views/layouts/coursemology.org.html.slim
index 3adc70c..d0869ab 100644
--- a/views/layouts/coursemology.org.html.slim
+++ b/views/layouts/coursemology.org.html.slim
@@ -4,6 +4,7 @@ html
     title
       = page_title
     meta http-equiv="X-UA-Compatible" content="IE=edge"
+    meta name="status" content=response.status
     = server_context_meta_tag
     = viewport_meta_tag
     = application_resources
@@ -15,34 +16,39 @@ html
     = render 'layouts/favicon'
 
   body
-    #fb-root[data-turbolinks-permanent]
-    / The code below does not come from FB
-    javascript:
-      typeof FB !== "undefined" && FB !== null ? FB.XFBML.parse() : void 0;
+    - if rails_page?
+      #fb-root[data-turbolinks-permanent]
+      / The code below does not come from FB
+      javascript:
+        typeof FB !== "undefined" && FB !== null ? FB.XFBML.parse() : void 0;
 
-    = render 'layouts/topbar'
+      = render 'layouts/topbar'
 
-    div#root.container-fluid.footer-buffer
-      = global_announcements
-      = flash_messages
-      div class=page_class
-        = yield
+      div#root.container-fluid.footer-buffer
+        = global_announcements
+        = flash_messages
+        div class=@page_class
+          = yield
+
+      footer
+        div.container-fluid
+          div.row
+            div.col-md-7.col-lg-7.footer-links
+              nav
+                ul.nav.nav-pills
+                  li.footer-link
+                    = link_to('Terms of Service', page_path('terms_of_service'))
+                  li.footer-link
+                    = link_to('About Us', page_path('about'))
+                  li.footer-link
+                    = link_to('Privacy Policy', page_path('privacy_policy'))
+                  li.footer-link
+                    = link_to('Contact Us', page_path('contact_us'))
+                  li.footer-link
+                    a href='https://github.com/Coursemology/coursemology2' target='_blank' GitHub
+            div.col-md-5.col-lg-5
+              p.footer-copyright © 2013 - #{Time.zone.now.year} Coursemology.org. All Rights Reserved.
 
-    footer
-      div.container-fluid
-        div.row
-          div.col-md-7.col-lg-7.footer-links
-            nav
-              ul.nav.nav-pills
-                li.footer-link
-                  = link_to('Terms of Service', page_path('terms_of_service'))
-                li.footer-link
-                  = link_to('About Us', page_path('about'))
-                li.footer-link
-                  = link_to('Privacy Policy', page_path('privacy_policy'))
-                li.footer-link
-                  = link_to('Contact Us', page_path('contact_us'))
-                li.footer-link
-                  a href='https://github.com/Coursemology/coursemology2' target='_blank' GitHub
-          div.col-md-5.col-lg-5
-            p.footer-copyright © 2013 - #{Time.zone.now.year} Coursemology.org. All Rights Reserved.
+    - else
+      div#root
+        = yield