diff --git a/homeassistant/components/frontend/version.py b/homeassistant/components/frontend/version.py
index 2af8235ef1b..db16a04a72b 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 = "3822abfa5abb0a8d60ddf434a2f341d5"
+VERSION = "f580c3369e5a44f71d3304dc0939ddd1"
diff --git a/homeassistant/components/frontend/www_static/frontend.html b/homeassistant/components/frontend/www_static/frontend.html
index 5bf36a46a7b..579967008f6 100644
--- a/homeassistant/components/frontend/www_static/frontend.html
+++ b/homeassistant/components/frontend/www_static/frontend.html
@@ -193,7 +193,7 @@ return pickBy("isBefore",args)};moment.max=function(){var args=[].slice.call(arg
         {{stateObj.attributes.errors}}
       </p><p class="center" hidden?="{{!stateObj.attributes.description_image}}"><img src="{{stateObj.attributes.description_image}}"></p><p class="submit"><paper-button raised="" on-click="{{submitClicked}}" hidden?="{{action !== 'display'}}">
           {{stateObj.attributes.submit_caption || "Set configuration"}}
-        </paper-button><span hidden?="{{action !== 'configuring'}}"><paper-spinner active="true"></paper-spinner><span>Configuring…</span></span></p></template></div></template><script>Polymer("more-info-configurator",{action:"display",submitClicked:function(){this.action="configuring";var data={configure_id:this.stateObj.attributes.configure_id};window.hass.serviceActions.callService("configurator","configure",data).then(function(){this.action="display";window.hass.syncActions.sync()}.bind(this),function(){this.action="display"}.bind(this))}});</script></polymer-element><polymer-element name="more-info-content" attributes="stateObj" assetpath="polymer/more-infos/"><template><style>:host{display:block}</style><div id="moreInfoContainer" class="{{classNames}}"></div></template><script>Polymer("more-info-content",{classNames:"",observe:{"stateObj.attributes":"stateAttributesChanged"},stateObjChanged:function(oldVal,newVal){var moreInfoContainer=this.$.moreInfoContainer;if(!newVal){if(moreInfoContainer.lastChild){moreInfoContainer.removeChild(moreInfoContainer.lastChild)}return}if(!oldVal||oldVal.moreInfoType!=newVal.moreInfoType){if(moreInfoContainer.lastChild){moreInfoContainer.removeChild(moreInfoContainer.lastChild)}var moreInfo=document.createElement("more-info-"+newVal.moreInfoType);moreInfo.stateObj=newVal;moreInfoContainer.appendChild(moreInfo)}else{moreInfoContainer.lastChild.stateObj=newVal}},stateAttributesChanged:function(oldVal,newVal){this.classNames=Object.keys(newVal).map(function(key){return"has-"+key}).join(" ")}});</script></polymer-element><polymer-element name="more-info-dialog" assetpath="polymer/dialogs/"><template><ha-dialog id="dialog"><style>.title-card{margin-bottom:24px}</style><div><state-card-content stateobj="{{stateObj}}" class="title-card"></state-card-content><state-timeline statehistory="{{stateHistory}}"></state-timeline><more-info-content stateobj="{{stateObj}}"></more-info-content></div></ha-dialog></template><script>var storeListenerMixIn=window.hass.storeListenerMixIn;var stateStore=window.hass.stateStore;var stateHistoryStore=window.hass.stateHistoryStore;var stateHistoryActions=window.hass.stateHistoryActions;Polymer(Polymer.mixin({entityId:false,stateObj:null,stateHistory:null,hasHistoryComponent:false,observe:{"stateObj.attributes":"reposition"},ready:function(){this.listenToStores()},detached:function(){this.stopListeningToStores()},componentStoreChanged:function(componentStore){this.hasHistoryComponent=componentStore.isLoaded("history")},stateStoreChanged:function(){var newState;if(!this.entityId){newState=null}else{newState=stateStore.get(this.entityId)}console.log("state store changed");if(newState!==this.stateObj){console.log("Setting new stateobj");this.stateObj=newState}},stateHistoryStoreChanged:function(){var newHistory;if(this.hasHistoryComponent&&this.entityId){newHistory=stateHistoryStore.get(this.entityId)}else{newHistory=null}if(newHistory!==this.stateHistory){this.stateHistory=newHistory}},changeEntityId:function(entityId){this.entityId=entityId;if(!entityId){this.stateObj=null;this.stateHistory=null;return}this.stateStoreChanged();this.stateHistoryStoreChanged();if(this.hasHistoryComponent&&stateHistoryStore.isStale(entityId)){stateHistoryActions.fetch(entityId)}},reposition:function(oldVal,newVal){if(this.$.dialog.opened){this.job("resizeAfterLayoutChange",function(){this.$.dialog.resizeHandler()}.bind(this),1e3)}},show:function(entityId){this.changeEntityId(entityId);this.job("showDialogAfterRender",function(){this.$.dialog.toggle()}.bind(this))}},storeListenerMixIn));</script></polymer-element><script>var DOMAINS_WITH_CARD=["thermostat","configurator"];var DOMAINS_WITH_MORE_INFO=["light","group","sun","configurator"];PolymerExpressions.prototype.relativeHATime=function(timeString){if(!timeString)return;return moment(window.hass.util.parseDateTime(timeString)).fromNow()};PolymerExpressions.prototype.HATimeStripDate=function(timeString){return(timeString||"").split(" ")[0]};Object.defineProperties(window.hass.stateModel.prototype,{cardType:{get:function(){if(DOMAINS_WITH_CARD.indexOf(this.domain)!==-1){return this.domain}else if(this.canToggle){return"toggle"}else{return"display"}}},moreInfoType:{get:function(){if(DOMAINS_WITH_MORE_INFO.indexOf(this.domain)!==-1){return this.domain}else{return"default"}}},relativeLastChanged:{get:function(){return moment(this.lastChangedAsDate).fromNow()}}});var state,constants=window.hass.constants,dispatcher=window.hass.dispatcher,preferenceStore=window.hass.preferenceStore;var uiActions=window.hass.uiActions={ACTION_SHOW_TOAST:constants.ACTION_SHOW_TOAST,ACTION_SHOW_DIALOG_MORE_INFO:"ACTION_SHOW_DIALOG_MORE_INFO",showMoreInfoDialog:function(entityId){dispatcher.dispatch({actionType:this.ACTION_SHOW_DIALOG_MORE_INFO,entityId:entityId})},validateAuth:function(authToken){window.hass.authActions.validate(authToken,preferenceStore.useStreaming())}};</script><polymer-element name="home-assistant-api" attributes="auth" assetpath="polymer/"><template><more-info-dialog id="moreInfoDialog"></more-info-dialog></template><script>Polymer("home-assistant-api",{ready:function(){dispatcher.register(function(payload){switch(payload.actionType){case uiActions.ACTION_SHOW_DIALOG_MORE_INFO:this.$.moreInfoDialog.show(payload.entityId);break}}.bind(this));if(this.auth){window.hass.uiActions.validateAuth(this.auth)}}});</script></polymer-element></div>
+        </paper-button><span hidden?="{{action !== 'configuring'}}"><paper-spinner active="true"></paper-spinner><span>Configuring…</span></span></p></template></div></template><script>Polymer("more-info-configurator",{action:"display",submitClicked:function(){this.action="configuring";var data={configure_id:this.stateObj.attributes.configure_id};window.hass.serviceActions.callService("configurator","configure",data).then(function(){this.action="display";window.hass.syncActions.sync()}.bind(this),function(){this.action="display"}.bind(this))}});</script></polymer-element><polymer-element name="more-info-content" attributes="stateObj" assetpath="polymer/more-infos/"><template><style>:host{display:block}</style><div id="moreInfoContainer" class="{{classNames}}"></div></template><script>Polymer("more-info-content",{classNames:"",observe:{"stateObj.attributes":"stateAttributesChanged"},stateObjChanged:function(oldVal,newVal){var moreInfoContainer=this.$.moreInfoContainer;if(!newVal){if(moreInfoContainer.lastChild){moreInfoContainer.removeChild(moreInfoContainer.lastChild)}return}if(!oldVal||oldVal.moreInfoType!=newVal.moreInfoType){if(moreInfoContainer.lastChild){moreInfoContainer.removeChild(moreInfoContainer.lastChild)}var moreInfo=document.createElement("more-info-"+newVal.moreInfoType);moreInfo.stateObj=newVal;moreInfoContainer.appendChild(moreInfo)}else{moreInfoContainer.lastChild.stateObj=newVal}},stateAttributesChanged:function(oldVal,newVal){this.classNames=Object.keys(newVal).map(function(key){return"has-"+key}).join(" ")}});</script></polymer-element><polymer-element name="more-info-dialog" assetpath="polymer/dialogs/"><template><ha-dialog id="dialog"><style>.title-card{margin-bottom:24px}</style><div><state-card-content stateobj="{{stateObj}}" class="title-card"></state-card-content><state-timeline statehistory="{{stateHistory}}"></state-timeline><more-info-content stateobj="{{stateObj}}"></more-info-content></div></ha-dialog></template><script>var storeListenerMixIn=window.hass.storeListenerMixIn;var stateStore=window.hass.stateStore;var stateHistoryStore=window.hass.stateHistoryStore;var stateHistoryActions=window.hass.stateHistoryActions;Polymer(Polymer.mixin({entityId:false,stateObj:null,stateHistory:null,hasHistoryComponent:false,observe:{"stateObj.attributes":"reposition"},ready:function(){this.listenToStores(true)},detached:function(){this.stopListeningToStores()},componentStoreChanged:function(componentStore){this.hasHistoryComponent=componentStore.isLoaded("history")},stateStoreChanged:function(){var newState=this.entityId?stateStore.get(this.entityId):null;if(newState!==this.stateObj){this.stateObj=newState}},stateHistoryStoreChanged:function(){var newHistory;if(this.hasHistoryComponent&&this.entityId){newHistory=stateHistoryStore.get(this.entityId)}else{newHistory=null}if(newHistory!==this.stateHistory){this.stateHistory=newHistory}},changeEntityId:function(entityId){this.entityId=entityId;this.stateStoreChanged();this.stateHistoryStoreChanged();if(this.hasHistoryComponent&&stateHistoryStore.isStale(entityId)){stateHistoryActions.fetch(entityId)}},reposition:function(oldVal,newVal){if(this.$.dialog.opened){this.job("resizeAfterLayoutChange",function(){this.$.dialog.resizeHandler()}.bind(this),1e3)}},show:function(entityId){this.changeEntityId(entityId);this.job("showDialogAfterRender",function(){this.$.dialog.toggle()}.bind(this))}},storeListenerMixIn));</script></polymer-element><script>var DOMAINS_WITH_CARD=["thermostat","configurator"];var DOMAINS_WITH_MORE_INFO=["light","group","sun","configurator"];PolymerExpressions.prototype.relativeHATime=function(timeString){if(!timeString)return;return moment(window.hass.util.parseDateTime(timeString)).fromNow()};PolymerExpressions.prototype.HATimeStripDate=function(timeString){return(timeString||"").split(" ")[0]};Object.defineProperties(window.hass.stateModel.prototype,{cardType:{get:function(){if(DOMAINS_WITH_CARD.indexOf(this.domain)!==-1){return this.domain}else if(this.canToggle){return"toggle"}else{return"display"}}},moreInfoType:{get:function(){if(DOMAINS_WITH_MORE_INFO.indexOf(this.domain)!==-1){return this.domain}else{return"default"}}},relativeLastChanged:{get:function(){return moment(this.lastChangedAsDate).fromNow()}}});var state,constants=window.hass.constants,dispatcher=window.hass.dispatcher,preferenceStore=window.hass.preferenceStore;var uiActions=window.hass.uiActions={ACTION_SHOW_TOAST:constants.ACTION_SHOW_TOAST,ACTION_SHOW_DIALOG_MORE_INFO:"ACTION_SHOW_DIALOG_MORE_INFO",showMoreInfoDialog:function(entityId){dispatcher.dispatch({actionType:this.ACTION_SHOW_DIALOG_MORE_INFO,entityId:entityId})},validateAuth:function(authToken){window.hass.authActions.validate(authToken,preferenceStore.useStreaming())}};</script><polymer-element name="home-assistant-api" attributes="auth" assetpath="polymer/"><template><more-info-dialog id="moreInfoDialog"></more-info-dialog></template><script>Polymer("home-assistant-api",{ready:function(){dispatcher.register(function(payload){switch(payload.actionType){case uiActions.ACTION_SHOW_DIALOG_MORE_INFO:this.$.moreInfoDialog.show(payload.entityId);break}}.bind(this));if(this.auth){window.hass.uiActions.validateAuth(this.auth)}}});</script></polymer-element></div>
 <div hidden><polymer-element name="login-form" assetpath="polymer/layouts/"><template><style>paper-input{display:block}.login paper-button{margin-left:242px}.login .interact{height:125px}#validatebox{text-align:center}.validatemessage{margin-top:10px}</style><div layout="" horizontal="" center="" fit="" class="login" id="splash"><div layout="" vertical="" center="" flex=""><img src="/static/favicon-192x192.png"><h1>Home Assistant</h1><a href="polymer/layouts/#" id="hideKeyboardOnFocus"></a><div class="interact" layout="" vertical=""><div id="loginform" hidden?="{{isValidating || isLoggedIn}}"><paper-input-decorator label="Password" id="passwordDecorator"><input is="core-input" type="password" id="passwordInput" value="{{authToken}}" on-keyup="{{passwordKeyup}}"></paper-input-decorator><paper-button on-click="{{validatePassword}}">Log In</paper-button></div><div id="validatebox" hidden?="{{!(isValidating || isLoggedIn)}}"><paper-spinner active="true"></paper-spinner><br><div class="validatemessage">{{spinnerMessage}}</div></div></div></div></div></template><script>var storeListenerMixIn=window.hass.storeListenerMixIn;Polymer(Polymer.mixin({MSG_VALIDATING:"Validating password…",MSG_LOADING_DATA:"Loading data…",authToken:"",isValidating:false,isLoggedIn:false,spinnerMessage:"",ready:function(){this.listenToStores(true)},attached:function(){this.focusPassword()},detached:function(){this.stopListeningToStores()},authStoreChanged:function(authStore){this.isValidating=authStore.isValidating();this.isLoggedIn=authStore.isLoggedIn();this.spinnerMessage=this.isValidating?this.MSG_VALIDATING:this.MSG_LOADING_DATA;if(authStore.wasLastAttemptInvalid()){this.$.passwordDecorator.error=this.authStore.getLastAttemptMessage();this.$.passwordDecorator.isInvalid=true}if(!(this.isValidating&&this.isLoggedIn)){this.job("focusPasswordBox",this.focusPassword.bind(this))}},focusPassword:function(){this.$.passwordInput.focus()},passwordKeyup:function(ev){if(ev.keyCode===13){this.validatePassword()}else if(this.$.passwordDecorator.isInvalid){this.$.passwordDecorator.isInvalid=false}},validatePassword:function(){this.$.hideKeyboardOnFocus.focus();window.hass.uiActions.validateAuth(this.authToken)}},storeListenerMixIn));</script></polymer-element></div>
 <div hidden><polymer-element name="core-media-query" attributes="query queryMatches" assetpath="polymer/bower_components/core-media-query/"><template><style>:host{display:none}</style></template><script>Polymer("core-media-query",{queryMatches:false,query:"",ready:function(){this._mqHandler=this.queryHandler.bind(this);this._mq=null},queryChanged:function(){if(this._mq){this._mq.removeListener(this._mqHandler)}var query=this.query;if(query[0]!=="("){query="("+this.query+")"}this._mq=window.matchMedia(query);this._mq.addListener(this._mqHandler);this.queryHandler(this._mq)},queryHandler:function(mq){this.queryMatches=mq.matches;this.asyncFire("core-media-change",mq)}});</script></polymer-element><polymer-element name="core-selection" attributes="multi" hidden assetpath="polymer/bower_components/core-selection/"><script>Polymer("core-selection",{multi:false,ready:function(){this.clear()},clear:function(){this.selection=[]},getSelection:function(){return this.multi?this.selection:this.selection[0]},isSelected:function(item){return this.selection.indexOf(item)>=0},setItemSelected:function(item,isSelected){if(item!==undefined&&item!==null){if(isSelected){this.selection.push(item)}else{var i=this.selection.indexOf(item);if(i>=0){this.selection.splice(i,1)}}this.fire("core-select",{isSelected:isSelected,item:item})}},select:function(item){if(this.multi){this.toggle(item)}else if(this.getSelection()!==item){this.setItemSelected(this.getSelection(),false);this.setItemSelected(item,true)}},toggle:function(item){this.setItemSelected(item,!this.isSelected(item))}});</script></polymer-element><polymer-element name="core-selector" attributes="selected multi valueattr selectedClass selectedProperty selectedAttribute selectedItem selectedModel selectedIndex notap excludedLocalNames target itemsSelector activateEvent" assetpath="polymer/bower_components/core-selector/"><template><core-selection id="selection" multi="{{multi}}" on-core-select="{{selectionSelect}}"></core-selection><content id="items" select="*"></content></template><script>Polymer("core-selector",{selected:null,multi:false,valueattr:"name",selectedClass:"core-selected",selectedProperty:"",selectedAttribute:"active",selectedItem:null,selectedModel:null,selectedIndex:-1,excludedLocalNames:"",target:null,itemsSelector:"",activateEvent:"tap",notap:false,defaultExcludedLocalNames:"template",observe:{"selected multi":"selectedChanged"},ready:function(){this.activateListener=this.activateHandler.bind(this);this.itemFilter=this.filterItem.bind(this);this.excludedLocalNamesChanged();this.observer=new MutationObserver(this.updateSelected.bind(this));if(!this.target){this.target=this}},get items(){if(!this.target){return[]}var nodes=this.target!==this?this.itemsSelector?this.target.querySelectorAll(this.itemsSelector):this.target.children:this.$.items.getDistributedNodes();return Array.prototype.filter.call(nodes,this.itemFilter)},filterItem:function(node){return!this._excludedNames[node.localName]},excludedLocalNamesChanged:function(){this._excludedNames={};var s=this.defaultExcludedLocalNames;if(this.excludedLocalNames){s+=" "+this.excludedLocalNames}s.split(/\s+/g).forEach(function(n){this._excludedNames[n]=1},this)},targetChanged:function(old){if(old){this.removeListener(old);this.observer.disconnect();this.clearSelection()}if(this.target){this.addListener(this.target);this.observer.observe(this.target,{childList:true});this.updateSelected()}},addListener:function(node){Polymer.addEventListener(node,this.activateEvent,this.activateListener)},removeListener:function(node){Polymer.removeEventListener(node,this.activateEvent,this.activateListener)},get selection(){return this.$.selection.getSelection()},selectedChanged:function(){if(arguments.length===1){this.processSplices(arguments[0])}else{this.updateSelected()}},updateSelected:function(){this.validateSelected();if(this.multi){this.clearSelection(this.selected);this.selected&&this.selected.forEach(function(s){this.setValueSelected(s,true)},this)}else{this.valueToSelection(this.selected)}},validateSelected:function(){if(this.multi&&!Array.isArray(this.selected)&&this.selected!=null){this.selected=[this.selected]}else if(!this.multi&&Array.isArray(this.selected)){var s=this.selected[0];this.clearSelection([s]);this.selected=s}},processSplices:function(splices){for(var i=0,splice;splice=splices[i];i++){for(var j=0;j<splice.removed.length;j++){this.setValueSelected(splice.removed[j],false)}for(var j=0;j<splice.addedCount;j++){this.setValueSelected(this.selected[splice.index+j],true)}}},clearSelection:function(excludes){this.$.selection.selection.slice().forEach(function(item){var v=this.valueForNode(item)||this.items.indexOf(item);if(!excludes||excludes.indexOf(v)<0){this.$.selection.setItemSelected(item,false)}},this)},valueToSelection:function(value){var item=this.valueToItem(value);this.$.selection.select(item)},setValueSelected:function(value,isSelected){var item=this.valueToItem(value);if(isSelected^this.$.selection.isSelected(item)){this.$.selection.setItemSelected(item,isSelected)}},updateSelectedItem:function(){this.selectedItem=this.selection},selectedItemChanged:function(){if(this.selectedItem){var t=this.selectedItem.templateInstance;this.selectedModel=t?t.model:undefined}else{this.selectedModel=null}this.selectedIndex=this.selectedItem?parseInt(this.valueToIndex(this.selected)):-1},valueToItem:function(value){return value===null||value===undefined?null:this.items[this.valueToIndex(value)]},valueToIndex:function(value){for(var i=0,items=this.items,c;c=items[i];i++){if(this.valueForNode(c)==value){return i}}return value},valueForNode:function(node){return node[this.valueattr]||node.getAttribute(this.valueattr)},selectionSelect:function(e,detail){this.updateSelectedItem();if(detail.item){this.applySelection(detail.item,detail.isSelected)}},applySelection:function(item,isSelected){if(this.selectedClass){item.classList.toggle(this.selectedClass,isSelected)}if(this.selectedProperty){item[this.selectedProperty]=isSelected}if(this.selectedAttribute&&item.setAttribute){if(isSelected){item.setAttribute(this.selectedAttribute,"")}else{item.removeAttribute(this.selectedAttribute)}}},activateHandler:function(e){if(!this.notap){var i=this.findDistributedTarget(e.target,this.items);if(i>=0){var item=this.items[i];var s=this.valueForNode(item)||i;if(this.multi){if(this.selected){this.addRemoveSelected(s)}else{this.selected=[s]}}else{this.selected=s}this.asyncFire("core-activate",{item:item})}}},addRemoveSelected:function(value){var i=this.selected.indexOf(value);if(i>=0){this.selected.splice(i,1)}else{this.selected.push(value)}},findDistributedTarget:function(target,nodes){while(target&&target!=this){var i=Array.prototype.indexOf.call(nodes,target);if(i>=0){return i}target=target.parentNode}},selectIndex:function(index){var item=this.items[index];if(item){this.selected=this.valueForNode(item)||index;return item}},selectPrevious:function(wrapped){var i=wrapped&&!this.selectedIndex?this.items.length-1:this.selectedIndex-1;return this.selectIndex(i)},selectNext:function(wrapped){var i=wrapped&&this.selectedIndex>=this.items.length-1?0:this.selectedIndex+1;return this.selectIndex(i)}});</script></polymer-element><polymer-element name="core-drawer-panel" touch-action="auto" assetpath="polymer/bower_components/core-drawer-panel/"><template><style>:host{display:block;position:absolute;top:0;left:0;width:100%;height:100%;overflow:hidden}core-selector>#drawer{position:absolute;top:0;left:0;height:100%;will-change:transform;box-sizing:border-box;-moz-box-sizing:border-box}.transition>#drawer{transition:-webkit-transform ease-in-out .3s,width ease-in-out .3s;transition:transform ease-in-out .3s,width ease-in-out .3s}.right-drawer>#drawer{left:auto;right:0}polyfill-next-selector{content:':host [drawer]'}::content[select="[drawer]"]>*{position:absolute;top:0;left:0;width:100%;height:100%;box-sizing:border-box;-moz-box-sizing:border-box}core-selector>#main{position:absolute;top:0;right:0;bottom:0}.transition>#main{transition:left ease-in-out .3s,padding ease-in-out .3s}.right-drawer>#main{left:0}.right-drawer.transition>#main{transition:right ease-in-out .3s,padding ease-in-out .3s}polyfill-next-selector{content:'#main > [main]'}::content[select="[main]"]>*{height:100%}#scrim{position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(0,0,0,.3);visibility:hidden;opacity:0;transition:opacity ease-in-out .38s,visibility ease-in-out .38s}#edgeSwipeOverlay{position:absolute;top:0;bottom:0;left:0;width:20px}.right-drawer>#main>#edgeSwipeOverlay{right:0;left:auto}.narrow-layout>#drawer.core-selected{box-shadow:2px 2px 4px rgba(0,0,0,.15)}.right-drawer.narrow-layout>#drawer.core-selected{box-shadow:-2px 2px 4px rgba(0,0,0,.15)}polyfill-next-selector{content:':host .narrow-layout > #drawer > [drawer]'}.narrow-layout>#drawer>::content[select="[drawer]"]>*{border:0}.narrow-layout>#drawer:not(.core-selected){-webkit-transform:translateX(-100%);transform:translateX(-100%)}.right-drawer.narrow-layout>#drawer:not(.core-selected){left:auto;-webkit-transform:translateX(100%);transform:translateX(100%)}.narrow-layout>#main{left:0!important;padding:0}.right-drawer.narrow-layout>#main{left:0;right:0;padding:0}.narrow-layout>#main:not(.core-selected)>#scrim,.dragging #scrim{visibility:visible;opacity:1}polyfill-next-selector{content:':host .narrow-layout > #main > [main]'}.narrow-layout>#main>::content[select="[main]"]>*{margin:0;min-height:100%;left:0;right:0;box-sizing:border-box;-moz-box-sizing:border-box}polyfill-next-selector{content:'core-selector:not(.narrow-layout) [core-drawer-toggle]'}core-selector:not(.narrow-layout) ::content [core-drawer-toggle]{display:none}</style><core-media-query query="max-width: {{forceNarrow ? '' : responsiveWidth}}" querymatches="{{queryMatches}}"></core-media-query><core-selector class="{{ {'narrow-layout' : narrow, transition : transition, dragging : dragging, 'right-drawer': rightDrawer} | tokenList }}" valueattr="id" selected="{{selected}}"><div id="main" _style="left: {{ narrow || rightDrawer ? '0' : drawerWidth }}; right: {{ rightDrawer ? (narrow ? '' : drawerWidth) : '' }};"><content select="[main]"></content><div id="scrim" on-tap="{{togglePanel}}"></div><div id="edgeSwipeOverlay" hidden?="{{!narrow || disableEdgeSwipe}}"></div></div><div id="drawer" _style="width: {{ drawerWidth }}"><content select="[drawer]"></content></div></core-selector></template><script>Polymer("core-drawer-panel",{publish:{drawerWidth:"256px",responsiveWidth:"640px",selected:{value:null,reflect:true},defaultSelected:"main",narrow:{value:false,reflect:true},rightDrawer:false,disableSwipe:false,forceNarrow:false,disableEdgeSwipe:false},eventDelegates:{trackstart:"trackStart",trackx:"trackx",trackend:"trackEnd",down:"downHandler",up:"upHandler",tap:"tapHandler"},transition:false,edgeSwipeSensitivity:15,peeking:false,dragging:false,hasTransform:true,hasWillChange:true,toggleAttribute:"core-drawer-toggle",created:function(){this.hasTransform="transform"in this.style;this.hasWillChange="willChange"in this.style},domReady:function(){this.async(function(){this.transition=true})},togglePanel:function(){this.selected=this.isMainSelected()?"drawer":"main"},openDrawer:function(){this.selected="drawer"},closeDrawer:function(){this.selected="main"},queryMatchesChanged:function(){this.narrow=this.queryMatches||this.forceNarrow;if(this.narrow){this.selected=this.defaultSelected}this.setAttribute("touch-action",this.swipeAllowed()?"pan-y":"");this.fire("core-responsive-change",{narrow:this.narrow})},forceNarrowChanged:function(){this.queryMatchesChanged()},swipeAllowed:function(){return this.narrow&&!this.disableSwipe},isMainSelected:function(){return this.selected==="main"},startEdgePeek:function(){this.width=this.$.drawer.offsetWidth;this.moveDrawer(this.translateXForDeltaX(this.rightDrawer?-this.edgeSwipeSensitivity:this.edgeSwipeSensitivity));this.peeking=true},stopEdgePeak:function(){if(this.peeking){this.peeking=false;this.moveDrawer(null)}},downHandler:function(e){if(!this.dragging&&this.isMainSelected()&&this.isEdgeTouch(e)){this.startEdgePeek()}},upHandler:function(e){this.stopEdgePeak()},tapHandler:function(e){if(e.target&&this.toggleAttribute&&e.target.hasAttribute(this.toggleAttribute)){this.togglePanel()}},isEdgeTouch:function(e){return!this.disableEdgeSwipe&&this.swipeAllowed()&&(this.rightDrawer?e.pageX>=this.offsetWidth-this.edgeSwipeSensitivity:e.pageX<=this.edgeSwipeSensitivity)},trackStart:function(e){if(this.swipeAllowed()){this.dragging=true;if(this.isMainSelected()){this.dragging=this.peeking||this.isEdgeTouch(e)}if(this.dragging){this.width=this.$.drawer.offsetWidth;this.transition=false;e.preventTap()}}},translateXForDeltaX:function(deltaX){var isMain=this.isMainSelected();if(this.rightDrawer){return Math.max(0,isMain?this.width+deltaX:deltaX)}else{return Math.min(0,isMain?deltaX-this.width:deltaX)}},trackx:function(e){if(this.dragging){if(this.peeking){if(Math.abs(e.dx)<=this.edgeSwipeSensitivity){return}this.peeking=false}this.moveDrawer(this.translateXForDeltaX(e.dx))}},trackEnd:function(e){if(this.dragging){this.dragging=false;this.transition=true;this.moveDrawer(null);if(this.rightDrawer){this.selected=e.xDirection>0?"main":"drawer"}else{this.selected=e.xDirection>0?"drawer":"main"}}},transformForTranslateX:function(translateX){if(translateX===null){return""}return this.hasWillChange?"translateX("+translateX+"px)":"translate3d("+translateX+"px, 0, 0)"},moveDrawer:function(translateX){var s=this.$.drawer.style;if(this.hasTransform){s.transform=this.transformForTranslateX(translateX)}else{s.webkitTransform=this.transformForTranslateX(translateX)}}});</script></polymer-element><polymer-element name="core-header-panel" assetpath="polymer/bower_components/core-header-panel/"><template><style>:host{display:block;position:relative}#outerContainer{position:absolute;top:0;right:0;bottom:0;left:0}#mainPanel{position:relative}#mainContainer{position:relative;overflow-y:auto;overflow-x:hidden;-webkit-overflow-scrolling:touch}#dropShadow{position:absolute;top:0;left:0;right:0;height:6px;box-shadow:inset 0 5px 6px -3px rgba(0,0,0,.4)}#dropShadow.hidden{display:none}:host([mode=scroll]) #mainContainer{overflow:visible}:host([mode=scroll]) #outerContainer{overflow-y:auto;overflow-x:hidden;-webkit-overflow-scrolling:touch}:host([mode=cover]) #mainPanel{position:static}:host([mode=cover]) #mainContainer{position:absolute;top:0;right:0;bottom:0;left:0}:host([mode=cover]) #dropShadow{position:static;width:100%}</style><div id="outerContainer" vertical="" layout=""><content id="headerContent" select="core-toolbar, .core-header"></content><div id="mainPanel" flex="" vertical="" layout=""><div id="mainContainer" flex?="{{mode !== 'cover'}}"><content id="mainContent" select="*"></content></div><div id="dropShadow"></div></div></div></template><script>Polymer("core-header-panel",{publish:{mode:{value:"",reflect:true},tallClass:"tall",shadow:false},animateDuration:200,modeConfigs:{shadowMode:{waterfall:1,"waterfall-tall":1},noShadow:{seamed:1,cover:1,scroll:1},tallMode:{"waterfall-tall":1},outerScroll:{scroll:1}},ready:function(){this.scrollHandler=this.scroll.bind(this);this.addListener()},detached:function(){this.removeListener(this.mode)},addListener:function(){this.scroller.addEventListener("scroll",this.scrollHandler)},removeListener:function(mode){var s=this.getScrollerForMode(mode);s.removeEventListener("scroll",this.scrollHandler)},domReady:function(){this.async("scroll")},modeChanged:function(old){var configs=this.modeConfigs;var header=this.header;if(header){if(configs.tallMode[old]&&!configs.tallMode[this.mode]){header.classList.remove(this.tallClass);this.async(function(){header.classList.remove("animate")},null,this.animateDuration)}else{header.classList.toggle("animate",configs.tallMode[this.mode])}}if(configs&&(configs.outerScroll[this.mode]||configs.outerScroll[old])){this.removeListener(old);this.addListener()}this.scroll()},get header(){return this.$.headerContent.getDistributedNodes()[0]},getScrollerForMode:function(mode){return this.modeConfigs.outerScroll[mode]?this.$.outerContainer:this.$.mainContainer},get scroller(){return this.getScrollerForMode(this.mode)},scroll:function(){var configs=this.modeConfigs;var main=this.$.mainContainer;var header=this.header;var sTop=main.scrollTop;var atTop=sTop===0;this.$.dropShadow.classList.toggle("hidden",!this.shadow&&(atTop&&configs.shadowMode[this.mode]||configs.noShadow[this.mode]));if(header&&configs.tallMode[this.mode]){header.classList.toggle(this.tallClass,atTop||header.classList.contains(this.tallClass)&&main.scrollHeight<this.$.outerContainer.offsetHeight)}this.fire("scroll",{target:this.scroller},this,false)}});</script></polymer-element><polymer-element name="core-toolbar" attributes="justify middleJustify bottomJustify" assetpath="polymer/bower_components/core-toolbar/"><template><style>:host{display:block;position:relative;box-sizing:border-box;-moz-box-sizing:border-box;height:64px;font-size:1.3em;background-color:#CFD8DC}:host(.animate){transition:height .18s ease-in}:host(.medium-tall){height:128px}:host(.tall){height:192px}.toolbar-tools{position:relative;height:64px;padding:0 8px;pointer-events:none}:host(.core-narrow),:host-context(.core-narrow){height:56px}polyfill-next-selector{content:':host.core-narrow.medium-tall, .core-narrow :host.medium-tall'}:host(.core-narrow.medium-tall),:host-context(.core-narrow):host(.medium-tall){height:112px}polyfill-next-selector{content:':host.core-narrow.tall, .core-narrow :host.tall'}:host(.core-narrow.tall),:host-context(.core-narrow):host(.tall){height:168px}polyfill-next-selector{content:':host.core-narrow .toolbar-tools, .core-narrow :host .toolbar-tools'}:host(.core-narrow) .toolbar-tools,:host-context(.core-narrow) .toolbar-tools{height:56px;padding:0}#middleBar{position:absolute;top:0;right:0;left:0}:host(.tall,.medium-tall) #middleBar{-webkit-transform:translateY(100%);transform:translateY(100%)}#bottomBar{position:absolute;right:0;bottom:0;left:0}polyfill-next-selector{content:'.toolbar-tools > *:not([disabled])'}::content>:not([disabled]){pointer-events:auto}polyfill-next-selector{content:'.toolbar-tools > *'}::content>*{margin:0 8px}polyfill-next-selector{content:'.toolbar-tools > .fit'}::content>.fit{position:absolute;top:auto;right:0;bottom:0;left:0;width:auto;margin:0}polyfill-next-selector{content:':host .indent'}::content>.indent{margin-left:60px}</style><div id="bottomBar" class="toolbar-tools" center="" horizontal="" layout=""><content select=".bottom"></content></div><div id="middleBar" class="toolbar-tools" center="" horizontal="" layout=""><content select=".middle"></content></div><div id="topBar" class="toolbar-tools" center="" horizontal="" layout=""><content></content></div></template><script>(function(){Polymer("core-toolbar",{justify:"",middleJustify:"",bottomJustify:"",justifyChanged:function(old){this.updateBarJustify(this.$.topBar,this.justify,old)},middleJustifyChanged:function(old){this.updateBarJustify(this.$.middleBar,this.middleJustify,old)},bottomJustifyChanged:function(old){this.updateBarJustify(this.$.bottomBar,this.bottomJustify,old)},updateBarJustify:function(bar,justify,old){if(old){bar.removeAttribute(this.toLayoutAttrName(old))}if(justify){bar.setAttribute(this.toLayoutAttrName(justify),"")}},toLayoutAttrName:function(value){return value==="between"?"justified":value+"-justified"}})})();</script></polymer-element><polymer-element name="core-menu" extends="core-selector" assetpath="polymer/bower_components/core-menu/"><template><style>:host{display:block;margin:12px}polyfill-next-selector{content:':host > core-item'}::content>core-item{cursor:default}</style><core-a11y-keys target="{{}}" keys="up" on-keys-pressed="{{ selectPrevious }}"></core-a11y-keys><core-a11y-keys target="{{}}" keys="down" on-keys-pressed="{{ selectNext }}"></core-a11y-keys><core-a11y-keys target="{{}}" keys="enter" on-keys-pressed="{{ validateSelected }}"></core-a11y-keys><shadow></shadow></template><script>Polymer("core-menu");</script></polymer-element><polymer-element name="paper-item" extends="paper-button-base" assetpath="polymer/bower_components/paper-item/"><template><style>:host{display:block;position:relative;font-size:16px;box-sizing:border-box;min-width:7em;outline:0;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;user-select:none;cursor:pointer;z-index:0}:host([disabled]){color:#a8a8a8;cursor:auto;pointer-events:none}:host(.core-selected){background-color:#eaeaea}#ripple{pointer-events:none;z-index:-1}.button-content{padding:.9em 1em}polyfill-next-selector{content:'.button-content > a'}::content>a{height:100%;-ms-flex:1 1 0;-webkit-flex:1;flex:1;-webkit-flex-basis:0;flex-basis:0}</style><div class="button-content" relative="" layout="" horizontal="" center=""><content></content></div></template><script>Polymer("paper-item",{publish:{raised:false,recenteringTouch:false,fill:true}});</script></polymer-element><polymer-element name="paper-icon-button" extends="paper-button-base" attributes="src icon" role="button" assetpath="polymer/bower_components/paper-icon-button/"><template><style>:host{display:inline-block;position:relative;padding:8px;outline:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer;z-index:0}:host([disabled]){color:#c9c9c9;pointer-events:none;cursor:auto}#ripple{pointer-events:none;z-index:-1}#icon{display:block;pointer-events:none}</style><core-icon relative="" id="icon" src="{{src}}" icon="{{icon}}"></core-icon></template><script>Polymer("paper-icon-button",{publish:{src:"",icon:"",recenteringTouch:true,fill:false},iconChanged:function(oldIcon){var label=this.getAttribute("aria-label");if(!label||label===oldIcon){this.setAttribute("aria-label",this.icon)}}});</script></polymer-element><polymer-element name="core-scroll-header-panel" assetpath="polymer/bower_components/core-scroll-header-panel/"><template><style>:host{display:block;position:relative;overflow:hidden}#mainContainer{position:absolute;top:0;right:0;bottom:0;left:0;box-sizing:border-box;-moz-box-sizing:border-box;-webkit-overflow-scrolling:touch;overflow-x:hidden;overflow-y:auto}#headerContainer{position:absolute;top:0;right:0;left:0}.bg-container{position:absolute;top:0;left:0;width:100%;height:100%;overflow:hidden}#headerBg,#condensedHeaderBg{position:absolute;top:0;left:0;width:100%;height:100%;background-repeat:no-repeat;background-size:cover;background-position:center center}#condensedHeaderBg{opacity:0}</style><div id="mainContainer"><content id="mainContent" select=":not(core-toolbar):not(.core-header)"></content></div><div id="headerContainer"><div class="bg-container"><div id="condensedHeaderBg"></div><div id="headerBg"></div></div><content id="headerContent" select="core-toolbar, .core-header"></content></div></template><script>(function(){Polymer(Polymer.mixin({publish:{condenses:false,noDissolve:false,noReveal:false,fixed:false,keepCondensedHeader:false,headerHeight:0,condensedHeaderHeight:0,scrollAwayTopbar:false},prevScrollTop:0,headerMargin:0,y:0,observe:{"headerMargin fixed":"setup"},eventDelegates:{"core-resize":"measureHeaderHeight"},attached:function(){this.resizableAttachedHandler()},ready:function(){this._scrollHandler=this.scroll.bind(this);this.scroller.addEventListener("scroll",this._scrollHandler)},detached:function(){this.scroller.removeEventListener("scroll",this._scrollHandler);this.resizableDetachedHandler()},domReady:function(){this.async("measureHeaderHeight")},get header(){return this.$.headerContent.getDistributedNodes()[0]},get scroller(){return this.$.mainContainer},measureHeaderHeight:function(){var header=this.header;if(header&&header.offsetHeight){this.headerHeight=header.offsetHeight}},headerHeightChanged:function(){if(!this.condensedHeaderHeight){this._condensedHeaderHeight=this.headerHeight*1/3}this.condensedHeaderHeightChanged()},condensedHeaderHeightChanged:function(){if(this.condensedHeaderHeight){this._condensedHeaderHeight=this.condensedHeaderHeight}if(this.headerHeight){this.headerMargin=this.headerHeight-this._condensedHeaderHeight}},condensesChanged:function(){if(this.condenses){this.scroll()}else{this.condenseHeader(null)}},setup:function(){var s=this.scroller.style;s.paddingTop=this.fixed?"":this.headerHeight+"px";s.top=this.fixed?this.headerHeight+"px":"";if(this.fixed){this.transformHeader(null)}else{this.scroll()}},transformHeader:function(y){var s=this.$.headerContainer.style;this.translateY(s,-y);if(this.condenses){this.condenseHeader(y)}this.fire("core-header-transform",{y:y,height:this.headerHeight,condensedHeight:this._condensedHeaderHeight})},condenseHeader:function(y){var reset=y==null;if(!this.scrollAwayTopbar&&this.header.$&&this.header.$.topBar){this.translateY(this.header.$.topBar.style,reset?null:Math.min(y,this.headerMargin))}var hbg=this.$.headerBg.style;if(!this.noDissolve){hbg.opacity=reset?"":(this.headerMargin-y)/this.headerMargin}this.translateY(hbg,reset?null:y/2);var chbg=this.$.condensedHeaderBg.style;if(!this.noDissolve){chbg=this.$.condensedHeaderBg.style;chbg.opacity=reset?"":y/this.headerMargin;this.translateY(chbg,reset?null:y/2)}},translateY:function(s,y){var t=y==null?"":"translate3d(0, "+y+"px, 0)";setTransform(s,t)},scroll:function(event){if(!this.header){return}var sTop=this.scroller.scrollTop;var y=Math.min(this.keepCondensedHeader?this.headerMargin:this.headerHeight,Math.max(0,this.noReveal?sTop:this.y+sTop-this.prevScrollTop));if(this.condenses&&this.prevScrollTop>=sTop&&sTop>this.headerMargin){y=Math.max(y,this.headerMargin)}if(!event||!this.fixed&&y!==this.y){this.transformHeader(y)}this.prevScrollTop=Math.max(sTop,0);this.y=y;if(event){this.fire("scroll",{target:this.scroller},this,false)}}},Polymer.CoreResizable));if(document.documentElement.style.transform!==undefined){var setTransform=function(style,string){style.transform=string}}else{var setTransform=function(style,string){style.webkitTransform=string}}})();</script></polymer-element><polymer-element name="partial-base" attributes="narrow togglePanel" assetpath="polymer/layouts/"><template><core-style ref="ha-headers"></core-style><core-scroll-header-panel fit="" fixed="{{!narrow}}"><core-toolbar><paper-icon-button id="navicon" icon="menu" hidden?="{{!narrow}}" on-click="{{togglePanel}}"></paper-icon-button><div flex=""><content select="[header-title]"></content></div><content select="[header-buttons]"></content></core-toolbar><content></content></core-scroll-header-panel></template><script>Polymer("partial-base");</script></polymer-element><polymer-element name="state-card" attributes="stateObj" on-click="cardClicked" assetpath="polymer/cards/"><template><style>:host{border-radius:2px;box-shadow:rgba(0,0,0,.098) 0 2px 4px,rgba(0,0,0,.098) 0 0 3px;transition:all .3s ease-out;position:relative;background-color:#fff;padding:16px;width:100%;cursor:pointer}</style><state-card-content stateobj="{{stateObj}}"></state-card-content></template><script>Polymer("state-card",{cardClicked:function(){window.hass.uiActions.showMoreInfoDialog(this.stateObj.entityId)}});</script></polymer-element><polymer-element name="state-cards" attributes="states" assetpath="polymer/components/"><template><style>:host{display:block;width:100%}@media all and (min-width:1020px){.state-card{width:calc(50% - 44px);margin:8px 0 0 8px}}@media all and (min-width:1356px){.state-card{width:calc(33% - 38px)}}@media all and (min-width:1706px){.state-card{width:calc(25% - 42px)}}.no-states-content{max-width:500px;background-color:#fff;border-radius:2px;box-shadow:rgba(0,0,0,.098) 0 2px 4px,rgba(0,0,0,.098) 0 0 3px;padding:16px;margin:16px auto}</style><div horizontal="" layout="" wrap=""><template repeat="{{states as state}}"><state-card class="state-card" stateobj="{{state}}"></state-card></template><template if="{{states.length == 0}}"><div class="no-states-content"><content></content></div></template></div></template><script>Polymer("state-cards",{});</script></polymer-element><polymer-element name="partial-states" attributes="narrow togglePanel filter" assetpath="polymer/layouts/"><template><core-style ref="ha-animations"></core-style><partial-base narrow="{{narrow}}" togglepanel="{{togglePanel}}"><span header-title="">{{headerTitle}}</span><span header-buttons=""><paper-icon-button icon="refresh" class="{{isFetching && 'ha-spin'}}" on-click="{{handleRefreshClick}}" hidden?="{{isStreaming}}"></paper-icon-button></span><state-cards states="{{states}}"><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.
diff --git a/homeassistant/components/frontend/www_static/polymer/dialogs/more-info-dialog.html b/homeassistant/components/frontend/www_static/polymer/dialogs/more-info-dialog.html
index 085a83c7a9b..4e8b2de4700 100644
--- a/homeassistant/components/frontend/www_static/polymer/dialogs/more-info-dialog.html
+++ b/homeassistant/components/frontend/www_static/polymer/dialogs/more-info-dialog.html
@@ -40,7 +40,7 @@ Polymer(Polymer.mixin({
   },
 
   ready: function() {
-    this.listenToStores();
+    this.listenToStores(true);
   },
 
   detached: function() {
@@ -52,18 +52,9 @@ Polymer(Polymer.mixin({
   },
 
   stateStoreChanged: function() {
-    var newState;
-
-    if (!this.entityId) {
-      newState = null;
-    } else {
-      newState = stateStore.get(this.entityId);
-    }
-
-    console.log('state store changed');
+    var newState = this.entityId ? stateStore.get(this.entityId) : null;
 
     if (newState !== this.stateObj) {
-      console.log("Setting new stateobj");
       this.stateObj = newState;
     }
   },
@@ -85,12 +76,6 @@ Polymer(Polymer.mixin({
   changeEntityId: function(entityId) {
     this.entityId = entityId;
 
-    if (!entityId) {
-      this.stateObj = null;
-      this.stateHistory = null;
-      return;
-    }
-
     this.stateStoreChanged();
     this.stateHistoryStoreChanged();