diff --git a/home-assistant-js b/home-assistant-js
index 0209bcdd0b..b7ac88af0b 160000
--- a/home-assistant-js
+++ b/home-assistant-js
@@ -1 +1 @@
-Subproject commit 0209bcdd0b7491d539f05887347d66a63e0da42c
+Subproject commit b7ac88af0bf5a6065c021e47dc6af0f7006b187b
diff --git a/panels/logbook/ha-logbook.html b/panels/logbook/ha-logbook.html
index 16f77d042c..1afa54708e 100644
--- a/panels/logbook/ha-logbook.html
+++ b/panels/logbook/ha-logbook.html
@@ -1,21 +1,69 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<link rel="import" href="./logbook-entry.html">
+<link rel="import" href="../../src/components/domain-icon.html">
+<link rel="import" href="../../src/components/display-time.html">
+<link rel="import" href="../../src/components/relative-ha-datetime.html">
+
 
 <dom-module id="ha-logbook">
   <template>
+    <style is="custom-style" include="iron-flex"></style>
     <style>
       :host {
         display: block;
         padding: 16px;
       }
+
+      .entry {
+        @apply(--paper-font-body1);
+
+        display: block;
+        line-height: 2em;
+      }
+
+      display-time {
+        width: 55px;
+        font-size: .8em;
+        color: var(--secondary-text-color);
+      }
+
+      domain-icon {
+        margin: 0 8px 0 16px;
+        color: var(--primary-text-color);
+      }
+
+      .name {
+        text-transform: capitalize;
+      }
+
+      .message {
+        color: var(--primary-text-color);
+      }
+
+      a {
+        color: var(--primary-color);
+      }
     </style>
 
     <template is='dom-if' if='[[!entries.length]]'>
       No logbook entries found.
     </template>
+
     <template is='dom-repeat' items="[[entries]]">
-      <logbook-entry entry-obj="[[item]]" hass='[[hass]]'></logbook-entry>
+      <div class='horizontal layout entry'>
+        <display-time date-obj="[[item.when]]"></display-time>
+        <domain-icon domain="[[item.domain]]" class='icon'></domain-icon>
+        <div class='message' flex>
+          <template is='dom-if' if="[[!item.entityId]]">
+            <span class='name'>[[item.name]]</span>
+          </template>
+          <template is='dom-if' if="[[item.entityId]]">
+            <a href='#' on-click="entityClicked" class='name'>[[item.name]]</a>
+          </template>
+          <span> </span>
+          <span>[[item.message]]</span>
+        </div>
+      </div>
     </template>
   </template>
 </dom-module>
diff --git a/panels/logbook/ha-panel-logbook.html b/panels/logbook/ha-panel-logbook.html
index 3b40752237..9ff57c7163 100644
--- a/panels/logbook/ha-panel-logbook.html
+++ b/panels/logbook/ha-panel-logbook.html
@@ -20,6 +20,10 @@
     paper-input {
       max-width: 200px;
     }
+
+    [hidden] {
+      display: none !important;
+    }
     </style>
 
     <partial-base narrow="[[narrow]]" show-menu='[[showMenu]]'>
@@ -30,8 +34,12 @@
 
       <div>
         <div class='selected-date-container'>
-          <paper-input label='Showing entries for' id='datePicker'
-            value='[[selectedDate]]' on-focus='datepickerFocus'></paper-input>
+          <paper-input
+            label='Showing entries for'
+            id='datePicker'
+            value='[[selectedDate]]'
+            on-focus='datepickerFocus'
+          ></paper-input>
 
           <loading-box hidden$='[[!isLoading]]'>Loading logbook entries</loading-box>
         </div>
@@ -106,7 +114,7 @@ Polymer({
   },
 
   datepickerFocus: function () {
-    this.datePicker.adjustPosition();
+    // this.datePicker.adjustPosition();
   },
 
   attached: function () {
diff --git a/panels/logbook/logbook-entry.html b/panels/logbook/logbook-entry.html
deleted file mode 100644
index 58706feb00..0000000000
--- a/panels/logbook/logbook-entry.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer.html">
-
-<link rel="import" href="../../src/components/domain-icon.html">
-<link rel="import" href="../../src/components/display-time.html">
-<link rel="import" href="../../src/components/relative-ha-datetime.html">
-
-<dom-module id="logbook-entry">
-  <template>
-    <style is="custom-style" include="iron-flex"></style>
-    <style>
-      :host {
-        @apply(--paper-font-body1);
-
-        display: block;
-        line-height: 2em;
-      }
-
-      display-time {
-        width: 55px;
-        font-size: .8em;
-        color: var(--secondary-text-color);
-      }
-
-      domain-icon {
-        margin: 0 8px 0 16px;
-        color: var(--primary-text-color);
-      }
-
-      .name {
-        text-transform: capitalize;
-      }
-
-      .message {
-        color: var(--primary-text-color);
-      }
-
-      a {
-        color: var(--primary-color);
-      }
-    </style>
-
-    <div class='horizontal layout'>
-      <display-time date-obj="[[entryObj.when]]"></display-time>
-      <domain-icon domain="[[entryObj.domain]]" class='icon'></domain-icon>
-      <div class='message' flex>
-        <template is='dom-if' if="[[!entryObj.entityId]]">
-          <span class='name'>[[entryObj.name]]</span>
-        </template>
-        <template is='dom-if' if="[[entryObj.entityId]]">
-          <a href='#' on-click="entityClicked" class='name'>[[entryObj.name]]</a>
-        </template>
-        <span> </span>
-        <span>[[entryObj.message]]</span>
-      </div>
-    </div>
-  </template>
-</dom-module>
-
-<script>
-Polymer({
-  is: 'logbook-entry',
-
-  properties: {
-    hass: {
-      type: Object,
-    },
-
-    entryObj: {
-      type: Object,
-    },
-  },
-
-  entityClicked: function (ev) {
-    ev.preventDefault();
-    this.hass.moreInfoActions.selectEntity(this.entryObj.entityId);
-  },
-});
-</script>
diff --git a/src/app-core.js b/src/app-core.js
index 049edb2b89..d6cc86df5b 100644
--- a/src/app-core.js
+++ b/src/app-core.js
@@ -31,5 +31,11 @@ hass.reactor.batch(function () {
 
 setTimeout(hass.startLocalStoragePreferencesSync, 5000);
 
+if ('serviceWorker' in navigator) {
+  window.addEventListener('load', function() {
+    navigator.serviceWorker.register('/service-worker.js');
+  });
+}
+
 // While we figure out how ha-entity-marker can keep it's references
 window.hass = hass;
diff --git a/src/components/state-info.html b/src/components/entity/state-info.html
similarity index 83%
rename from src/components/state-info.html
rename to src/components/entity/state-info.html
index 5d27c20088..bdf296b05f 100644
--- a/src/components/state-info.html
+++ b/src/components/entity/state-info.html
@@ -1,7 +1,7 @@
-<link rel="import" href="../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
 
-<link rel="import" href="./entity/state-badge.html">
-<link rel="import" href="relative-ha-datetime.html">
+<link rel="import" href="./state-badge.html">
+<link rel="import" href="../relative-ha-datetime.html">
 
 <dom-module id="state-info">
   <template>
diff --git a/src/components/ha-label-badge.html b/src/components/ha-label-badge.html
index 898fad6b1a..f50d62f7ca 100644
--- a/src/components/ha-label-badge.html
+++ b/src/components/ha-label-badge.html
@@ -70,6 +70,10 @@
     iron-image {
       border-radius: 50%;
     }
+
+    [hidden] {
+      display: none !important;
+    }
     </style>
 
     <div class='badge-container'>
diff --git a/src/components/stream-status.html b/src/components/stream-status.html
index cfd38851dd..21b61f9b81 100644
--- a/src/components/stream-status.html
+++ b/src/components/stream-status.html
@@ -8,18 +8,22 @@
 <dom-module id="stream-status">
   <template>
     <style>
-    :host {
-      display: inline-block;
-      height: 24px;
-    }
+      :host {
+        display: inline-block;
+        height: 24px;
+      }
 
-    paper-toggle-button {
-      vertical-align: middle;
-    }
+      paper-toggle-button {
+        vertical-align: middle;
+      }
 
-    iron-icon {
-      opacity: var(--dark-primary-opacity);
-    }
+      iron-icon {
+        opacity: var(--dark-primary-opacity);
+      }
+
+      [hidden] {
+        display: none !important;
+      }
     </style>
 
     <iron-icon icon="mdi:alert" hidden$="[[!hasError]]"></iron-icon>
diff --git a/src/home-assistant.html b/src/home-assistant.html
index 6e92f71a42..965f1455db 100644
--- a/src/home-assistant.html
+++ b/src/home-assistant.html
@@ -82,14 +82,6 @@ Polymer({
                     });
   },
 
-  created: function () {
-    if (!('serviceWorker' in navigator)) {
-      return;
-    }
-
-    navigator.serviceWorker.register('/service_worker.js');
-  },
-
   ready: function () {
     this.loadIcons();
   },
diff --git a/src/layouts/partial-panel-resolver.html b/src/layouts/partial-panel-resolver.html
index 862411f95b..9a701b9d1b 100644
--- a/src/layouts/partial-panel-resolver.html
+++ b/src/layouts/partial-panel-resolver.html
@@ -34,29 +34,17 @@ Polymer({
   },
 
   panelChanged: function (panel) {
-    if (!panel) {
-      // while (rootEl.lastChild) {
-      //   rootEl.removeChild(rootEl.lastChild);
-      // }
-      return;
-    }
-
-    const rootEl = Polymer.dom(this);
-    const tag = 'ha-panel-' + panel.get('component_name');
+    if (!panel) return;
 
     this.importHref(panel.get('url'));
 
-    while (rootEl.lastChild) {
-      rootEl.removeChild(rootEl.lastChild);
-    }
-
-    const customEl = document.createElement(tag);
-
-    customEl.hass = this.hass;
-    customEl.narrow = this.narrow;
-    customEl.showMenu = this.showMenu;
-    customEl.panel = panel.toJS();
-    rootEl.appendChild(customEl);
+    window.hassUtil.dynamicContentUpdater(
+      this, 'ha-panel-' + panel.get('component_name'), {
+        hass: this.hass,
+        narrow: this.narrow,
+        showMenu: this.showMenu,
+        panel: panel,
+      })
   },
 
   updateAttributes: function () {
diff --git a/src/polymer.js b/src/polymer.js
deleted file mode 100644
index 858ee90e4f..0000000000
--- a/src/polymer.js
+++ /dev/null
@@ -1 +0,0 @@
-export default window.Polymer;
diff --git a/src/state-summary/state-card-configurator.html b/src/state-summary/state-card-configurator.html
index e0813caf84..c9c876dbb5 100644
--- a/src/state-summary/state-card-configurator.html
+++ b/src/state-summary/state-card-configurator.html
@@ -1,7 +1,7 @@
 <link rel='import' href='../../bower_components/polymer/polymer.html'>
 <link rel="import" href="../../bower_components/paper-button/paper-button.html">
 
-<link rel="import" href="../components/state-info.html">
+<link rel="import" href="../components/entity/state-info.html">
 
 <dom-module id='state-card-configurator'>
   <template>
diff --git a/src/state-summary/state-card-display.html b/src/state-summary/state-card-display.html
index dc8ca4fbac..fd7f529b2d 100755
--- a/src/state-summary/state-card-display.html
+++ b/src/state-summary/state-card-display.html
@@ -1,6 +1,6 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<link rel="import" href="../components/state-info.html">
+<link rel="import" href="../components/entity/state-info.html">
 
 <dom-module id="state-card-display">
   <template>
diff --git a/src/state-summary/state-card-hvac.html b/src/state-summary/state-card-hvac.html
index 464eb4d51e..24c01893f6 100755
--- a/src/state-summary/state-card-hvac.html
+++ b/src/state-summary/state-card-hvac.html
@@ -1,6 +1,6 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<link rel="import" href="../components/state-info.html">
+<link rel="import" href="../components/entity/state-info.html">
 
 <dom-module id="state-card-hvac">
   <template>
diff --git a/src/state-summary/state-card-input_slider.html b/src/state-summary/state-card-input_slider.html
index 42b0dbf9b5..68a0c5dd0c 100644
--- a/src/state-summary/state-card-input_slider.html
+++ b/src/state-summary/state-card-input_slider.html
@@ -1,7 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 <link rel="import" href="../../bower_components/paper-slider/paper-slider.html">
 
-<link rel="import" href="../components/state-info.html">
+<link rel="import" href="../components/entity/state-info.html">
 
 <dom-module id="state-card-input_slider">
   <template>
diff --git a/src/state-summary/state-card-media_player.html b/src/state-summary/state-card-media_player.html
index 360cb00102..4fd233a12e 100644
--- a/src/state-summary/state-card-media_player.html
+++ b/src/state-summary/state-card-media_player.html
@@ -1,6 +1,6 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<link rel="import" href="../components/state-info.html">
+<link rel="import" href="../components/entity/state-info.html">
 
 <dom-module id="state-card-media_player">
   <template>
diff --git a/src/state-summary/state-card-rollershutter.html b/src/state-summary/state-card-rollershutter.html
index a5b8a7622c..07d07476fa 100644
--- a/src/state-summary/state-card-rollershutter.html
+++ b/src/state-summary/state-card-rollershutter.html
@@ -1,7 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 <link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
 
-<link rel="import" href="../components/state-info.html">
+<link rel="import" href="../components/entity/state-info.html">
 
 <dom-module id="state-card-rollershutter">
   <template>
diff --git a/src/state-summary/state-card-scene.html b/src/state-summary/state-card-scene.html
index ed5dc6dec4..9fbf326ff3 100644
--- a/src/state-summary/state-card-scene.html
+++ b/src/state-summary/state-card-scene.html
@@ -1,7 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 <link rel="import" href="../../bower_components/paper-button/paper-button.html">
 
-<link rel="import" href="../components/state-info.html">
+<link rel="import" href="../components/entity/state-info.html">
 
 <dom-module id="state-card-scene">
   <template>
diff --git a/src/state-summary/state-card-script.html b/src/state-summary/state-card-script.html
index 827c651b7a..76dd7802db 100644
--- a/src/state-summary/state-card-script.html
+++ b/src/state-summary/state-card-script.html
@@ -1,7 +1,7 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 <link rel="import" href="../../bower_components/paper-button/paper-button.html">
 
-<link rel="import" href="../components/state-info.html">
+<link rel="import" href="../components/entity/state-info.html">
 <link rel="import" href="../components/entity/ha-entity-toggle.html">
 
 <dom-module id="state-card-script">
diff --git a/src/state-summary/state-card-thermostat.html b/src/state-summary/state-card-thermostat.html
index cd73586ffb..53cf3769fb 100644
--- a/src/state-summary/state-card-thermostat.html
+++ b/src/state-summary/state-card-thermostat.html
@@ -1,6 +1,6 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<link rel="import" href="../components/state-info.html">
+<link rel="import" href="../components/entity/state-info.html">
 
 <dom-module id="state-card-thermostat">
   <template>
diff --git a/src/state-summary/state-card-toggle.html b/src/state-summary/state-card-toggle.html
index bbfe532f81..02d0a0fc95 100755
--- a/src/state-summary/state-card-toggle.html
+++ b/src/state-summary/state-card-toggle.html
@@ -1,6 +1,6 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<link rel="import" href="../components/state-info.html">
+<link rel="import" href="../components/entity/state-info.html">
 <link rel="import" href="../components/entity/ha-entity-toggle.html">
 
 <dom-module id="state-card-toggle">