diff --git a/bower.json b/bower.json
index 56982ab421644617efcf3afb63da6fabeb548926..8ce0a892d4af885a3c79b754668438ed11be832e 100644
--- a/bower.json
+++ b/bower.json
@@ -5,7 +5,7 @@
     "angular": "~1.5.7",
     "angular-animate": "~1.5.7",
     "angular-aria": "~1.5.7",
-    "angular-material": "~1.1.0",
+    "angular-material": "~1.1.1",
     "angular-messages": "~1.5.7",
     "angular-ui-router": "~0.3.1",
     "angular-resource": "~1.5.7",
diff --git a/src/app/frontend/chrome/chrome.html b/src/app/frontend/chrome/chrome.html
index 88c04525a5951ce40d49d9052701cf483431e593..b95f796cc30129aae1051d380848be7b7f10fe2c 100644
--- a/src/app/frontend/chrome/chrome.html
+++ b/src/app/frontend/chrome/chrome.html
@@ -28,10 +28,10 @@ limitations under the License.
   </div>
 </md-toolbar>
 
-<md-content layout="row" class="kd-app-content">
+<md-content layout="row" class="kd-app-entire-content" flex="auto">
   <kd-nav flex="none"></kd-nav>
-  <md-content flex="auto" class="kd-app-content"  style="overflow-y: auto;">
-    <div ng-switch="$ctrl.loading" flex="auto" class="kd-content-div">
+  <md-content flex="auto" class="kd-main-content-box">
+    <div ng-switch="$ctrl.loading" class="kd-content-div kd-main-content-div">
       <div ng-switch-when="true" class="kd-spinner">
         <md-progress-circular ng-if="$ctrl.showLoadingSpinner" md-mode="indeterminate"
             md-diameter="48">
diff --git a/src/app/frontend/chrome/chrome.scss b/src/app/frontend/chrome/chrome.scss
index 6edbc7b3e5bc852c72fd1ad15238781824ccc83d..9b7051c7e83f7a736417ea408942b9d360921985 100644
--- a/src/app/frontend/chrome/chrome.scss
+++ b/src/app/frontend/chrome/chrome.scss
@@ -34,6 +34,17 @@
   height: 100%;
 }
 
+.kd-main-content-div {
+  height: 100%;
+  position: absolute;
+  width: 100%;
+}
+
+.kd-main-content-box {
+  background-color: transparent;
+  overflow-y: auto;
+}
+
 .kd-spinner {
   align-content: center;
   align-items: center;
@@ -49,10 +60,16 @@
 }
 
 body,
+.kd-app-entire-content {
+  background-color: $body;
+  max-height: 100%;
+}
+
 .kd-app-content {
   background-color: $body;
   height: 100%;
   max-height: 100%;
+  position: relative;
 }
 
 a {
@@ -78,11 +95,6 @@ a {
   padding-left: $baseline-grid;
 }
 
-.kd-app-content {
-  background-color: $body;
-  position: relative;
-}
-
 .kd-text-icon {
   font-size: inherit;
   height: inherit;
diff --git a/src/app/frontend/chrome/nav/nav.html b/src/app/frontend/chrome/nav/nav.html
index 428d0cf734cb06ef1f5c06380f495c128925fa23..b00d73309a3ed4899e02c4cd2ef3d7688d609e7c 100644
--- a/src/app/frontend/chrome/nav/nav.html
+++ b/src/app/frontend/chrome/nav/nav.html
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<md-sidenav md-is-locked-open="$ctrl.isVisible" class="kd-nav">
+<md-sidenav md-is-locked-open="$ctrl.isVisible" class="kd-nav" layout="column">
   <div class="kd-nav-group">
     <kd-nav-item class="kd-nav-group-item" state="{{::$ctrl.states.admin}}">{{::$ctrl.i18n.MSG_NAV_MENU_ADMIN}}</kd-nav-item>
     <kd-nav-item class="kd-nav-item" state="{{::$ctrl.states.namespace}}">{{::$ctrl.i18n.MSG_NAV_MENU_NAMESPACES}}</kd-nav-item>
diff --git a/src/app/frontend/chrome/nav/nav.scss b/src/app/frontend/chrome/nav/nav.scss
index 6fa15809e451917abfc873242d5469a1ab858613..5c881d57fd8aeca049cc2e87b3557f5da9eaf7b9 100644
--- a/src/app/frontend/chrome/nav/nav.scss
+++ b/src/app/frontend/chrome/nav/nav.scss
@@ -23,9 +23,10 @@
   width: $nav-width;
 
   &.md-closed {
+    // Remove "!important" when https://github.com/angular/material/issues/9425 is fixed
     &.md-locked-open-add-active {
-      min-width: $nav-width;
-      width: $nav-width;
+      min-width: $nav-width !important;
+      width: $nav-width !important;
     }
   }
 
diff --git a/src/app/frontend/logs/logs.scss b/src/app/frontend/logs/logs.scss
index 9c463222ec4926f5a2af41d0f2a11e7acfb97059..050a3b52520114f0272211f6b86afffc6a6609d2 100644
--- a/src/app/frontend/logs/logs.scss
+++ b/src/app/frontend/logs/logs.scss
@@ -51,7 +51,7 @@ $logs-color-white: #fff;
 
 .kd-log-view {
   flex: 1;
-  font-family: $font-family-medium-monospace;
+  font-family: $font-family-monospace;
   width: 100%;
 }