diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index 8236f616..19bcfc0f 100644
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -8,7 +8,7 @@ group: material-design
 <link href="example.css" rel="stylesheet">
 
 <div class="mdb-layout-container">
-  <div class="mdb-layout mdb-layout-fixed-drawer">
+  <div class="mdb-layout mdb-drawer-fixed-left">
     <header class="mdb-layout-header">
       <!--
       <div class="collapse" id="navbar-header">
@@ -115,7 +115,7 @@ group: material-design
       <div class="container">
         <div class="alert alert-info" role="alert">
           This is an implementation of
-          <a href="http://www.getmdl.io/templates/dashboard/index.html">Material Design Lite's dashboard template</a>. It provides a simple way to compare approaches with source code.  Original design and assets credited to the MDL team.
+          <a href="http://www.getmdl.io/templates/dashboard/index.html">Material Design Lite's dashboard template</a>. It provides a simple way to compare approaches with source code. Original design and assets credited to the MDL team.
           <small>(see license)</small>
           .
         </div>
@@ -219,10 +219,8 @@ group: material-design
           </div>
         </div>
       </div>
-
-
+    </main>
   </div>
-  </main>
 </div>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" style="position: fixed; left: -1000px; height: -1000px;">
   <defs>
diff --git a/scss/_core.scss b/scss/_core.scss
index e8ae1512..95d2f2c4 100644
--- a/scss/_core.scss
+++ b/scss/_core.scss
@@ -7,6 +7,7 @@
 @import "mixins";
 
 @import "reboot";
+@import "layout";
 @import "buttons";
 @import "checkboxes";
 @import "switches";
diff --git a/scss/_drawer.scss b/scss/_drawer.scss
index 665c681c..718bba22 100644
--- a/scss/_drawer.scss
+++ b/scss/_drawer.scss
@@ -1,10 +1,7 @@
-// .mdb-layout-fixed-drawer is a marker that both header and content respond to.
-
+// .mdb-drawer-fixed-left is a marker that both header and content respond to.
 
 //WARNING: VERY MUCH A WORK IN PROGRESS!!!!!!!!!!!!!!!!!!!!
 
-
-
 // Drawer.
 .mdb-layout-drawer {
   position: absolute;
@@ -42,49 +39,42 @@
   }
 }
 
-
 // FIXME: the below needs to happen if it is the right size OR if the drawer is visible.  Need to look at collapse or collapseInline to see if it can help us here.
 
-// Responsive Header with fixed drawer
-.mdb-layout-header {
-  @include media-breakpoint-up(lg) {
-    .mdb-layout-fixed-drawer > & {
+.mdb-drawer-fixed-left {
+
+  // Responsive Header
+  > .mdb-layout-header {
+    @include media-breakpoint-up(lg) {
       width: calc(100% - #{$mdb-layout-drawer-sm});
       margin-left: $mdb-layout-drawer-sm;
     }
   }
-}
 
-// Responsive Drawer Width
-.mdb-layout-drawer {
-  width: $mdb-layout-drawer-sm;
-  transform: translateX(-$mdb-layout-drawer-sm - 10px); // initially way off screen
+  // Responsive Drawer Width
+  > .mdb-layout-drawer {
+    width: $mdb-layout-drawer-sm;
+    transform: translateX(-$mdb-layout-drawer-sm - 10px); // initially way off screen
 
-  //&.is-visible {
-  //  transform: translateX(0);
-  //  ~ .mdb-layout-content.mdb-layout-content {
-  //    overflow: hidden;
-  //  }
-  //}
+    //&.is-visible {
+    //  transform: translateX(0);
+    //  ~ .mdb-layout-content.mdb-layout-content {
+    //    overflow: hidden;
+    //  }
+    //}
 
-  @include media-breakpoint-up(lg) {
-    .mdb-layout-fixed-drawer > & {
+    @include media-breakpoint-up(lg) {
       transform: translateX(0);
     }
   }
-}
 
-// Responsive Content with fixed drawer
-.mdb-layout-content {
-  .mdb-layout-fixed-drawer > & {
+  // Responsive Content with fixed drawer
+  > .mdb-layout-content {
     margin-left: 0;
-  }
 
-  @include media-breakpoint-up(lg) {
-    .mdb-layout-fixed-drawer > & {
+    @include media-breakpoint-up(lg) {
       margin-left: $mdb-layout-drawer-sm;
     }
   }
 }
 
-
diff --git a/scss/mixins/_drawer.scss b/scss/mixins/_drawer.scss
new file mode 100644
index 00000000..3237d438
--- /dev/null
+++ b/scss/mixins/_drawer.scss
@@ -0,0 +1,5 @@
+@mixin collapse-open-or-breakpoint-up() {
+  h1, h2, h3, h4, h5, h6 {
+    @content;
+  }
+}