diff --git a/panels/hassio/hassio-addon-view.html b/panels/hassio/addon-view/hassio-addon-view.html
similarity index 86%
rename from panels/hassio/hassio-addon-view.html
rename to panels/hassio/addon-view/hassio-addon-view.html
index c367b22197..0e3f710295 100644
--- a/panels/hassio/hassio-addon-view.html
+++ b/panels/hassio/addon-view/hassio-addon-view.html
@@ -1,21 +1,16 @@
-<link rel="import" href="../../bower_components/polymer/polymer.html">
-<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-<link rel="import" href="../../bower_components/iron-autogrow-textarea/iron-autogrow-textarea.html">
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../../bower_components/app-layout/app-header-layout/app-header-layout.html">
+<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
+<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
+<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
+<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
+<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
+<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
+<link rel="import" href="../../../bower_components/paper-item/paper-item-body.html">
+<link rel="import" href="../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+<link rel="import" href="../../../bower_components/iron-autogrow-textarea/iron-autogrow-textarea.html">
 
-<link rel="import" href="../../src/components/ha-menu-button.html">
-
-<link rel="import" href="./hassio-data.html">
-<link rel="import" href="./hassio-host-info.html">
-<link rel="import" href="./hassio-supervisor-info.html">
-<link rel="import" href="./hassio-addons.html">
+<link rel="import" href="../../../src/components/ha-menu-button.html">
 
 <dom-module id="hassio-addon-view">
   <template>
diff --git a/panels/hassio/hassio-addons.html b/panels/hassio/dashboard/hassio-addons.html
similarity index 69%
rename from panels/hassio/hassio-addons.html
rename to panels/hassio/dashboard/hassio-addons.html
index 6a2c6f109b..04c78f8adc 100644
--- a/panels/hassio/hassio-addons.html
+++ b/panels/hassio/dashboard/hassio-addons.html
@@ -1,13 +1,11 @@
-<link rel="import" href="../../bower_components/polymer/polymer.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
+<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
+<link rel="import" href="../../../bower_components/paper-item/paper-item-body.html">
 
 <dom-module id="hassio-addons">
   <template>
-    <style include="iron-flex ha-style">
+    <style include="ha-style">
       paper-card {
         display: block;
         padding-top: 16px;
diff --git a/panels/hassio/hassio-dashboard.html b/panels/hassio/dashboard/hassio-dashboard.html
similarity index 69%
rename from panels/hassio/hassio-dashboard.html
rename to panels/hassio/dashboard/hassio-dashboard.html
index 7fa3c76a92..e0959dac00 100644
--- a/panels/hassio/hassio-dashboard.html
+++ b/panels/hassio/dashboard/hassio-dashboard.html
@@ -1,16 +1,11 @@
-<link rel="import" href="../../bower_components/polymer/polymer.html">
-<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../../bower_components/app-layout/app-header-layout/app-header-layout.html">
+<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
+<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
+<link rel="import" href="../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
 
-<link rel="import" href="../../src/components/ha-menu-button.html">
+<link rel="import" href="../../../src/components/ha-menu-button.html">
 
-<link rel="import" href="./hassio-data.html">
 <link rel="import" href="./hassio-host-info.html">
 <link rel="import" href="./hassio-hass-info.html">
 <link rel="import" href="./hassio-supervisor-info.html">
diff --git a/panels/hassio/hassio-hass-info.html b/panels/hassio/dashboard/hassio-hass-info.html
similarity index 62%
rename from panels/hassio/hassio-hass-info.html
rename to panels/hassio/dashboard/hassio-hass-info.html
index 6c85d876ae..c0ca1bfde0 100644
--- a/panels/hassio/hassio-hass-info.html
+++ b/panels/hassio/dashboard/hassio-hass-info.html
@@ -1,8 +1,8 @@
-<link rel="import" href="../../bower_components/polymer/polymer.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
 
-<link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/components/buttons/ha-call-api-button.html">
+<link rel="import" href="../../../src/components/buttons/ha-call-api-button.html">
+<link rel="import" href="../../../src/components/buttons/ha-call-service-button.html">
 
 <dom-module id="hassio-hass-info">
   <style include="iron-flex ha-style">
@@ -31,14 +31,20 @@
           </tr>
         </table>
       </div>
-      <template is='dom-if' if='[[computeUpdateAvailable(data)]]'>
-        <div class="card-actions">
+      <div class="card-actions">
+        <template is='dom-if' if='[[computeUpdateAvailable(data)]]'>
           <ha-call-api-button
             hass='[[hass]]'
             path="hassio/homeassistant/update"
           >Update</ha-call-api-button>
-        </div>
-      </template>
+        </template>
+        <ha-call-service-button
+          class="warning"
+          hass="[[hass]]"
+          domain="homeassistant"
+          service="restart"
+        >Restart</ha-call-service-button>
+      </div>
     </paper-card>
   </template>
 </dom-module>
diff --git a/panels/hassio/hassio-host-info.html b/panels/hassio/dashboard/hassio-host-info.html
similarity index 81%
rename from panels/hassio/hassio-host-info.html
rename to panels/hassio/dashboard/hassio-host-info.html
index 5a7a8b2c41..abdcb78009 100644
--- a/panels/hassio/hassio-host-info.html
+++ b/panels/hassio/dashboard/hassio-host-info.html
@@ -1,8 +1,7 @@
-<link rel="import" href="../../bower_components/polymer/polymer.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
 
-<link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/components/buttons/ha-call-api-button.html">
+<link rel="import" href="../../../src/components/buttons/ha-call-api-button.html">
 
 <dom-module id="hassio-host-info">
   <style include="iron-flex ha-style">
diff --git a/panels/hassio/hassio-supervisor-info.html b/panels/hassio/dashboard/hassio-supervisor-info.html
similarity index 83%
rename from panels/hassio/hassio-supervisor-info.html
rename to panels/hassio/dashboard/hassio-supervisor-info.html
index d61da4a74f..74d3a38b22 100644
--- a/panels/hassio/hassio-supervisor-info.html
+++ b/panels/hassio/dashboard/hassio-supervisor-info.html
@@ -1,8 +1,7 @@
-<link rel="import" href="../../bower_components/polymer/polymer.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
 
-<link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/components/buttons/ha-call-api-button.html">
+<link rel="import" href="../../../src/components/buttons/ha-call-api-button.html">
 
 <dom-module id="hassio-supervisor-info">
   <style include="iron-flex ha-style">
diff --git a/panels/hassio/ha-panel-hassio.html b/panels/hassio/ha-panel-hassio.html
index 9eb809ad34..ad124cec5e 100644
--- a/panels/hassio/ha-panel-hassio.html
+++ b/panels/hassio/ha-panel-hassio.html
@@ -1,8 +1,9 @@
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 
-<link rel="import" href="./hassio-dashboard.html">
-<link rel="import" href="./hassio-addon-view.html">
+<link rel="import" href="./dashboard/hassio-dashboard.html">
+<link rel="import" href="./addon-view/hassio-addon-view.html">
 <link rel="import" href="./hassio-loading.html">
+<link rel="import" href="./hassio-data.html">
 
 <dom-module id="ha-panel-hassio">
   <style>
diff --git a/panels/hassio/todo.md b/panels/hassio/todo.md
index 2f808cf221..c332590b03 100644
--- a/panels/hassio/todo.md
+++ b/panels/hassio/todo.md
@@ -1,6 +1,3 @@
-General:
- - Refresh data after API call
-
 Host:
  - Use feature detection