diff --git a/codelab-style.html b/codelab-style.html
index cbeb899..6268918 100644
--- a/codelab-style.html
+++ b/codelab-style.html
@@ -32,6 +32,7 @@
   --paper-drawer-panel-left-drawer-container: {
     background: var(--google-codelab-background, --paper-grey-100);
     overflow-y: auto;
+    z-index: 1;
   };
   --paper-drawer-panel-main-container: {
     background: var(--google-codelab-background, --paper-grey-300);
@@ -49,7 +50,7 @@
 }
 
 
-#drawer[narrow] #controls {
+#controls[narrow] {
   width: 100%;
 }
 
diff --git a/google-codelab.html b/google-codelab.html
index 9e187bb..8273036 100644
--- a/google-codelab.html
+++ b/google-codelab.html
@@ -130,7 +130,7 @@ <h1 class="title">{{title}}</h1>
 
     </paper-drawer-panel>
 
-    <footer id="controls" hidden$="[[noArrows]]">
+    <footer id="controls" hidden$="[[noArrows]]" narrow$="[[_narrow]]">
       <div class="fabs layout horizontal justified">
         <paper-fab raised class="navbutton prevbutton" icon="chevron-left"
           on-tap="selectPrevious"