diff --git a/homeassistant/components/frontend/version.py b/homeassistant/components/frontend/version.py
index bf584404b85..f0ef54755c8 100644
--- a/homeassistant/components/frontend/version.py
+++ b/homeassistant/components/frontend/version.py
@@ -1,2 +1,2 @@
 """ DO NOT MODIFY. Auto-generated by build_frontend script """
-VERSION = "d0b5982b1bc41a96b8a4f49aaa92af5d"
+VERSION = "ddf42f54c15daf472d4c8641fab8d418"
diff --git a/homeassistant/components/frontend/www_static/frontend.html b/homeassistant/components/frontend/www_static/frontend.html
index 4c80a602749..3528c02eb0f 100644
--- a/homeassistant/components/frontend/www_static/frontend.html
+++ b/homeassistant/components/frontend/www_static/frontend.html
@@ -22445,8 +22445,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     background-color: #fff;
     border-radius: 2px;
     box-shadow: rgba(0, 0, 0, 0.098) 0px 2px 4px, rgba(0, 0, 0, 0.098) 0px 0px 3px;
-    padding: 16px;
-    margin: 16px auto;
+    padding: 0 16px 8px;
+    margin: 16px;
   }
   </style>
 
@@ -22457,9 +22457,15 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         <state-card class="state-card" state-obj="[[item]]"></state-card>
       </template>
 
-      <template if="[[computeEmptyStates(states)]]">
+      <template is="dom-if" if="[[computeEmptyStates(states)]]">
         <div class="no-states-content">
-          <content></content>
+          <h3>Hi there!</h3>
+          <p>
+            It looks like we have nothing to show you right now. It could be that we have not yet discovered all your devices but it is more likely that you have not configured Home Assistant yet.
+          </p>
+          <p>
+            Please see the <a href="https://home-assistant.io/getting-started/" target="_blank">Getting Started</a> section on how to setup your devices.
+          </p>
         </div>
       </template>
 
@@ -25999,7 +26005,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     },
 
     computeHidePowerButton: function(isOff, supportsTurnOn, supportsTurnOff) {
-      return isOff && !supportsTurnOn || !isOff && supportsTurnOff;
+      return isOff ? !supportsTurnOn : !supportsTurnOff;
     },
 
     handleTogglePower: function() {
diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card-scene.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card-scene.html
index f7c2fb1a820..cf7cc9a0c08 100644
--- a/homeassistant/components/frontend/www_static/polymer/cards/state-card-scene.html
+++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card-scene.html
@@ -5,10 +5,10 @@
 
 <dom-module id="state-card-scene">
   <template>
-    <template is='dom-if' if=[[allowToggle]]>
+    <template is='dom-if' if='[[allowToggle]]'>
       <state-card-toggle state-obj="[[stateObj]]"></state-card-toggle>
     </template>
-    <template is='dom-if' if=[[!allowToggle]]>
+    <template is='dom-if' if='[[!allowToggle]]'>
       <state-card-display state-obj="[[stateObj]]"></state-card-display>
     </template>
   </template>
diff --git a/homeassistant/components/frontend/www_static/polymer/components/state-cards.html b/homeassistant/components/frontend/www_static/polymer/components/state-cards.html
index 7a710a4142f..5eabf370e01 100755
--- a/homeassistant/components/frontend/www_static/polymer/components/state-cards.html
+++ b/homeassistant/components/frontend/www_static/polymer/components/state-cards.html
@@ -32,8 +32,8 @@
     background-color: #fff;
     border-radius: 2px;
     box-shadow: rgba(0, 0, 0, 0.098) 0px 2px 4px, rgba(0, 0, 0, 0.098) 0px 0px 3px;
-    padding: 16px;
-    margin: 16px auto;
+    padding: 0 16px 8px;
+    margin: 16px;
   }
   </style>
 
@@ -44,9 +44,15 @@
         <state-card class="state-card" state-obj="[[item]]"></state-card>
       </template>
 
-      <template if="[[computeEmptyStates(states)]]">
+      <template is='dom-if' if="[[computeEmptyStates(states)]]">
         <div class='no-states-content'>
-          <content></content>
+          <h3>Hi there!</h3>
+          <p>
+            It looks like we have nothing to show you right now. It could be that we have not yet discovered all your devices but it is more likely that you have not configured Home Assistant yet.
+          </p>
+          <p>
+            Please see the <a href='https://home-assistant.io/getting-started/' target='_blank'>Getting Started</a> section on how to setup your devices.
+          </p>
         </div>
       </template>