diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
index d87769d3e..788e111de 100644
--- a/app/assets/stylesheets/bootstrap_and_overrides.css.less
+++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -1,4 +1,5 @@
 @import "twitter/bootstrap/bootstrap";
+body { padding-top: 60px; }
 @import "twitter/bootstrap/responsive";
 
 // Set the correct sprite paths
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 5c9921160..2f8a19660 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -1,4 +1,4 @@
-.navbar.navbar-static-top
+.navbar.navbar-fixed-top
   .navbar-inner
     .container
       %a.btn.btn-navbar(data-target=".nav-collapse" data-toggle="collapse")