diff --git a/src/cards/state-card-content.html b/src/cards/state-card-content.html
index ca51ca0d94..e489684e83 100644
--- a/src/cards/state-card-content.html
+++ b/src/cards/state-card-content.html
@@ -6,4 +6,3 @@
 <link rel="import" href="state-card-configurator.html">
 <link rel="import" href="state-card-scene.html">
 <link rel="import" href="state-card-media_player.html">
-<link rel="import" href="state-card-updater.html">
diff --git a/src/cards/state-card-content.js b/src/cards/state-card-content.js
index 788bf5b718..a331c47e03 100644
--- a/src/cards/state-card-content.js
+++ b/src/cards/state-card-content.js
@@ -8,7 +8,6 @@ require('./state-card-thermostat');
 require('./state-card-configurator');
 require('./state-card-scene');
 require('./state-card-media_player');
-require('./state-card-updater');
 
 export default Polymer({
   is: 'state-card-content',
diff --git a/src/cards/state-card-updater.html b/src/cards/state-card-updater.html
deleted file mode 100644
index 7ad8ef6105..0000000000
--- a/src/cards/state-card-updater.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<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">
-
-<dom-module id="state-card-updater">
-  <style>
-  .state {
-    margin-left: 16px;
-    text-transform: capitalize;
-    font-weight: 300;
-    font-size: 1.3rem;
-    text-align: right;
-  }
-  </style>
-
-  <template>
-    <div class='horizontal justified layout'>
-      <state-info state-obj="[[stateObj]]"></state-info>
-      <paper-button raised on-tap="buttonTapped">
-        Update
-      </paper-button>
-    </div>
-  </template>
-</dom-module>
diff --git a/src/cards/state-card-updater.js b/src/cards/state-card-updater.js
deleted file mode 100644
index 341a7fd561..0000000000
--- a/src/cards/state-card-updater.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { serviceActions } from 'home-assistant-js';
-
-import Polymer from '../polymer';
-
-require('../components/state-info');
-
-export default Polymer({
-  is: 'state-card-updater',
-
-  properties: {
-    stateObj: {
-      type: Object,
-    },
-  },
-
-  buttonTapped: function(ev) {
-    ev.stopPropagation();
-    serviceActions.callService('updater', 'update', {})
-  },
-});
diff --git a/src/more-infos/more-info-updater.html b/src/more-infos/more-info-updater.html
index 2708061ec0..f22109953c 100644
--- a/src/more-infos/more-info-updater.html
+++ b/src/more-infos/more-info-updater.html
@@ -22,24 +22,29 @@
   <template>
     <div class='layout vertical'>
 
-      <!-- GitHub Link -->
-      <div class='data-entry layout justified horizontal center' style="width:100%" id='setting'>
-        <paper-button class='centered link' on-tap="linkTapped">
+      <div class='horizontal layout center'>
+        <paper-button raised class='centered link' raised on-tap="updateTapped">
+          Update
+        </paper-button>
+
+        <paper-button raised class='centered link' on-tap="linkTapped">
           View on GitHub
         </paper-button>
       </div>
 
+      <div class='divider'></div>
+
       <div class='data-entry layout justified horizontal'>
         <div class='key'>Updated On:</div>
         <div class='value'>[[stateObj.attributes.date]]</div>
       </div>
 
-      <div class='data-entry layout justified vertical'>
+      <div class='data-entry layout justified vertical' hidden='[[!stateObj.attributes.message]]'>
         <div class='key'>Release Notes:</div>
         <div class='centered'>[[stateObj.attributes.message]]<br /></div>
       </div>
 
-    <div class='divider'></div>
+      <div class='divider'></div>
 
       <div class='data-entry layout justified vertical'>
         <div class='key'>Remote SHA:</div>
diff --git a/src/more-infos/more-info-updater.js b/src/more-infos/more-info-updater.js
index 06e036abe7..7c40f78c9a 100644
--- a/src/more-infos/more-info-updater.js
+++ b/src/more-infos/more-info-updater.js
@@ -1,4 +1,5 @@
 import { util } from 'home-assistant-js';
+import { serviceActions } from 'home-assistant-js';
 
 export default Polymer({
   is: 'more-info-updater',
@@ -9,6 +10,10 @@ export default Polymer({
     },
   },
 
+  updateTapped: function(stateObj) {
+    serviceActions.callService('updater', 'update', {})
+  },
+
   linkTapped: function(stateObj) {
     window.open(this.stateObj.attributes.link, '_blank');
   },
diff --git a/src/util/state-card-type.js b/src/util/state-card-type.js
index bab23f7b06..e6c3f268cb 100644
--- a/src/util/state-card-type.js
+++ b/src/util/state-card-type.js
@@ -1,7 +1,7 @@
 import { reactor, serviceGetters } from 'home-assistant-js';
 
 const DOMAINS_WITH_CARD = [
-  'thermostat', 'configurator', 'scene', 'media_player', 'updater'];
+  'thermostat', 'configurator', 'scene', 'media_player'];
 
 export default function stateCardType(state) {
   if(DOMAINS_WITH_CARD.indexOf(state.domain) !== -1) {