diff --git a/hassio/src/dashboard/hassio-addons.ts b/hassio/src/dashboard/hassio-addons.ts
index 064ba94e39..6f1cf460a8 100644
--- a/hassio/src/dashboard/hassio-addons.ts
+++ b/hassio/src/dashboard/hassio-addons.ts
@@ -25,7 +25,11 @@ class HassioAddons extends LitElement {
     >
       <div class="addons" ?narrow=${this.narrow}>
         ${this.supervisor.supervisor.addons.map(
-          (addon) => html`<div class="addon">
+          (addon) => html`<div
+            class="addon"
+            @click=${this._addonTapped}
+            .addon=${addon}
+          >
             <div class="icon">
               <div class="overlay">
                 <ha-svg-icon
@@ -124,7 +128,7 @@ class HassioAddons extends LitElement {
         .addon {
           text-align: center;
           max-width: 100px;
-          padding: 8px;
+          padding: 0 8px;
           cursor: pointer;
         }
         .icon > *:not(.overlay) {
diff --git a/hassio/src/dashboard/hassio-dashboard.ts b/hassio/src/dashboard/hassio-dashboard.ts
index 9e6165d949..b1434d50f5 100644
--- a/hassio/src/dashboard/hassio-dashboard.ts
+++ b/hassio/src/dashboard/hassio-dashboard.ts
@@ -56,15 +56,13 @@ class HassioDashboard extends LitElement {
       hassioStyle,
       css`
         .content {
-          margin: 4px;
-          display: flex;
-          max-width: 1500px;
+          display: grid;
+          max-width: 1400px;
           justify-content: center;
         }
         .content > * {
           display: block;
-          min-width: 500px;
-          margin: 4px;
+          min-width: 400px;
         }
       `,
     ];
diff --git a/hassio/src/dashboard/hassio-update.ts b/hassio/src/dashboard/hassio-update.ts
index 734379553f..80286158b6 100644
--- a/hassio/src/dashboard/hassio-update.ts
+++ b/hassio/src/dashboard/hassio-update.ts
@@ -68,10 +68,17 @@ export class HassioUpdate extends LitElement {
         .header="${this.supervisor.localize(
           "common.update_available",
           "count",
-          updatesAvailable
+          updatesAvailable + 1
         )}
           🎉"
       >
+        ${this._renderUpdateRow({
+          type: "os",
+          heading: "Home Assistant Operating system",
+          icon: mdiHomeAssistant,
+          version: "5",
+          version_latest: "6",
+        })}
         ${this.supervisor.addon.addons
           .filter((addon) => addon.update_available)
           .map((addon) =>
@@ -79,6 +86,7 @@ export class HassioUpdate extends LitElement {
               type: "addon",
               heading: addon.name,
               version: addon.version_latest,
+              version_latest: addon.version,
               image: addon.icon
                 ? `/api/hassio/addons/${addon.slug}/icon`
                 : undefined,
@@ -123,6 +131,7 @@ export class HassioUpdate extends LitElement {
     type: "supervisor" | "os" | "core" | "addon";
     heading: string;
     version: string;
+    version_latest: string;
     icon?: string;
     image?: string;
     release_notes?: string;
@@ -139,7 +148,7 @@ export class HassioUpdate extends LitElement {
         </div>
         <paper-item-body two-line>
           ${options.heading}
-          <div secondary>Version ${options.version} is available</div>
+          <div secondary>Version ${options.version_latest} is available</div>
         </paper-item-body>
       </paper-icon-item>
       <div class="update-row-actions" ?narrow=${false}>