diff --git a/setup.py b/setup.py
index e86992a403..af40db5999 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20190721.0",
+    version="20190721.1",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",
diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts
index 5151e117e8..b5466196f8 100644
--- a/src/components/ha-sidebar.ts
+++ b/src/components/ha-sidebar.ts
@@ -32,7 +32,7 @@ import { classMap } from "lit-html/directives/class-map";
 // tslint:disable-next-line: no-duplicate-imports
 import { PaperIconItemElement } from "@polymer/paper-item/paper-icon-item";
 
-const SHOW_AFTER_SPACER = ["config", "developer-tools"];
+const SHOW_AFTER_SPACER = ["config", "developer-tools", "hassio"];
 
 const SUPPORT_SCROLL_IF_NEEDED = "scrollIntoViewIfNeeded" in document.body;
 
@@ -41,7 +41,8 @@ const SORT_VALUE = {
   logbook: 2,
   history: 3,
   "developer-tools": 9,
-  configuration: 10,
+  hassio: 10,
+  configuration: 11,
 };
 
 const panelSorter = (a, b) => {
diff --git a/src/dialogs/notifications/notification-drawer.js b/src/dialogs/notifications/notification-drawer.js
index 2b574b13d9..614c752487 100644
--- a/src/dialogs/notifications/notification-drawer.js
+++ b/src/dialogs/notifications/notification-drawer.js
@@ -36,6 +36,8 @@ export class HuiNotificationDrawer extends EventsMixin(
         padding-top: 16px;
         height: calc(100% - 65px);
         box-sizing: border-box;
+        background-color: var(--primary-background-color);
+        color: var(--primary-text-color);
       }
 
       .notification {
diff --git a/src/html/_js_base.html.template b/src/html/_js_base.html.template
index e92b64036c..c9bf4d4b49 100644
--- a/src/html/_js_base.html.template
+++ b/src/html/_js_base.html.template
@@ -17,7 +17,7 @@
       };
       if (!("customElements" in window &&
             "content" in document.createElement("template"))) {
-        document.write("<script src='/static/polyfills/webcomponents-bundle.js'>");
+        document.write("<script src='/static/polyfills/webcomponents-bundle.js'><"+"/script>");
       }
       var isS101 = /\s+Version\/10\.1(?:\.\d+)?\s+Safari\//.test(navigator.userAgent);
     </script>
diff --git a/src/layouts/home-assistant-main.ts b/src/layouts/home-assistant-main.ts
index 6e02734466..a63f247035 100644
--- a/src/layouts/home-assistant-main.ts
+++ b/src/layouts/home-assistant-main.ts
@@ -44,8 +44,7 @@ class HomeAssistantMain extends LitElement {
       return;
     }
 
-    const sidebarNarrow =
-      this.narrow || this.hass.dockedSidebar === "always_hidden";
+    const sidebarNarrow = this._sidebarNarrow;
 
     const disableSwipe =
       !sidebarNarrow || NON_SWIPABLE_PANELS.indexOf(hass.panelUrl) !== -1;
@@ -91,7 +90,7 @@ class HomeAssistantMain extends LitElement {
     import(/* webpackChunkName: "ha-sidebar" */ "../components/ha-sidebar");
 
     this.addEventListener("hass-toggle-menu", () => {
-      if (this.narrow || this.hass.dockedSidebar === "always_hidden") {
+      if (this._sidebarNarrow) {
         if (this.drawer.opened) {
           this.drawer.close();
         } else {
@@ -120,7 +119,7 @@ class HomeAssistantMain extends LitElement {
       this.narrow || this.hass.dockedSidebar !== "auto"
     );
 
-    if (changedProps.has("route") && this.narrow) {
+    if (changedProps.has("route") && this._sidebarNarrow) {
       this.drawer.close();
     }
 
@@ -136,6 +135,10 @@ class HomeAssistantMain extends LitElement {
     this.narrow = ev.detail.value;
   }
 
+  private get _sidebarNarrow() {
+    return this.narrow || this.hass.dockedSidebar === "always_hidden";
+  }
+
   private get drawer(): AppDrawerElement {
     return this.shadowRoot!.querySelector("app-drawer")!;
   }