diff --git a/openstack_dashboard/static/dashboard/scss/_layout.scss b/openstack_dashboard/static/dashboard/scss/_layout.scss
index 0561f3dc4..4292044d0 100644
--- a/openstack_dashboard/static/dashboard/scss/_layout.scss
+++ b/openstack_dashboard/static/dashboard/scss/_layout.scss
@@ -13,10 +13,10 @@ $navbar-border-size: 1px !default;
 $navbar-true-height: $navbar-height + $navbar-border-size !default;
 
 #main_content {
-  height: 100%; /* fallback if needed --> its scrolls, but it works */
-  height: calc(100% - #{$navbar-true-height});
+  height: 100%;
   display: table;
   min-width: $main-content-min-width;
+  padding-top: $navbar-true-height;
 }
 
 #content_body,
diff --git a/openstack_dashboard/static/dashboard/scss/components/_messages.scss b/openstack_dashboard/static/dashboard/scss/components/_messages.scss
index e996957f8..4b2536fc4 100644
--- a/openstack_dashboard/static/dashboard/scss/components/_messages.scss
+++ b/openstack_dashboard/static/dashboard/scss/components/_messages.scss
@@ -1,8 +1,8 @@
 .messages {
   position: fixed;
-  z-index: 9999;
-  top: $padding-large-vertical*2;
-  right: $padding-large-vertical*2;
+  z-index: $zindex-dropdown + 1;
+  padding-top: $padding-small-vertical;
+  right: $padding-large-horizontal;
 
   // TODO (hurgleburlger) RESPONSIVE
   // We will readdress this when we address the responsiveness of Horizon
diff --git a/openstack_dashboard/templates/header/_header.html b/openstack_dashboard/templates/header/_header.html
index a5e1e9c8c..77c647ee3 100644
--- a/openstack_dashboard/templates/header/_header.html
+++ b/openstack_dashboard/templates/header/_header.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 
 {% spaceless %}
-<nav class="navbar navbar-default">
+<nav class="navbar navbar-default navbar-fixed-top">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
diff --git a/openstack_dashboard/themes/material/static/horizon/_styles.scss b/openstack_dashboard/themes/material/static/horizon/_styles.scss
index 1508f7406..52ef8cb83 100644
--- a/openstack_dashboard/themes/material/static/horizon/_styles.scss
+++ b/openstack_dashboard/themes/material/static/horizon/_styles.scss
@@ -16,7 +16,6 @@
 }
 
 #content_body {
-  padding-top: $navbar-height;
   transition: padding-left $sidebar-animation;
   display: block;
   padding-left: $sidebar-width + $content-body-padding;
@@ -33,13 +32,6 @@
 }
 
 
-// The top nav is fixed, even when the page scrolls
-.topbar {
-  width: 100%;
-  position: fixed;
-  z-index: 4;
-}
-
 // Border radius is unattractive here
 .navbar {
   border-radius: 0;
diff --git a/openstack_dashboard/themes/material/templates/header/_header.html b/openstack_dashboard/themes/material/templates/header/_header.html
index 46d6b9acf..9b3bec204 100644
--- a/openstack_dashboard/themes/material/templates/header/_header.html
+++ b/openstack_dashboard/themes/material/templates/header/_header.html
@@ -2,7 +2,7 @@
 {% load context_selection %}
 {% load compress %}
 
-<nav class="navbar-inverse">
+<nav class="navbar-inverse navbar-fixed-top">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">