diff --git a/openstack_dashboard/static/dashboard/scss/_layout.scss b/openstack_dashboard/static/dashboard/scss/_layout.scss
index 18472a43e8..0561f3dc45 100644
--- a/openstack_dashboard/static/dashboard/scss/_layout.scss
+++ b/openstack_dashboard/static/dashboard/scss/_layout.scss
@@ -1,7 +1,8 @@
 // Make the sidebar span the entire page, instead of just the Viewport
 // Display Table is not ideal, but it will allow dynamic resizing of
 // the sidebar while growing its container to fill the entire window
-html, body:not(#splash), #container {
+html,
+body:not(#splash) {
   height: 100%;
 }
 
diff --git a/openstack_dashboard/templates/base.html b/openstack_dashboard/templates/base.html
index 5eb6f653a7..61a35160db 100644
--- a/openstack_dashboard/templates/base.html
+++ b/openstack_dashboard/templates/base.html
@@ -24,16 +24,16 @@
       </div>
     </noscript>
     {% block content %}
-      <div id="container">
-        <div class='topbar'>
-          {% include "header/_header.html" %}
-        </div>
-        <div id='main_content'>
-          {% include "horizon/_messages.html" %}
-          {% block sidebar %}
-            {% include 'horizon/common/_sidebar.html' %}
-          {% endblock %}
-          <div id='content_body'>
+      <div class='topbar'>
+        {% include "header/_header.html" %}
+      </div>
+      <div id='main_content'>
+        {% include "horizon/_messages.html" %}
+        {% block sidebar %}
+          {% include 'horizon/common/_sidebar.html' %}
+        {% endblock %}
+        <div id='content_body'>
+          <div class='container-fluid'>
             <div class="row">
               <div class="col-xs-12">
                 {% block page_header %}
diff --git a/openstack_dashboard/themes/material/static/js/material.hamburger.js b/openstack_dashboard/themes/material/static/js/material.hamburger.js
index 0874ae54e7..a61304a0c0 100644
--- a/openstack_dashboard/themes/material/static/js/material.hamburger.js
+++ b/openstack_dashboard/themes/material/static/js/material.hamburger.js
@@ -19,11 +19,10 @@ $(document).ready(function () {
   var $sidenav = $('#sidebar');
   var $mask = $(document.createElement('div'))
     .prop('id', 'md-hamburger-mask')
-    .appendTo($('#container'));
+    .appendTo($('#content_body'));
 
   // Hamburger Happiness !!!
   $(document).on('click', '.md-hamburger', function () {
-    var $foo = $(this).find('.md-hamburger-layer');
     $(this).find('.md-hamburger-layer')
       .toggleClass('md-hamburger-arrow')
       .toggleClass('md-hamburger-menu');