diff --git a/panels/logbook/logbook-entry.html b/panels/logbook/logbook-entry.html
index 787db644d7..7980402281 100644
--- a/panels/logbook/logbook-entry.html
+++ b/panels/logbook/logbook-entry.html
@@ -65,6 +65,10 @@ Polymer({
     hass: {
       type: Object,
     },
+
+    entryObj: {
+      type: Object,
+    },
   },
 
   entityClicked: function (ev) {
diff --git a/src/cards/ha-persistent_notification-card.html b/src/cards/ha-persistent_notification-card.html
index 69ff5c3371..5d77e697ef 100644
--- a/src/cards/ha-persistent_notification-card.html
+++ b/src/cards/ha-persistent_notification-card.html
@@ -32,6 +32,10 @@ Polymer({
     hass: {
       type: Object,
     },
+
+    stateObj: {
+      type: Object,
+    },
   },
 
   computeTitle: function (stateObj) {
diff --git a/src/components/ha-labeled-slider.html b/src/components/ha-labeled-slider.html
index d9f6c44453..c3c600343b 100644
--- a/src/components/ha-labeled-slider.html
+++ b/src/components/ha-labeled-slider.html
@@ -39,6 +39,10 @@ Polymer({
   is: 'ha-labeled-slider',
 
   properties: {
+    caption: {
+      type: String,
+    },
+
     icon: {
       type: String,
     },
diff --git a/src/components/ha-menu-button.html b/src/components/ha-menu-button.html
new file mode 100644
index 0000000000..c80cfe6f8a
--- /dev/null
+++ b/src/components/ha-menu-button.html
@@ -0,0 +1,40 @@
+<dom-module id='ha-menu-button'>
+  <template>
+    <style>
+      .invisible {
+        visibility: hidden;
+      }
+    </style>
+    <paper-icon-button
+      icon='mdi:menu'
+      class$='[[computeMenuButtonClass(narrow, showMenu)]]'
+      on-tap='toggleMenu'
+    ></paper-icon-button>
+  </template>
+</dom-module>
+
+<script>
+Polymer({
+  is: 'ha-menu-button',
+
+  properties: {
+    narrow: {
+      type: Boolean,
+      value: false,
+    },
+
+    showMenu: {
+      type: Boolean,
+      value: false,
+    },
+  },
+
+  computeMenuButtonClass: function (narrow, showMenu) {
+    return !narrow && showMenu ? 'invisible' : '';
+  },
+
+  toggleMenu: function () {
+    this.fire('open-menu');
+  },
+});
+</script>
diff --git a/src/resources/panel-imports.html b/src/resources/panel-imports.html
index 3891df1a96..3ba7901996 100644
--- a/src/resources/panel-imports.html
+++ b/src/resources/panel-imports.html
@@ -6,4 +6,5 @@
 <link rel="import" href="../layouts/partial-base.html">
 <link rel="import" href="../components/display-time.html">
 <link rel="import" href="../components/domain-icon.html">
+<link rel="import" href="../components/ha-menu-button.html">
 <link rel="import" href="../../bower_components/paper-input/paper-textarea.html">
diff --git a/src/state-summary/state-card-toggle.html b/src/state-summary/state-card-toggle.html
index 9794698474..1aa89066e1 100755
--- a/src/state-summary/state-card-toggle.html
+++ b/src/state-summary/state-card-toggle.html
@@ -24,6 +24,10 @@ Polymer({
   is: 'state-card-toggle',
 
   properties: {
+    hass: {
+      type: Object,
+    },
+
     inDialog: {
       type: Boolean,
       value: false,
diff --git a/src/state-summary/state-card-weblink.html b/src/state-summary/state-card-weblink.html
index e6868246f7..73b521bad4 100644
--- a/src/state-summary/state-card-weblink.html
+++ b/src/state-summary/state-card-weblink.html
@@ -20,7 +20,7 @@
 
   <template>
     <state-badge state-obj='[[stateObj]]' in-dialog='[[inDialog]]'></state-badge>
-    <a href='[[stateObj.state]]' target='_blank' class='name' id='link'>[[stateObj.entityDisplay]]</a>
+    <a href$='[[stateObj.state]]' target='_blank' class='name' id='link'>[[stateObj.entityDisplay]]</a>
   </template>
 </dom-module>