From 14d5a1c3cc0d1b9088e8e8431b85dc7004dad62a Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Mon, 4 Jul 2022 19:38:29 +0300
Subject: [PATCH] Split root and cluster frames in smaller pieces  (#5737)

* Make root frame child components comply with open closed principle and include it in the behavioural unit tests

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Make cluster frame child components comply with open closed principle and include it in behavioural unit tests

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Remove duplication

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Simplify test

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Make a component more determistic in unit tests

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Mock uninterested, non-deterministic third party library in unit tests

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Optimize registration of injectables in unit tests to make tests faster

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Update snapshots

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Remove import time side-effect causing memory leak

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 __mocks__/react-beautiful-dnd.tsx             |    15 +
 package.json                                  |    10 +-
 ...acters-in-page-registrations.test.tsx.snap |   411 +-
 .../navigate-to-extension-page.test.tsx.snap  |  1005 +-
 .../navigating-between-routes.test.tsx.snap   |   342 +-
 ...ation-using-application-menu.test.tsx.snap |   543 +-
 ...navigation-using-application-menu.test.tsx |     4 -
 ...g-update-using-topbar-button.test.tsx.snap |   243 +-
 .../installing-update-using-tray.test.ts.snap |  1508 ++-
 .../installing-update.test.ts.snap            |  1508 ++-
 ...eriodical-checking-of-updates.test.ts.snap |   243 +-
 ...selection-of-update-stability.test.ts.snap |   243 +-
 .../order-of-sidebar-items.test.tsx.snap      |  1736 ++-
 ...-and-tab-navigation-for-core.test.tsx.snap |  5108 +++++---
 ...ab-navigation-for-extensions.test.tsx.snap |  6151 +++++----
 .../visibility-of-sidebar-items.test.tsx.snap |  1472 ++-
 ...debar-and-tab-navigation-for-core.test.tsx |    13 +-
 ...and-tab-navigation-for-extensions.test.tsx |    18 +-
 ...gation-using-application-menu.test.ts.snap |   617 +-
 ...elm-repository-in-preferences.test.ts.snap | 10422 ++++++++--------
 ...tory-from-list-in-preferences.test.ts.snap |  9926 ++++++++-------
 ...m-repositories-in-preferences.test.ts.snap |  8386 +++++++------
 .../navigation-to-helm-charts.test.ts.snap    |   929 +-
 ...ive-repository-in-preferences.test.ts.snap |  3980 +++---
 .../closing-preferences.test.tsx.snap         |  4360 ++++---
 ...on-to-application-preferences.test.ts.snap |  1696 +--
 ...igation-to-editor-preferences.test.ts.snap |  1970 +--
 ...tension-specific-preferences.test.tsx.snap |  6614 +++++-----
 ...ion-to-kubernetes-preferences.test.ts.snap |  2002 +--
 ...vigation-to-proxy-preferences.test.ts.snap |  1696 +--
 ...ion-to-telemetry-preferences.test.tsx.snap |  3744 +++---
 ...ation-to-terminal-preferences.test.ts.snap |  2030 +--
 ...gation-using-application-menu.test.ts.snap |  1423 ++-
 .../navigation-using-tray.test.ts.snap        |  1423 ++-
 ...-originating-from-extensions.test.tsx.snap |   291 +-
 ...gation-using-application-menu.test.ts.snap |  1203 +-
 .../navigation-using-application-menu.test.ts |    34 +-
 src/main/getDiForUnitTesting.ts               |    25 +-
 ...luster-frame-child-component.injectable.ts |    24 +
 ...luster-frame-child-component.injectable.ts |    24 +
 ...luster-frame-child-component.injectable.ts |    24 +
 ...luster-frame-child-component.injectable.ts |    24 +
 ...-root-frame-child-component.injectable.tsx |    30 +
 ...luster-frame-child-component.injectable.ts |    24 +
 ...r-root-frame-child-component.injectable.ts |    24 +
 ...luster-frame-child-component.injectable.ts |    22 +
 ...g-root-frame-child-component.injectable.ts |    22 +
 .../__tests__/delete-cluster-dialog.test.tsx  |    44 -
 ...luster-frame-child-component.injectable.ts |    24 +
 src/renderer/components/dock/dock-tab.tsx     |     8 +-
 .../components/hotbar/hotbar-menu.tsx         |     4 +-
 ...luster-frame-child-component.injectable.ts |    24 +
 ...luster-frame-child-component.injectable.ts |    24 +
 ...luster-frame-child-component.injectable.ts |    22 +
 ...s-root-frame-child-component.injectable.ts |    22 +
 .../test-utils/get-application-builder.tsx    |    62 +-
 .../__snapshots__/cluster-frame.test.tsx.snap |    18 +-
 ...r-frame-child-component-injection-token.ts |    17 +
 ...rame-layout-child-component.injectable.tsx |    61 +
 .../frames/cluster-frame/cluster-frame.tsx    |    77 +-
 ...t-frame-child-component-injection-token.ts |    17 +
 src/renderer/frames/root-frame/root-frame.tsx |    28 +-
 .../root-frame/setup-system-ca.injectable.ts  |    23 +
 src/renderer/getDiForUnitTesting.tsx          |    68 +-
 ...luster-frame-child-component.injectable.ts |    24 +
 yarn.lock                                     |    54 +-
 66 files changed, 48472 insertions(+), 35711 deletions(-)
 create mode 100644 __mocks__/react-beautiful-dnd.tsx
 create mode 100644 src/renderer/components/+workloads-cronjobs/cron-job-trigger-dialog-cluster-frame-child-component.injectable.ts
 create mode 100644 src/renderer/components/+workloads-deployments/scale/deployment-scale-dialog-cluster-frame-child-component.injectable.ts
 create mode 100644 src/renderer/components/+workloads-replicasets/scale-dialog/replicaset-scale-dialog-cluster-frame-child-component.injectable.ts
 create mode 100644 src/renderer/components/+workloads-statefulsets/scale/statefulset-scale-dialog-cluster-frame-child-component.injectable.ts
 create mode 100644 src/renderer/components/cluster-manager/cluster-manager-root-frame-child-component.injectable.tsx
 create mode 100644 src/renderer/components/command-palette/command-container-cluster-frame-child-component.injectable.ts
 create mode 100644 src/renderer/components/command-palette/command-container-root-frame-child-component.injectable.ts
 create mode 100644 src/renderer/components/confirm-dialog/confirm-dialog-cluster-frame-child-component.injectable.ts
 create mode 100644 src/renderer/components/confirm-dialog/confirm-dialog-root-frame-child-component.injectable.ts
 create mode 100644 src/renderer/components/delete-cluster-dialog/delete-cluster-dialog-cluster-frame-child-component.injectable.ts
 create mode 100644 src/renderer/components/kube-object-details/kube-object-details-cluster-frame-child-component.injectable.ts
 create mode 100644 src/renderer/components/kubeconfig-dialog/kubeconfig-dialog-cluster-frame-child-component.injectable.ts
 create mode 100644 src/renderer/components/notifications/notifications-cluster-frame-child-component.injectable.ts
 create mode 100644 src/renderer/components/notifications/notifications-root-frame-child-component.injectable.ts
 create mode 100644 src/renderer/frames/cluster-frame/cluster-frame-child-component-injection-token.ts
 create mode 100644 src/renderer/frames/cluster-frame/cluster-frame-layout-child-component.injectable.tsx
 create mode 100644 src/renderer/frames/root-frame/root-frame-child-component-injection-token.ts
 create mode 100644 src/renderer/frames/root-frame/setup-system-ca.injectable.ts
 create mode 100644 src/renderer/port-forward/port-forward-dialog-cluster-frame-child-component.injectable.ts

diff --git a/__mocks__/react-beautiful-dnd.tsx b/__mocks__/react-beautiful-dnd.tsx
new file mode 100644
index 0000000000..6404bfd450
--- /dev/null
+++ b/__mocks__/react-beautiful-dnd.tsx
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+
+import type {
+  DragDropContextProps,
+  DraggableProps,
+  DroppableProps,
+} from "react-beautiful-dnd";
+
+export const DragDropContext = ({ children }: DragDropContextProps) => <>{ children }</>;
+export const Draggable = ({ children }: DraggableProps) => <>{ children }</>;
+export const Droppable = ({ children }: DroppableProps) => <>{ children }</>;
diff --git a/package.json b/package.json
index 85bdc48329..7a9f1264b6 100644
--- a/package.json
+++ b/package.json
@@ -209,11 +209,11 @@
     "@hapi/subtext": "^7.0.4",
     "@kubernetes/client-node": "^0.16.3",
     "@material-ui/styles": "^4.11.5",
-    "@ogre-tools/fp": "9.0.0",
-    "@ogre-tools/injectable": "9.0.0",
-    "@ogre-tools/injectable-extension-for-auto-registration": "9.0.0",
-    "@ogre-tools/injectable-extension-for-mobx": "9.0.0",
-    "@ogre-tools/injectable-react": "9.0.0",
+    "@ogre-tools/fp": "9.0.1",
+    "@ogre-tools/injectable": "9.0.1",
+    "@ogre-tools/injectable-extension-for-auto-registration": "9.0.1",
+    "@ogre-tools/injectable-extension-for-mobx": "9.0.1",
+    "@ogre-tools/injectable-react": "9.0.1",
     "@sentry/electron": "^3.0.7",
     "@sentry/integrations": "^6.19.3",
     "@side/jest-runtime": "^1.0.1",
diff --git a/src/behaviours/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap b/src/behaviours/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap
index 91606c6ec9..74307f3b53 100644
--- a/src/behaviours/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap
+++ b/src/behaviours/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap
@@ -3,71 +3,206 @@
 exports[`extension special characters in page registrations renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
+      >
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="flex justify-center Welcome align-center"
+        data-testid="welcome-page"
       >
         <div
-          data-testid="app-update-not-available"
+          data-testid="welcome-banner-container"
+          style="width: 320px;"
         >
-          No new updates available
+          <i
+            class="Icon logo svg focusable"
+          >
+            <span
+              class="icon"
+            />
+          </i>
+          <div
+            class="flex justify-center"
+          >
+            <div
+              data-testid="welcome-text-container"
+              style="width: 320px;"
+            >
+              <h2>
+                Welcome to OpenLens 5!
+              </h2>
+              <p>
+                To get you started we have auto-detected your clusters in your
+                 
+                kubeconfig file and added them to the catalog, your centralized
+                 
+                view for managing all your cloud-native resources.
+                <br />
+                <br />
+                If you have any questions or feedback, please join our 
+                <a
+                  class="link"
+                  href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                  rel="noreferrer"
+                  target="_blank"
+                >
+                  Lens Community slack channel
+                </a>
+                .
+              </p>
+              <ul
+                class="block"
+                data-testid="welcome-menu-container"
+                style="width: 320px;"
+              >
+                <li
+                  class="flex grid-12"
+                >
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="view_list"
+                    >
+                      view_list
+                    </span>
+                  </i>
+                  <a
+                    class="box col-10"
+                  >
+                    Browse Clusters in Catalog
+                  </a>
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="navigate_next"
+                    >
+                      navigate_next
+                    </span>
+                  </i>
+                </li>
+              </ul>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
@@ -78,74 +213,126 @@ exports[`extension special characters in page registrations renders 1`] = `
 exports[`extension special characters in page registrations when navigating to route with ID having special characters renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div>
+        Some page
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
         </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
       </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div>
-    Some page
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
diff --git a/src/behaviours/__snapshots__/navigate-to-extension-page.test.tsx.snap b/src/behaviours/__snapshots__/navigate-to-extension-page.test.tsx.snap
index 9ed5890940..07cf120903 100644
--- a/src/behaviours/__snapshots__/navigate-to-extension-page.test.tsx.snap
+++ b/src/behaviours/__snapshots__/navigate-to-extension-page.test.tsx.snap
@@ -3,71 +3,206 @@
 exports[`navigate to extension page renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
+      >
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="flex justify-center Welcome align-center"
+        data-testid="welcome-page"
       >
         <div
-          data-testid="app-update-not-available"
+          data-testid="welcome-banner-container"
+          style="width: 320px;"
         >
-          No new updates available
+          <i
+            class="Icon logo svg focusable"
+          >
+            <span
+              class="icon"
+            />
+          </i>
+          <div
+            class="flex justify-center"
+          >
+            <div
+              data-testid="welcome-text-container"
+              style="width: 320px;"
+            >
+              <h2>
+                Welcome to OpenLens 5!
+              </h2>
+              <p>
+                To get you started we have auto-detected your clusters in your
+                 
+                kubeconfig file and added them to the catalog, your centralized
+                 
+                view for managing all your cloud-native resources.
+                <br />
+                <br />
+                If you have any questions or feedback, please join our 
+                <a
+                  class="link"
+                  href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                  rel="noreferrer"
+                  target="_blank"
+                >
+                  Lens Community slack channel
+                </a>
+                .
+              </p>
+              <ul
+                class="block"
+                data-testid="welcome-menu-container"
+                style="width: 320px;"
+              >
+                <li
+                  class="flex grid-12"
+                >
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="view_list"
+                    >
+                      view_list
+                    </span>
+                  </i>
+                  <a
+                    class="box col-10"
+                  >
+                    Browse Clusters in Catalog
+                  </a>
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="navigate_next"
+                    >
+                      navigate_next
+                    </span>
+                  </i>
+                </li>
+              </ul>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
@@ -78,74 +213,126 @@ exports[`navigate to extension page renders 1`] = `
 exports[`navigate to extension page when extension navigates to child route renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div>
+        Child page
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
         </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
       </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div>
-    Child page
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
@@ -156,90 +343,142 @@ exports[`navigate to extension page when extension navigates to child route rend
 exports[`navigate to extension page when extension navigates to route with parameters renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div>
+        <ul>
+          <li>
+            some-string-value-from-navigate
+          </li>
+          <li>
+            126
+          </li>
+          <li>
+            some-array-value-from-navigate
+          </li>
+        </ul>
+        <button
+          data-testid="button-to-change-page-parameters"
+          type="button"
+        >
+          Some button
+        </button>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
         </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
       </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div>
-    <ul>
-      <li>
-        some-string-value-from-navigate
-      </li>
-      <li>
-        126
-      </li>
-      <li>
-        some-array-value-from-navigate
-      </li>
-    </ul>
-    <button
-      data-testid="button-to-change-page-parameters"
-      type="button"
+      class="StatusBar"
     >
-      Some button
-    </button>
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
@@ -250,90 +489,142 @@ exports[`navigate to extension page when extension navigates to route with param
 exports[`navigate to extension page when extension navigates to route without parameters renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div>
+        <ul>
+          <li>
+            some-string-value
+          </li>
+          <li>
+            42
+          </li>
+          <li>
+            some-array-value,some-other-array-value
+          </li>
+        </ul>
+        <button
+          data-testid="button-to-change-page-parameters"
+          type="button"
+        >
+          Some button
+        </button>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
         </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
       </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div>
-    <ul>
-      <li>
-        some-string-value
-      </li>
-      <li>
-        42
-      </li>
-      <li>
-        some-array-value,some-other-array-value
-      </li>
-    </ul>
-    <button
-      data-testid="button-to-change-page-parameters"
-      type="button"
+      class="StatusBar"
     >
-      Some button
-    </button>
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
@@ -344,90 +635,142 @@ exports[`navigate to extension page when extension navigates to route without pa
 exports[`navigate to extension page when extension navigates to route without parameters when changing page parameters renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div>
+        <ul>
+          <li>
+            some-changed-string-value
+          </li>
+          <li>
+            84
+          </li>
+          <li>
+            some-changed-array-value,some-other-changed-array-value
+          </li>
+        </ul>
+        <button
+          data-testid="button-to-change-page-parameters"
+          type="button"
+        >
+          Some button
+        </button>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
         </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
       </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div>
-    <ul>
-      <li>
-        some-changed-string-value
-      </li>
-      <li>
-        84
-      </li>
-      <li>
-        some-changed-array-value,some-other-changed-array-value
-      </li>
-    </ul>
-    <button
-      data-testid="button-to-change-page-parameters"
-      type="button"
+      class="StatusBar"
     >
-      Some button
-    </button>
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
diff --git a/src/behaviours/__snapshots__/navigating-between-routes.test.tsx.snap b/src/behaviours/__snapshots__/navigating-between-routes.test.tsx.snap
index bdc7fa31c1..de1306655c 100644
--- a/src/behaviours/__snapshots__/navigating-between-routes.test.tsx.snap
+++ b/src/behaviours/__snapshots__/navigating-between-routes.test.tsx.snap
@@ -3,78 +3,130 @@
 exports[`navigating between routes given route with optional path parameters when navigating to route with path parameters renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
-        </div>
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
       </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <pre>
-    {
+    <main>
+      <div
+        id="lens-views"
+      />
+      <pre>
+        {
   "someParameter": "some-value",
   "someOtherParameter": "some-other-value"
 }
-  </pre>
+      </pre>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
   <div
     class="Notifications flex column align-flex-end"
   />
@@ -84,74 +136,126 @@ exports[`navigating between routes given route with optional path parameters whe
 exports[`navigating between routes given route without path parameters when navigating to route renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div>
+        Some component
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
         </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
       </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div>
-    Some component
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
diff --git a/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap b/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
index 9125e4a116..cc6dddd5eb 100644
--- a/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
+++ b/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
@@ -3,71 +3,206 @@
 exports[`add-cluster - navigation using application menu renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
+      >
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="flex justify-center Welcome align-center"
+        data-testid="welcome-page"
       >
         <div
-          data-testid="app-update-not-available"
+          data-testid="welcome-banner-container"
+          style="width: 320px;"
         >
-          No new updates available
+          <i
+            class="Icon logo svg focusable"
+          >
+            <span
+              class="icon"
+            />
+          </i>
+          <div
+            class="flex justify-center"
+          >
+            <div
+              data-testid="welcome-text-container"
+              style="width: 320px;"
+            >
+              <h2>
+                Welcome to OpenLens 5!
+              </h2>
+              <p>
+                To get you started we have auto-detected your clusters in your
+                 
+                kubeconfig file and added them to the catalog, your centralized
+                 
+                view for managing all your cloud-native resources.
+                <br />
+                <br />
+                If you have any questions or feedback, please join our 
+                <a
+                  class="link"
+                  href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                  rel="noreferrer"
+                  target="_blank"
+                >
+                  Lens Community slack channel
+                </a>
+                .
+              </p>
+              <ul
+                class="block"
+                data-testid="welcome-menu-container"
+                style="width: 320px;"
+              >
+                <li
+                  class="flex grid-12"
+                >
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="view_list"
+                    >
+                      view_list
+                    </span>
+                  </i>
+                  <a
+                    class="box col-10"
+                  >
+                    Browse Clusters in Catalog
+                  </a>
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="navigate_next"
+                    >
+                      navigate_next
+                    </span>
+                  </i>
+                </li>
+              </ul>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
@@ -78,151 +213,203 @@ exports[`add-cluster - navigation using application menu renders 1`] = `
 exports[`add-cluster - navigation using application menu when navigating to add cluster using application menu renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout AddClusters"
-    data-testid="add-cluster-page"
-  >
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content flex column gaps"
-      >
-        <h2>
-          Add Clusters from Kubeconfig
-        </h2>
-        <p>
-          Clusters added here are  
-          <b>
-            not
-          </b>
-           merged into the 
-          <code>
-            ~/.kube/config
-          </code>
-           file. 
-          <a
-            href="https://docs.k8slens.dev/main/catalog/add-cluster/"
-            rel="noreferrer"
-            target="_blank"
+          <span
+            class="icon"
+            data-icon-name="home"
           >
-            Read more about adding clusters.
-          </a>
-        </p>
-        <div
-          class="flex column"
-        />
-        <div
-          class="actions-panel"
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
         >
-          <button
-            class="Button primary"
-            disabled=""
-            type="button"
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
           >
-            Add clusters
-          </button>
-        </div>
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
       </div>
       <div
-        class="toolsRegion"
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout AddClusters"
+        data-testid="add-cluster-page"
       >
         <div
-          class="fixed top-[60px]"
+          class="contentRegion"
+          id="ScrollSpyRoot"
         >
-          <div>
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
+          <div
+            class="content flex column gaps"
+          >
+            <h2>
+              Add Clusters from Kubeconfig
+            </h2>
+            <p>
+              Clusters added here are  
+              <b>
+                not
+              </b>
+               merged into the 
+              <code>
+                ~/.kube/config
+              </code>
+               file. 
+              <a
+                href="https://docs.k8slens.dev/main/catalog/add-cluster/"
+                rel="noreferrer"
+                target="_blank"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
+                Read more about adding clusters.
+              </a>
+            </p>
             <div
-              aria-hidden="true"
-              class="esc"
+              class="flex column"
+            />
+            <div
+              class="actions-panel"
             >
-              ESC
+              <button
+                class="Button primary"
+                disabled=""
+                type="button"
+              >
+                Add clusters
+              </button>
+            </div>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div>
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
diff --git a/src/behaviours/add-cluster/navigation-using-application-menu.test.tsx b/src/behaviours/add-cluster/navigation-using-application-menu.test.tsx
index bb68918c1a..334dd193a6 100644
--- a/src/behaviours/add-cluster/navigation-using-application-menu.test.tsx
+++ b/src/behaviours/add-cluster/navigation-using-application-menu.test.tsx
@@ -9,10 +9,6 @@ import { getApplicationBuilder } from "../../renderer/components/test-utils/get-
 import React from "react";
 
 // TODO: Make components free of side effects by making them deterministic
-jest.mock("../../renderer/components/tooltip/tooltip", () => ({
-  Tooltip: () => null,
-}));
-
 jest.mock("../../renderer/components/tooltip/withTooltip", () => ({
   withTooltip: (Target: any) => ({ tooltip, tooltipOverrideDisabled, ...props }: any) => <Target {...props} />,
 }));
diff --git a/src/behaviours/application-update/__snapshots__/installing-update-using-topbar-button.test.tsx.snap b/src/behaviours/application-update/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
index 089b031c96..8f3981f48a 100644
--- a/src/behaviours/application-update/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
+++ b/src/behaviours/application-update/__snapshots__/installing-update-using-topbar-button.test.tsx.snap
@@ -4,71 +4,206 @@ exports[`encourage user to update when sufficient time passed since update was d
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-not-available"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            No new updates available
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
diff --git a/src/behaviours/application-update/__snapshots__/installing-update-using-tray.test.ts.snap b/src/behaviours/application-update/__snapshots__/installing-update-using-tray.test.ts.snap
index eeb1cf5cd8..16c4daaaec 100644
--- a/src/behaviours/application-update/__snapshots__/installing-update-using-tray.test.ts.snap
+++ b/src/behaviours/application-update/__snapshots__/installing-update-using-tray.test.ts.snap
@@ -4,71 +4,206 @@ exports[`installing update using tray when started renders 1`] = `
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-not-available"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            No new updates available
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
@@ -81,74 +216,209 @@ exports[`installing update using tray when started when user checks for updates
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            class="Spinner singleColor"
-          />
-          <div
-            data-testid="app-update-checking"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            Checking for updates...
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              class="Spinner singleColor"
+            />
+            <div
+              data-testid="app-update-checking"
+            >
+              Checking for updates...
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
@@ -161,74 +431,209 @@ exports[`installing update using tray when started when user checks for updates
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-downloading"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            Downloading version some-version...
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
           <div
-            class="Spinner singleColor"
-          />
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
         </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-downloading"
+            >
+              Downloading version some-version...
+            </div>
+            <div
+              class="Spinner singleColor"
+            />
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
@@ -241,89 +646,224 @@ exports[`installing update using tray when started when user checks for updates
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
+        class="topBar"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="items"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-        <button
-          class="updateButton"
-          data-testid="update-button"
-          data-warning-level="light"
-          id="update-lens-button"
-        >
-          Update
           <i
-            class="Icon icon material focusable"
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
             <span
               class="icon"
-              data-icon-name="arrow_drop_down"
+              data-icon-name="home"
             >
-              arrow_drop_down
+              home
             </span>
           </i>
-        </button>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+          <button
+            class="updateButton"
+            data-testid="update-button"
+            data-warning-level="light"
+            id="update-lens-button"
+          >
+            Update
+            <i
+              class="Icon icon material focusable"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_drop_down"
+              >
+                arrow_drop_down
+              </span>
+            </i>
+          </button>
+        </div>
         <div
-          class="item"
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-download-failed"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            Download of update failed
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-download-failed"
+            >
+              Download of update failed
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
@@ -336,89 +876,224 @@ exports[`installing update using tray when started when user checks for updates
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
+        class="topBar"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="items"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-        <button
-          class="updateButton"
-          data-testid="update-button"
-          data-warning-level="light"
-          id="update-lens-button"
-        >
-          Update
           <i
-            class="Icon icon material focusable"
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
             <span
               class="icon"
-              data-icon-name="arrow_drop_down"
+              data-icon-name="home"
             >
-              arrow_drop_down
+              home
             </span>
           </i>
-        </button>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+          <button
+            class="updateButton"
+            data-testid="update-button"
+            data-warning-level="light"
+            id="update-lens-button"
+          >
+            Update
+            <i
+              class="Icon icon material focusable"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_drop_down"
+              >
+                arrow_drop_down
+              </span>
+            </i>
+          </button>
+        </div>
         <div
-          class="item"
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-available"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            some-version is available
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-available"
+            >
+              some-version is available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
@@ -431,71 +1106,206 @@ exports[`installing update using tray when started when user checks for updates
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-not-available"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            No new updates available
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
diff --git a/src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap b/src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap
index e9b4ce2a94..d878385f7d 100644
--- a/src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap
+++ b/src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap
@@ -4,71 +4,206 @@ exports[`installing update when started renders 1`] = `
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-not-available"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            No new updates available
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
@@ -81,74 +216,209 @@ exports[`installing update when started when user checks for updates renders 1`]
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            class="Spinner singleColor"
-          />
-          <div
-            data-testid="app-update-checking"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            Checking for updates...
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              class="Spinner singleColor"
+            />
+            <div
+              data-testid="app-update-checking"
+            >
+              Checking for updates...
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
@@ -161,74 +431,209 @@ exports[`installing update when started when user checks for updates when new up
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-downloading"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            Downloading version some-version...
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
           <div
-            class="Spinner singleColor"
-          />
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
         </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-downloading"
+            >
+              Downloading version some-version...
+            </div>
+            <div
+              class="Spinner singleColor"
+            />
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
@@ -241,89 +646,224 @@ exports[`installing update when started when user checks for updates when new up
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
+        class="topBar"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="items"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-        <button
-          class="updateButton"
-          data-testid="update-button"
-          data-warning-level="light"
-          id="update-lens-button"
-        >
-          Update
           <i
-            class="Icon icon material focusable"
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
             <span
               class="icon"
-              data-icon-name="arrow_drop_down"
+              data-icon-name="home"
             >
-              arrow_drop_down
+              home
             </span>
           </i>
-        </button>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+          <button
+            class="updateButton"
+            data-testid="update-button"
+            data-warning-level="light"
+            id="update-lens-button"
+          >
+            Update
+            <i
+              class="Icon icon material focusable"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_drop_down"
+              >
+                arrow_drop_down
+              </span>
+            </i>
+          </button>
+        </div>
         <div
-          class="item"
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-download-failed"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            Download of update failed
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-download-failed"
+            >
+              Download of update failed
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
@@ -336,89 +876,224 @@ exports[`installing update when started when user checks for updates when new up
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
+        class="topBar"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="items"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-        <button
-          class="updateButton"
-          data-testid="update-button"
-          data-warning-level="light"
-          id="update-lens-button"
-        >
-          Update
           <i
-            class="Icon icon material focusable"
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
             <span
               class="icon"
-              data-icon-name="arrow_drop_down"
+              data-icon-name="home"
             >
-              arrow_drop_down
+              home
             </span>
           </i>
-        </button>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      >
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+          <button
+            class="updateButton"
+            data-testid="update-button"
+            data-warning-level="light"
+            id="update-lens-button"
+          >
+            Update
+            <i
+              class="Icon icon material focusable"
+            >
+              <span
+                class="icon"
+                data-icon-name="arrow_drop_down"
+              >
+                arrow_drop_down
+              </span>
+            </i>
+          </button>
+        </div>
         <div
-          class="item"
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-available"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            some-version is available
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-available"
+            >
+              some-version is available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
@@ -431,71 +1106,206 @@ exports[`installing update when started when user checks for updates when no new
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-not-available"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            No new updates available
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
diff --git a/src/behaviours/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap b/src/behaviours/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap
index 7ef99cf3a3..9dbd7412ed 100644
--- a/src/behaviours/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap
+++ b/src/behaviours/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap
@@ -4,71 +4,206 @@ exports[`periodical checking of updates given updater is enabled and configurati
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-not-available"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            No new updates available
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
diff --git a/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap b/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap
index 961e18ab03..2eab14d3fa 100644
--- a/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap
+++ b/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap
@@ -4,71 +4,206 @@ exports[`selection of update stability when started renders 1`] = `
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-not-available"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            No new updates available
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
diff --git a/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap b/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
index db6d5e7f36..e1db29fca1 100644
--- a/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
@@ -3,685 +3,1197 @@
 exports[`cluster - order of sidebar items when rendered renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-some-parent-id"
+              href="/"
+            >
+              <span
+                class="link-text box grow"
+              >
+                Some parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-another-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-some-another-parent-id"
+              href="/"
+            >
+              <span
+                class="link-text box grow"
+              >
+                Some another parent
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-other-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-some-other-parent-id"
+              href="/"
+            >
+              <span
+                class="link-text box grow"
+              >
+                Some other parent
+              </span>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
+        <div
+          class="Tabs center scrollable"
         >
-          <i
-            class="Icon svg focusable"
+          <div
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="label"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              Overview
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
+          >
+            <div
+              class="header flex gaps align-center"
+            >
+              <h5
+                class="box grow"
+              >
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
       </div>
+    </div>
+    <div
+      class="footer"
+    >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
+        class="Dock"
+        tabindex="-1"
       >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
         >
-          <i
-            class="Icon material focusable"
+          <div
+            class="dockTabs"
+            role="tablist"
           >
-            <span
-              class="icon"
-              data-icon-name="list"
+            <div
+              class="Tabs tabs"
             >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        id="tooltip_target_14"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                        <div />
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
           >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-some-parent-id"
-          href="/"
-        >
-          <span
-            class="link-text box grow"
-          >
-            Some parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="dock-menu box grow"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_15"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+                <div />
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_17"
+              tabindex="0"
             >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+              <div />
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_18"
+              tabindex="0"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
-            >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-another-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-some-another-parent-id"
-          href="/"
-        >
-          <span
-            class="link-text box grow"
-          >
-            Some another parent
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-other-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-some-other-parent-id"
-          href="/"
-        >
-          <span
-            class="link-text box grow"
-          >
-            Some other parent
-          </span>
-        </a>
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+              <div />
+            </i>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - order of sidebar items when rendered when parent is expanded renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-some-parent-id"
+              href="/"
+            >
+              <span
+                class="link-text box grow"
+              >
+                Some parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_up"
+                >
+                  keyboard_arrow_up
+                </span>
+              </i>
+            </a>
+            <ul
+              class="sub-menu"
+            >
+              <div
+                class="SidebarItem"
+                data-is-active-test="false"
+                data-parent-id-test="some-parent-id"
+                data-testid="sidebar-item-some-child-id"
+              >
+                <a
+                  class="nav-item flex gaps align-center"
+                  data-testid="sidebar-item-link-for-some-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Some child
+                  </span>
+                </a>
+              </div>
+              <div
+                class="SidebarItem"
+                data-is-active-test="false"
+                data-parent-id-test="some-parent-id"
+                data-testid="sidebar-item-some-another-child-id"
+              >
+                <a
+                  class="nav-item flex gaps align-center"
+                  data-testid="sidebar-item-link-for-some-another-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Some another child
+                  </span>
+                </a>
+              </div>
+              <div
+                class="SidebarItem"
+                data-is-active-test="false"
+                data-parent-id-test="some-parent-id"
+                data-testid="sidebar-item-some-other-child-id"
+              >
+                <a
+                  class="nav-item flex gaps align-center"
+                  data-testid="sidebar-item-link-for-some-other-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Some other child
+                  </span>
+                </a>
+              </div>
+            </ul>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-another-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-some-another-parent-id"
+              href="/"
+            >
+              <span
+                class="link-text box grow"
+              >
+                Some another parent
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-other-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-some-other-parent-id"
+              href="/"
+            >
+              <span
+                class="link-text box grow"
+              >
+                Some other parent
+              </span>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-some-parent-id"
-          href="/"
-        >
-          <span
-            class="link-text box grow"
-          >
-            Some parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_up"
-            >
-              keyboard_arrow_up
-            </span>
-          </i>
-        </a>
-        <ul
-          class="sub-menu"
+        <div
+          class="Tabs center scrollable"
         >
           <div
-            class="SidebarItem"
-            data-is-active-test="false"
-            data-parent-id-test="some-parent-id"
-            data-testid="sidebar-item-some-child-id"
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            <a
-              class="nav-item flex gaps align-center"
-              data-testid="sidebar-item-link-for-some-child-id"
-              href="/"
+            <div
+              class="label"
             >
-              <span
-                class="link-text box grow"
+              Overview
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
+          >
+            <div
+              class="header flex gaps align-center"
+            >
+              <h5
+                class="box grow"
               >
-                Some child
-              </span>
-            </a>
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
+      </div>
+    </div>
+    <div
+      class="footer"
+    >
+      <div
+        class="Dock"
+        tabindex="-1"
+      >
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
+        >
+          <div
+            class="dockTabs"
+            role="tablist"
+          >
+            <div
+              class="Tabs tabs"
+            >
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        id="tooltip_target_54"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                        <div />
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
           <div
-            class="SidebarItem"
-            data-is-active-test="false"
-            data-parent-id-test="some-parent-id"
-            data-testid="sidebar-item-some-another-child-id"
+            class="toolbar flex gaps align-center box grow"
           >
-            <a
-              class="nav-item flex gaps align-center"
-              data-testid="sidebar-item-link-for-some-another-child-id"
-              href="/"
+            <div
+              class="dock-menu box grow"
+            >
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_55"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+                <div />
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_57"
+              tabindex="0"
             >
               <span
-                class="link-text box grow"
+                class="icon"
+                data-icon-name="fullscreen"
               >
-                Some another child
+                fullscreen
               </span>
-            </a>
-          </div>
-          <div
-            class="SidebarItem"
-            data-is-active-test="false"
-            data-parent-id-test="some-parent-id"
-            data-testid="sidebar-item-some-other-child-id"
-          >
-            <a
-              class="nav-item flex gaps align-center"
-              data-testid="sidebar-item-link-for-some-other-child-id"
-              href="/"
+              <div />
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_58"
+              tabindex="0"
             >
               <span
-                class="link-text box grow"
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
               >
-                Some other child
+                keyboard_arrow_up
               </span>
-            </a>
+              <div />
+            </i>
           </div>
-        </ul>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
-            >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
-            >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-another-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-some-another-parent-id"
-          href="/"
-        >
-          <span
-            class="link-text box grow"
-          >
-            Some another parent
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-other-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-some-other-parent-id"
-          href="/"
-        >
-          <span
-            class="link-text box grow"
-          >
-            Some other parent
-          </span>
-        </a>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
diff --git a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
index d4a574fde7..ba62a36e67 100644
--- a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
@@ -3,2055 +3,3605 @@
 exports[`cluster - sidebar and tab navigation for core given core registrations given empty state for expanded sidebar items already exists, when rendered renders without errors 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-some-parent-id"
+              href="/"
+            >
+              <div
+                data-testid="some-icon-for-parent"
+              />
+              <span
+                class="link-text box grow"
+              >
+                Some parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-some-parent-id"
-          href="/"
+        <div
+          class="Tabs center scrollable"
         >
           <div
-            data-testid="some-icon-for-parent"
-          />
-          <span
-            class="link-text box grow"
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            Some parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="label"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              Overview
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
+          >
+            <div
+              class="header flex gaps align-center"
+            >
+              <h5
+                class="box grow"
+              >
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
       </div>
+    </div>
+    <div
+      class="footer"
+    >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
+        class="Dock"
+        tabindex="-1"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
         >
-          <i
-            class="Icon material focusable"
+          <div
+            class="dockTabs"
+            role="tablist"
           >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
+            <div
+              class="Tabs tabs"
             >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        id="tooltip_target_186"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                        <div />
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
           >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="dock-menu box grow"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_187"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+                <div />
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_189"
+              tabindex="0"
             >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+              <div />
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_190"
+              tabindex="0"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+              <div />
+            </i>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - sidebar and tab navigation for core given core registrations given no initially persisted state for sidebar items, when rendered renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-some-parent-id"
+              href="/"
+            >
+              <div
+                data-testid="some-icon-for-parent"
+              />
+              <span
+                class="link-text box grow"
+              >
+                Some parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-some-parent-id"
-          href="/"
+        <div
+          class="Tabs center scrollable"
         >
           <div
-            data-testid="some-icon-for-parent"
-          />
-          <span
-            class="link-text box grow"
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            Some parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="label"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              Overview
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
+          >
+            <div
+              class="header flex gaps align-center"
+            >
+              <h5
+                class="box grow"
+              >
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
       </div>
+    </div>
+    <div
+      class="footer"
+    >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
+        class="Dock"
+        tabindex="-1"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
         >
-          <i
-            class="Icon material focusable"
+          <div
+            class="dockTabs"
+            role="tablist"
           >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
+            <div
+              class="Tabs tabs"
             >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        id="tooltip_target_226"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                        <div />
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
           >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="dock-menu box grow"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_227"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+                <div />
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_229"
+              tabindex="0"
             >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+              <div />
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_230"
+              tabindex="0"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+              <div />
+            </i>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - sidebar and tab navigation for core given core registrations given no initially persisted state for sidebar items, when rendered when a parent sidebar item is expanded renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
-      </div>
-      <div
-        class="loadingClusterName"
-      />
-    </div>
-    <div
-      class="sidebarNav sidebar-active-status"
-    >
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-some-parent-id"
-          href="/"
+        <div
+          class="SidebarCluster"
         >
           <div
-            data-testid="some-icon-for-parent"
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
           />
-          <span
-            class="link-text box grow"
-          >
-            Some parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_up"
-            >
-              keyboard_arrow_up
-            </span>
-          </i>
-        </a>
-        <ul
-          class="sub-menu"
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
         >
           <div
             class="SidebarItem"
-            data-is-active-test="false"
-            data-parent-id-test="some-parent-id"
-            data-testid="sidebar-item-some-child-id"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
           >
             <a
-              class="nav-item flex gaps align-center"
-              data-testid="sidebar-item-link-for-some-child-id"
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
               href="/"
             >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
               <span
                 class="link-text box grow"
               >
-                Some child
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
               </span>
             </a>
           </div>
-        </ul>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-some-parent-id"
+              href="/"
+            >
+              <div
+                data-testid="some-icon-for-parent"
+              />
+              <span
+                class="link-text box grow"
+              >
+                Some parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_up"
+                >
+                  keyboard_arrow_up
+                </span>
+              </i>
+            </a>
+            <ul
+              class="sub-menu"
+            >
+              <div
+                class="SidebarItem"
+                data-is-active-test="false"
+                data-parent-id-test="some-parent-id"
+                data-testid="sidebar-item-some-child-id"
+              >
+                <a
+                  class="nav-item flex gaps align-center"
+                  data-testid="sidebar-item-link-for-some-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Some child
+                  </span>
+                </a>
+              </div>
+            </ul>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
-            >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
+        class="ResizingAnchor horizontal trailing"
+      />
+    </div>
+    <div
+      class="contents"
+    >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
+        <div
+          class="Tabs center scrollable"
         >
-          <i
-            class="Icon material focusable"
+          <div
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            <span
-              class="icon"
-              data-icon-name="storage"
+            <div
+              class="label"
             >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
+              Overview
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
           >
-            Storage
-          </span>
-        </a>
+            <div
+              class="header flex gaps align-center"
+            >
+              <h5
+                class="box grow"
+              >
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
       </div>
+    </div>
+    <div
+      class="footer"
+    >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
+        class="Dock"
+        tabindex="-1"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
         >
-          <i
-            class="Icon svg focusable"
+          <div
+            class="dockTabs"
+            role="tablist"
           >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="Tabs tabs"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        id="tooltip_target_286"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                        <div />
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
           >
-            <span
-              class="icon"
-              data-icon-name="security"
+            <div
+              class="dock-menu box grow"
             >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_287"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+                <div />
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_289"
+              tabindex="0"
             >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+              <div />
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_290"
+              tabindex="0"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+              <div />
+            </i>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - sidebar and tab navigation for core given core registrations given no initially persisted state for sidebar items, when rendered when a parent sidebar item is expanded when a child of the parent is selected renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
-      </div>
-      <div
-        class="loadingClusterName"
-      />
-    </div>
-    <div
-      class="sidebarNav sidebar-active-status"
-    >
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="true"
-        data-testid="sidebar-item-some-parent-id"
-      >
-        <a
-          aria-current="page"
-          class="nav-item flex gaps align-center expandable active"
-          data-testid="sidebar-item-link-for-some-parent-id"
-          href="/"
+        <div
+          class="SidebarCluster"
         >
           <div
-            data-testid="some-icon-for-parent"
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
           />
-          <span
-            class="link-text box grow"
-          >
-            Some parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_up"
-            >
-              keyboard_arrow_up
-            </span>
-          </i>
-        </a>
-        <ul
-          class="sub-menu active"
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
         >
           <div
             class="SidebarItem"
-            data-is-active-test="true"
-            data-parent-id-test="some-parent-id"
-            data-testid="sidebar-item-some-child-id"
+            data-is-active-test="false"
+            data-testid="sidebar-item-workloads"
           >
             <a
-              aria-current="page"
-              class="nav-item flex gaps align-center active"
-              data-testid="sidebar-item-link-for-some-child-id"
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-workloads"
               href="/"
             >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
               <span
                 class="link-text box grow"
               >
-                Some child
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
               </span>
             </a>
           </div>
-        </ul>
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-some-parent-id"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-some-parent-id"
+              href="/"
+            >
+              <div
+                data-testid="some-icon-for-parent"
+              />
+              <span
+                class="link-text box grow"
+              >
+                Some parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_up"
+                >
+                  keyboard_arrow_up
+                </span>
+              </i>
+            </a>
+            <ul
+              class="sub-menu active"
+            >
+              <div
+                class="SidebarItem"
+                data-is-active-test="true"
+                data-parent-id-test="some-parent-id"
+                data-testid="sidebar-item-some-child-id"
+              >
+                <a
+                  aria-current="page"
+                  class="nav-item flex gaps align-center active"
+                  data-testid="sidebar-item-link-for-some-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Some child
+                  </span>
+                </a>
+              </div>
+            </ul>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
-            >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
+        class="ResizingAnchor horizontal trailing"
+      />
+    </div>
+    <div
+      class="contents"
+    >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
-            >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
+        data-testid="some-child-page"
+      />
+    </div>
+    <div
+      class="footer"
+    >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
+        class="Dock"
+        tabindex="-1"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
         >
-          <i
-            class="Icon svg focusable"
+          <div
+            class="dockTabs"
+            role="tablist"
           >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="Tabs tabs"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        id="tooltip_target_349"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                        <div />
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
           >
-            <span
-              class="icon"
-              data-icon-name="security"
+            <div
+              class="dock-menu box grow"
             >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_350"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+                <div />
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_352"
+              tabindex="0"
             >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+              <div />
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_353"
+              tabindex="0"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+              <div />
+            </i>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    data-testid="some-child-page"
-  />
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - sidebar and tab navigation for core given core registrations given no state for expanded sidebar items exists, and navigated to child sidebar item, when rendered renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-some-parent-id"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-some-parent-id"
+              href="/"
+            >
+              <div
+                data-testid="some-icon-for-parent"
+              />
+              <span
+                class="link-text box grow"
+              >
+                Some parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
+        data-testid="some-child-page"
+      />
+    </div>
+    <div
+      class="footer"
+    >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
+        class="Dock"
+        tabindex="-1"
       >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="true"
-        data-testid="sidebar-item-some-parent-id"
-      >
-        <a
-          aria-current="page"
-          class="nav-item flex gaps align-center expandable active"
-          data-testid="sidebar-item-link-for-some-parent-id"
-          href="/"
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
         >
           <div
-            data-testid="some-icon-for-parent"
-          />
-          <span
-            class="link-text box grow"
+            class="dockTabs"
+            role="tablist"
           >
-            Some parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="Tabs tabs"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        id="tooltip_target_14"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                        <div />
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
           >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
+            <div
+              class="dock-menu box grow"
             >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_15"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+                <div />
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_17"
+              tabindex="0"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+              <div />
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_18"
+              tabindex="0"
             >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+              <div />
+            </i>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    data-testid="some-child-page"
-  />
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - sidebar and tab navigation for core given core registrations given state for expanded sidebar items already exists, when rendered renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
-      </div>
-      <div
-        class="loadingClusterName"
-      />
-    </div>
-    <div
-      class="sidebarNav sidebar-active-status"
-    >
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-some-parent-id"
-          href="/"
+        <div
+          class="SidebarCluster"
         >
           <div
-            data-testid="some-icon-for-parent"
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
           />
-          <span
-            class="link-text box grow"
-          >
-            Some parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_up"
-            >
-              keyboard_arrow_up
-            </span>
-          </i>
-        </a>
-        <ul
-          class="sub-menu"
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
         >
           <div
             class="SidebarItem"
-            data-is-active-test="false"
-            data-parent-id-test="some-parent-id"
-            data-testid="sidebar-item-some-child-id"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
           >
             <a
-              class="nav-item flex gaps align-center"
-              data-testid="sidebar-item-link-for-some-child-id"
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
               href="/"
             >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
               <span
                 class="link-text box grow"
               >
-                Some child
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
               </span>
             </a>
           </div>
-        </ul>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-some-parent-id"
+              href="/"
+            >
+              <div
+                data-testid="some-icon-for-parent"
+              />
+              <span
+                class="link-text box grow"
+              >
+                Some parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_up"
+                >
+                  keyboard_arrow_up
+                </span>
+              </i>
+            </a>
+            <ul
+              class="sub-menu"
+            >
+              <div
+                class="SidebarItem"
+                data-is-active-test="false"
+                data-parent-id-test="some-parent-id"
+                data-testid="sidebar-item-some-child-id"
+              >
+                <a
+                  class="nav-item flex gaps align-center"
+                  data-testid="sidebar-item-link-for-some-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Some child
+                  </span>
+                </a>
+              </div>
+            </ul>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
-            >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
+        class="ResizingAnchor horizontal trailing"
+      />
+    </div>
+    <div
+      class="contents"
+    >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
+        <div
+          class="Tabs center scrollable"
         >
-          <i
-            class="Icon material focusable"
+          <div
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            <span
-              class="icon"
-              data-icon-name="storage"
+            <div
+              class="label"
             >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
+              Overview
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
           >
-            Storage
-          </span>
-        </a>
+            <div
+              class="header flex gaps align-center"
+            >
+              <h5
+                class="box grow"
+              >
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
       </div>
+    </div>
+    <div
+      class="footer"
+    >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
+        class="Dock"
+        tabindex="-1"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
         >
-          <i
-            class="Icon svg focusable"
+          <div
+            class="dockTabs"
+            role="tablist"
           >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="Tabs tabs"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        id="tooltip_target_86"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                        <div />
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
           >
-            <span
-              class="icon"
-              data-icon-name="security"
+            <div
+              class="dock-menu box grow"
             >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_87"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+                <div />
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_89"
+              tabindex="0"
             >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+              <div />
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_90"
+              tabindex="0"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+              <div />
+            </i>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - sidebar and tab navigation for core given core registrations given state for expanded unknown sidebar items already exists, when rendered renders without errors 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-some-parent-id"
+              href="/"
+            >
+              <div
+                data-testid="some-icon-for-parent"
+              />
+              <span
+                class="link-text box grow"
+              >
+                Some parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-some-parent-id"
-          href="/"
+        <div
+          class="Tabs center scrollable"
         >
           <div
-            data-testid="some-icon-for-parent"
-          />
-          <span
-            class="link-text box grow"
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            Some parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="label"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              Overview
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
+          >
+            <div
+              class="header flex gaps align-center"
+            >
+              <h5
+                class="box grow"
+              >
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
       </div>
+    </div>
+    <div
+      class="footer"
+    >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
+        class="Dock"
+        tabindex="-1"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
         >
-          <i
-            class="Icon material focusable"
+          <div
+            class="dockTabs"
+            role="tablist"
           >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
+            <div
+              class="Tabs tabs"
             >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        id="tooltip_target_146"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                        <div />
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
           >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="dock-menu box grow"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_147"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+                <div />
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_149"
+              tabindex="0"
             >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+              <div />
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_150"
+              tabindex="0"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+              <div />
+            </i>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
diff --git a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
index 60d3be5320..07d6f2e874 100644
--- a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
@@ -3,2554 +3,4215 @@
 exports[`cluster - sidebar and tab navigation for extensions given extension with cluster pages and cluster page menus given empty state for expanded sidebar items already exists, when rendered renders without errors 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-extension-name-some-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
+              href="/"
+            >
+              <div>
+                Some icon
+              </div>
+              <span
+                class="link-text box grow"
+              >
+                Parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
+        <div
+          class="Tabs center scrollable"
         >
-          <i
-            class="Icon svg focusable"
+          <div
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="label"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
-            >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
-            >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-extension-name-some-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
-          href="/"
-        >
-          <div>
-            Some icon
+              Overview
+            </div>
           </div>
-          <span
-            class="link-text box grow"
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
           >
-            Parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="header flex gaps align-center"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              <h5
+                class="box grow"
+              >
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
+      </div>
+    </div>
+    <div
+      class="footer"
+    >
+      <div
+        class="Dock"
+        tabindex="-1"
+      >
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
+        >
+          <div
+            class="dockTabs"
+            role="tablist"
+          >
+            <div
+              class="Tabs tabs"
+            >
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        tabindex="0"
+                        tooltip="Close ⌘+W"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
+          >
+            <div
+              class="dock-menu box grow"
+            >
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_10"
+                tabindex="0"
+                tooltip="New tab"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Fit to window"
+            >
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Open"
+            >
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+            </i>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - sidebar and tab navigation for extensions given extension with cluster pages and cluster page menus given no initially persisted state for sidebar items, when rendered renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-extension-name-some-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
+              href="/"
+            >
+              <div>
+                Some icon
+              </div>
+              <span
+                class="link-text box grow"
+              >
+                Parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
+        <div
+          class="Tabs center scrollable"
         >
-          <i
-            class="Icon svg focusable"
+          <div
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="label"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
-            >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
-            >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-extension-name-some-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
-          href="/"
-        >
-          <div>
-            Some icon
+              Overview
+            </div>
           </div>
-          <span
-            class="link-text box grow"
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
           >
-            Parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="header flex gaps align-center"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              <h5
+                class="box grow"
+              >
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
+      </div>
+    </div>
+    <div
+      class="footer"
+    >
+      <div
+        class="Dock"
+        tabindex="-1"
+      >
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
+        >
+          <div
+            class="dockTabs"
+            role="tablist"
+          >
+            <div
+              class="Tabs tabs"
+            >
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        tabindex="0"
+                        tooltip="Close ⌘+W"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
+          >
+            <div
+              class="dock-menu box grow"
+            >
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_12"
+                tabindex="0"
+                tooltip="New tab"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Fit to window"
+            >
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Open"
+            >
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+            </i>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - sidebar and tab navigation for extensions given extension with cluster pages and cluster page menus given no initially persisted state for sidebar items, when rendered when a parent sidebar item is expanded renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-extension-name-some-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
+              href="/"
+            >
+              <div>
+                Some icon
+              </div>
+              <span
+                class="link-text box grow"
+              >
+                Parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_up"
+                >
+                  keyboard_arrow_up
+                </span>
+              </i>
+            </a>
+            <ul
+              class="sub-menu"
+            >
+              <div
+                class="SidebarItem"
+                data-is-active-test="false"
+                data-parent-id-test="some-extension-name-some-parent-id"
+                data-testid="sidebar-item-some-extension-name-some-child-id"
+              >
+                <a
+                  class="nav-item flex gaps align-center"
+                  data-testid="sidebar-item-link-for-some-extension-name-some-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Child 1
+                  </span>
+                </a>
+              </div>
+              <div
+                class="SidebarItem"
+                data-is-active-test="false"
+                data-parent-id-test="some-extension-name-some-parent-id"
+                data-testid="sidebar-item-some-extension-name-some-other-child-id"
+              >
+                <a
+                  class="nav-item flex gaps align-center"
+                  data-testid="sidebar-item-link-for-some-extension-name-some-other-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Child 2
+                  </span>
+                </a>
+              </div>
+            </ul>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
-            >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
-            >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-extension-name-some-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
-          href="/"
-        >
-          <div>
-            Some icon
-          </div>
-          <span
-            class="link-text box grow"
-          >
-            Parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_up"
-            >
-              keyboard_arrow_up
-            </span>
-          </i>
-        </a>
-        <ul
-          class="sub-menu"
+        <div
+          class="Tabs center scrollable"
         >
           <div
-            class="SidebarItem"
-            data-is-active-test="false"
-            data-parent-id-test="some-extension-name-some-parent-id"
-            data-testid="sidebar-item-some-extension-name-some-child-id"
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            <a
-              class="nav-item flex gaps align-center"
-              data-testid="sidebar-item-link-for-some-extension-name-some-child-id"
-              href="/"
+            <div
+              class="label"
             >
-              <span
-                class="link-text box grow"
+              Overview
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
+          >
+            <div
+              class="header flex gaps align-center"
+            >
+              <h5
+                class="box grow"
               >
-                Child 1
-              </span>
-            </a>
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
+      </div>
+    </div>
+    <div
+      class="footer"
+    >
+      <div
+        class="Dock"
+        tabindex="-1"
+      >
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
+        >
+          <div
+            class="dockTabs"
+            role="tablist"
+          >
+            <div
+              class="Tabs tabs"
+            >
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        tabindex="0"
+                        tooltip="Close ⌘+W"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
           <div
-            class="SidebarItem"
-            data-is-active-test="false"
-            data-parent-id-test="some-extension-name-some-parent-id"
-            data-testid="sidebar-item-some-extension-name-some-other-child-id"
+            class="toolbar flex gaps align-center box grow"
           >
-            <a
-              class="nav-item flex gaps align-center"
-              data-testid="sidebar-item-link-for-some-extension-name-some-other-child-id"
-              href="/"
+            <div
+              class="dock-menu box grow"
+            >
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_15"
+                tabindex="0"
+                tooltip="New tab"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Fit to window"
             >
               <span
-                class="link-text box grow"
+                class="icon"
+                data-icon-name="fullscreen"
               >
-                Child 2
+                fullscreen
               </span>
-            </a>
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Open"
+            >
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+            </i>
           </div>
-        </ul>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - sidebar and tab navigation for extensions given extension with cluster pages and cluster page menus given no initially persisted state for sidebar items, when rendered when a parent sidebar item is expanded when a child of the parent is selected renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
-      </div>
-      <div
-        class="loadingClusterName"
-      />
-    </div>
-    <div
-      class="sidebarNav sidebar-active-status"
-    >
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
+        <div
+          class="SidebarCluster"
         >
-          <i
-            class="Icon svg focusable"
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
           >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
-            >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
-            >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="true"
-        data-testid="sidebar-item-some-extension-name-some-parent-id"
-      >
-        <a
-          aria-current="page"
-          class="nav-item flex gaps align-center expandable active"
-          data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
-          href="/"
-        >
-          <div>
-            Some icon
+            ??
           </div>
-          <span
-            class="link-text box grow"
-          >
-            Parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_up"
-            >
-              keyboard_arrow_up
-            </span>
-          </i>
-        </a>
-        <ul
-          class="sub-menu active"
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
         >
           <div
             class="SidebarItem"
-            data-is-active-test="true"
-            data-parent-id-test="some-extension-name-some-parent-id"
-            data-testid="sidebar-item-some-extension-name-some-child-id"
+            data-is-active-test="false"
+            data-testid="sidebar-item-workloads"
           >
             <a
-              aria-current="page"
-              class="nav-item flex gaps align-center active"
-              data-testid="sidebar-item-link-for-some-extension-name-some-child-id"
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-workloads"
               href="/"
             >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
               <span
                 class="link-text box grow"
               >
-                Child 1
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
               </span>
             </a>
           </div>
           <div
             class="SidebarItem"
             data-is-active-test="false"
-            data-parent-id-test="some-extension-name-some-parent-id"
-            data-testid="sidebar-item-some-extension-name-some-other-child-id"
+            data-testid="sidebar-item-network"
           >
             <a
-              class="nav-item flex gaps align-center"
-              data-testid="sidebar-item-link-for-some-extension-name-some-other-child-id"
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
               href="/"
             >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
               <span
                 class="link-text box grow"
               >
-                Child 2
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
               </span>
             </a>
           </div>
-        </ul>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-some-extension-name-some-parent-id"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
+              href="/"
+            >
+              <div>
+                Some icon
+              </div>
+              <span
+                class="link-text box grow"
+              >
+                Parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_up"
+                >
+                  keyboard_arrow_up
+                </span>
+              </i>
+            </a>
+            <ul
+              class="sub-menu active"
+            >
+              <div
+                class="SidebarItem"
+                data-is-active-test="true"
+                data-parent-id-test="some-extension-name-some-parent-id"
+                data-testid="sidebar-item-some-extension-name-some-child-id"
+              >
+                <a
+                  aria-current="page"
+                  class="nav-item flex gaps align-center active"
+                  data-testid="sidebar-item-link-for-some-extension-name-some-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Child 1
+                  </span>
+                </a>
+              </div>
+              <div
+                class="SidebarItem"
+                data-is-active-test="false"
+                data-parent-id-test="some-extension-name-some-parent-id"
+                data-testid="sidebar-item-some-extension-name-some-other-child-id"
+              >
+                <a
+                  class="nav-item flex gaps align-center"
+                  data-testid="sidebar-item-link-for-some-extension-name-some-other-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Child 2
+                  </span>
+                </a>
+              </div>
+            </ul>
+          </div>
+        </div>
       </div>
+      <div
+        class="ResizingAnchor horizontal trailing"
+      />
     </div>
-  </div>
-  <div
-    class="TabLayout"
-    data-testid="tab-layout"
-  >
     <div
-      class="Tabs center scrollable"
+      class="contents"
     >
       <div
-        class="Tab flex gaps align-center active"
-        data-is-active-test="true"
-        data-testid="tab-link-for-some-extension-name-some-child-id"
-        role="tab"
-        tabindex="0"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
         <div
-          class="label"
+          class="Tabs center scrollable"
         >
-          Child 1
+          <div
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-some-extension-name-some-child-id"
+            role="tab"
+            tabindex="0"
+          >
+            <div
+              class="label"
+            >
+              Child 1
+            </div>
+          </div>
+          <div
+            class="Tab flex gaps align-center"
+            data-is-active-test="false"
+            data-testid="tab-link-for-some-extension-name-some-other-child-id"
+            role="tab"
+            tabindex="0"
+          >
+            <div
+              class="label"
+            >
+              Child 2
+            </div>
+          </div>
         </div>
+        <main>
+          <div
+            data-testid="some-child-page"
+          >
+            Some child page
+          </div>
+        </main>
       </div>
+    </div>
+    <div
+      class="footer"
+    >
       <div
-        class="Tab flex gaps align-center"
-        data-is-active-test="false"
-        data-testid="tab-link-for-some-extension-name-some-other-child-id"
-        role="tab"
-        tabindex="0"
+        class="Dock"
+        tabindex="-1"
       >
         <div
-          class="label"
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
         >
-          Child 2
+          <div
+            class="dockTabs"
+            role="tablist"
+          >
+            <div
+              class="Tabs tabs"
+            >
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        tabindex="0"
+                        tooltip="Close ⌘+W"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
+          >
+            <div
+              class="dock-menu box grow"
+            >
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_18"
+                tabindex="0"
+                tooltip="New tab"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Fit to window"
+            >
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Open"
+            >
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+            </i>
+          </div>
         </div>
       </div>
     </div>
-    <main>
-      <div
-        data-testid="some-child-page"
-      >
-        Some child page
-      </div>
-    </main>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - sidebar and tab navigation for extensions given extension with cluster pages and cluster page menus given no initially persisted state for sidebar items, when rendered when a parent sidebar item is expanded when a child of the parent is selected when selecting sibling tab renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
-      </div>
-      <div
-        class="loadingClusterName"
-      />
-    </div>
-    <div
-      class="sidebarNav sidebar-active-status"
-    >
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
+        <div
+          class="SidebarCluster"
         >
-          <i
-            class="Icon svg focusable"
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
           >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
-            >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
-            >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="true"
-        data-testid="sidebar-item-some-extension-name-some-parent-id"
-      >
-        <a
-          aria-current="page"
-          class="nav-item flex gaps align-center expandable active"
-          data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
-          href="/"
-        >
-          <div>
-            Some icon
+            ??
           </div>
-          <span
-            class="link-text box grow"
-          >
-            Parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_up"
-            >
-              keyboard_arrow_up
-            </span>
-          </i>
-        </a>
-        <ul
-          class="sub-menu active"
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
         >
           <div
             class="SidebarItem"
             data-is-active-test="false"
-            data-parent-id-test="some-extension-name-some-parent-id"
-            data-testid="sidebar-item-some-extension-name-some-child-id"
+            data-testid="sidebar-item-workloads"
           >
             <a
-              class="nav-item flex gaps align-center"
-              data-testid="sidebar-item-link-for-some-extension-name-some-child-id"
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-workloads"
               href="/"
             >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
               <span
                 class="link-text box grow"
               >
-                Child 1
+                Workloads
               </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
             </a>
           </div>
           <div
             class="SidebarItem"
             data-is-active-test="true"
-            data-parent-id-test="some-extension-name-some-parent-id"
-            data-testid="sidebar-item-some-extension-name-some-other-child-id"
+            data-testid="sidebar-item-some-extension-name-some-parent-id"
           >
             <a
               aria-current="page"
-              class="nav-item flex gaps align-center active"
-              data-testid="sidebar-item-link-for-some-extension-name-some-other-child-id"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
               href="/"
             >
+              <div>
+                Some icon
+              </div>
               <span
                 class="link-text box grow"
               >
-                Child 2
+                Parent
               </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_up"
+                >
+                  keyboard_arrow_up
+                </span>
+              </i>
             </a>
+            <ul
+              class="sub-menu active"
+            >
+              <div
+                class="SidebarItem"
+                data-is-active-test="false"
+                data-parent-id-test="some-extension-name-some-parent-id"
+                data-testid="sidebar-item-some-extension-name-some-child-id"
+              >
+                <a
+                  class="nav-item flex gaps align-center"
+                  data-testid="sidebar-item-link-for-some-extension-name-some-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Child 1
+                  </span>
+                </a>
+              </div>
+              <div
+                class="SidebarItem"
+                data-is-active-test="true"
+                data-parent-id-test="some-extension-name-some-parent-id"
+                data-testid="sidebar-item-some-extension-name-some-other-child-id"
+              >
+                <a
+                  aria-current="page"
+                  class="nav-item flex gaps align-center active"
+                  data-testid="sidebar-item-link-for-some-extension-name-some-other-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Child 2
+                  </span>
+                </a>
+              </div>
+            </ul>
           </div>
-        </ul>
+        </div>
       </div>
+      <div
+        class="ResizingAnchor horizontal trailing"
+      />
     </div>
-  </div>
-  <div
-    class="TabLayout"
-    data-testid="tab-layout"
-  >
     <div
-      class="Tabs center scrollable"
+      class="contents"
     >
       <div
-        class="Tab flex gaps align-center"
-        data-is-active-test="false"
-        data-testid="tab-link-for-some-extension-name-some-child-id"
-        role="tab"
-        tabindex="0"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
         <div
-          class="label"
+          class="Tabs center scrollable"
         >
-          Child 1
+          <div
+            class="Tab flex gaps align-center"
+            data-is-active-test="false"
+            data-testid="tab-link-for-some-extension-name-some-child-id"
+            role="tab"
+            tabindex="0"
+          >
+            <div
+              class="label"
+            >
+              Child 1
+            </div>
+          </div>
+          <div
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-some-extension-name-some-other-child-id"
+            role="tab"
+            tabindex="0"
+          >
+            <div
+              class="label"
+            >
+              Child 2
+            </div>
+          </div>
         </div>
+        <main>
+          <div
+            data-testid="some-other-child-page"
+          >
+            Some other child page
+          </div>
+        </main>
       </div>
+    </div>
+    <div
+      class="footer"
+    >
       <div
-        class="Tab flex gaps align-center active"
-        data-is-active-test="true"
-        data-testid="tab-link-for-some-extension-name-some-other-child-id"
-        role="tab"
-        tabindex="0"
+        class="Dock"
+        tabindex="-1"
       >
         <div
-          class="label"
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
         >
-          Child 2
+          <div
+            class="dockTabs"
+            role="tablist"
+          >
+            <div
+              class="Tabs tabs"
+            >
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        tabindex="0"
+                        tooltip="Close ⌘+W"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
+          >
+            <div
+              class="dock-menu box grow"
+            >
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_27"
+                tabindex="0"
+                tooltip="New tab"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Fit to window"
+            >
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Open"
+            >
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+            </i>
+          </div>
         </div>
       </div>
     </div>
-    <main>
-      <div
-        data-testid="some-other-child-page"
-      >
-        Some other child page
-      </div>
-    </main>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - sidebar and tab navigation for extensions given extension with cluster pages and cluster page menus given no state for expanded sidebar items exists, and navigated to child sidebar item, when rendered renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-some-extension-name-some-parent-id"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
+              href="/"
+            >
+              <div>
+                Some icon
+              </div>
+              <span
+                class="link-text box grow"
+              >
+                Parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
+        <div
+          class="Tabs center scrollable"
         >
-          <i
-            class="Icon svg focusable"
+          <div
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-some-extension-name-some-child-id"
+            role="tab"
+            tabindex="0"
           >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="label"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
-            >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
-            >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="true"
-        data-testid="sidebar-item-some-extension-name-some-parent-id"
-      >
-        <a
-          aria-current="page"
-          class="nav-item flex gaps align-center expandable active"
-          data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
-          href="/"
-        >
-          <div>
-            Some icon
+              Child 1
+            </div>
           </div>
-          <span
-            class="link-text box grow"
+          <div
+            class="Tab flex gaps align-center"
+            data-is-active-test="false"
+            data-testid="tab-link-for-some-extension-name-some-other-child-id"
+            role="tab"
+            tabindex="0"
           >
-            Parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="label"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              Child 2
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            data-testid="some-child-page"
+          >
+            Some child page
+          </div>
+        </main>
       </div>
     </div>
-  </div>
-  <div
-    class="TabLayout"
-    data-testid="tab-layout"
-  >
     <div
-      class="Tabs center scrollable"
+      class="footer"
     >
       <div
-        class="Tab flex gaps align-center active"
-        data-is-active-test="true"
-        data-testid="tab-link-for-some-extension-name-some-child-id"
-        role="tab"
-        tabindex="0"
+        class="Dock"
+        tabindex="-1"
       >
         <div
-          class="label"
-        >
-          Child 1
-        </div>
-      </div>
-      <div
-        class="Tab flex gaps align-center"
-        data-is-active-test="false"
-        data-testid="tab-link-for-some-extension-name-some-other-child-id"
-        role="tab"
-        tabindex="0"
-      >
+          class="ResizingAnchor vertical leading"
+        />
         <div
-          class="label"
+          class="tabs-container flex align-center"
         >
-          Child 2
+          <div
+            class="dockTabs"
+            role="tablist"
+          >
+            <div
+              class="Tabs tabs"
+            >
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        tabindex="0"
+                        tooltip="Close ⌘+W"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
+          >
+            <div
+              class="dock-menu box grow"
+            >
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_1"
+                tabindex="0"
+                tooltip="New tab"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Fit to window"
+            >
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Open"
+            >
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+            </i>
+          </div>
         </div>
       </div>
     </div>
-    <main>
-      <div
-        data-testid="some-child-page"
-      >
-        Some child page
-      </div>
-    </main>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - sidebar and tab navigation for extensions given extension with cluster pages and cluster page menus given state for expanded sidebar items already exists, when rendered renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-extension-name-some-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
+              href="/"
+            >
+              <div>
+                Some icon
+              </div>
+              <span
+                class="link-text box grow"
+              >
+                Parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_up"
+                >
+                  keyboard_arrow_up
+                </span>
+              </i>
+            </a>
+            <ul
+              class="sub-menu"
+            >
+              <div
+                class="SidebarItem"
+                data-is-active-test="false"
+                data-parent-id-test="some-extension-name-some-parent-id"
+                data-testid="sidebar-item-some-extension-name-some-child-id"
+              >
+                <a
+                  class="nav-item flex gaps align-center"
+                  data-testid="sidebar-item-link-for-some-extension-name-some-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Child 1
+                  </span>
+                </a>
+              </div>
+              <div
+                class="SidebarItem"
+                data-is-active-test="false"
+                data-parent-id-test="some-extension-name-some-parent-id"
+                data-testid="sidebar-item-some-extension-name-some-other-child-id"
+              >
+                <a
+                  class="nav-item flex gaps align-center"
+                  data-testid="sidebar-item-link-for-some-extension-name-some-other-child-id"
+                  href="/"
+                >
+                  <span
+                    class="link-text box grow"
+                  >
+                    Child 2
+                  </span>
+                </a>
+              </div>
+            </ul>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
-            >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
-            >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-extension-name-some-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
-          href="/"
-        >
-          <div>
-            Some icon
-          </div>
-          <span
-            class="link-text box grow"
-          >
-            Parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_up"
-            >
-              keyboard_arrow_up
-            </span>
-          </i>
-        </a>
-        <ul
-          class="sub-menu"
+        <div
+          class="Tabs center scrollable"
         >
           <div
-            class="SidebarItem"
-            data-is-active-test="false"
-            data-parent-id-test="some-extension-name-some-parent-id"
-            data-testid="sidebar-item-some-extension-name-some-child-id"
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            <a
-              class="nav-item flex gaps align-center"
-              data-testid="sidebar-item-link-for-some-extension-name-some-child-id"
-              href="/"
+            <div
+              class="label"
             >
-              <span
-                class="link-text box grow"
+              Overview
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
+          >
+            <div
+              class="header flex gaps align-center"
+            >
+              <h5
+                class="box grow"
               >
-                Child 1
-              </span>
-            </a>
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
+      </div>
+    </div>
+    <div
+      class="footer"
+    >
+      <div
+        class="Dock"
+        tabindex="-1"
+      >
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
+        >
+          <div
+            class="dockTabs"
+            role="tablist"
+          >
+            <div
+              class="Tabs tabs"
+            >
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        tabindex="0"
+                        tooltip="Close ⌘+W"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
           <div
-            class="SidebarItem"
-            data-is-active-test="false"
-            data-parent-id-test="some-extension-name-some-parent-id"
-            data-testid="sidebar-item-some-extension-name-some-other-child-id"
+            class="toolbar flex gaps align-center box grow"
           >
-            <a
-              class="nav-item flex gaps align-center"
-              data-testid="sidebar-item-link-for-some-extension-name-some-other-child-id"
-              href="/"
+            <div
+              class="dock-menu box grow"
+            >
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_5"
+                tabindex="0"
+                tooltip="New tab"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Fit to window"
             >
               <span
-                class="link-text box grow"
+                class="icon"
+                data-icon-name="fullscreen"
               >
-                Child 2
+                fullscreen
               </span>
-            </a>
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Open"
+            >
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+            </i>
           </div>
-        </ul>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - sidebar and tab navigation for extensions given extension with cluster pages and cluster page menus given state for expanded unknown sidebar items already exists, when rendered renders without errors 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-extension-name-some-parent-id"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
+              href="/"
+            >
+              <div>
+                Some icon
+              </div>
+              <span
+                class="link-text box grow"
+              >
+                Parent
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
+        <div
+          class="Tabs center scrollable"
         >
-          <i
-            class="Icon svg focusable"
+          <div
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="label"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
-            >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
-            >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-extension-name-some-parent-id"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-some-extension-name-some-parent-id"
-          href="/"
-        >
-          <div>
-            Some icon
+              Overview
+            </div>
           </div>
-          <span
-            class="link-text box grow"
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
           >
-            Parent
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="header flex gaps align-center"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              <h5
+                class="box grow"
+              >
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
+      </div>
+    </div>
+    <div
+      class="footer"
+    >
+      <div
+        class="Dock"
+        tabindex="-1"
+      >
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
+        >
+          <div
+            class="dockTabs"
+            role="tablist"
+          >
+            <div
+              class="Tabs tabs"
+            >
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        tabindex="0"
+                        tooltip="Close ⌘+W"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
+          >
+            <div
+              class="dock-menu box grow"
+            >
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_8"
+                tabindex="0"
+                tooltip="New tab"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Fit to window"
+            >
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              tabindex="0"
+              tooltip="Open"
+            >
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+            </i>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
diff --git a/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap b/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
index 60b2a6a501..48ce69934a 100644
--- a/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
@@ -3,549 +3,1061 @@
 exports[`cluster - visibility of sidebar items given kube resource for route is not allowed renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
+        <div
+          class="Tabs center scrollable"
         >
-          <i
-            class="Icon svg focusable"
+          <div
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="label"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              Overview
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
+          >
+            <div
+              class="header flex gaps align-center"
+            >
+              <h5
+                class="box grow"
+              >
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
       </div>
+    </div>
+    <div
+      class="footer"
+    >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
+        class="Dock"
+        tabindex="-1"
       >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
         >
-          <i
-            class="Icon material focusable"
+          <div
+            class="dockTabs"
+            role="tablist"
           >
-            <span
-              class="icon"
-              data-icon-name="list"
+            <div
+              class="Tabs tabs"
             >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        id="tooltip_target_13"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                        <div />
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
           >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
+            <div
+              class="dock-menu box grow"
             >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_14"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+                <div />
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_16"
+              tabindex="0"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+              <div />
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_17"
+              tabindex="0"
             >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+              <div />
+            </i>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`cluster - visibility of sidebar items given kube resource for route is not allowed when kube resource becomes allowed renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
+    class="Notifications flex column align-flex-end"
+  />
+  <div
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="SidebarCluster"
+      class="sidebar"
     >
       <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
-        ??
+        <div
+          class="SidebarCluster"
+        >
+          <div
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
+          >
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-some-item-id"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-some-item-id"
+              href="/"
+            >
+              <span
+                class="link-text box grow"
+              >
+                Some item
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-namespaces"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-namespaces"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="layers"
+                >
+                  layers
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Namespaces
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+        </div>
       </div>
       <div
-        class="loadingClusterName"
+        class="ResizingAnchor horizontal trailing"
       />
     </div>
     <div
-      class="sidebarNav sidebar-active-status"
+      class="contents"
     >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
+        class="TabLayout"
+        data-testid="tab-layout"
       >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
+        <div
+          class="Tabs center scrollable"
         >
-          <i
-            class="Icon svg focusable"
+          <div
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-overview"
+            role="tab"
+            tabindex="0"
           >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+            <div
+              class="label"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              Overview
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            class="WorkloadsOverview flex column gaps"
+          >
+            <div
+              class="header flex gaps align-center"
+            >
+              <h5
+                class="box grow"
+              >
+                Overview
+              </h5>
+              <div>
+                <div
+                  class="Select theme-dark NamespaceSelect NamespaceSelectFilter css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-overview-namespace-select-filter-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--is-multi css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-overview-namespace-select-filter-input-placeholder"
+                      >
+                        All namespaces
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-overview-namespace-select-filter-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="overview-namespace-select-filter-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              class="OverviewStatuses"
+            >
+              <div
+                class="workloads"
+              />
+            </div>
+          </div>
+        </main>
       </div>
+    </div>
+    <div
+      class="footer"
+    >
       <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
+        class="Dock"
+        tabindex="-1"
       >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
         >
-          <i
-            class="Icon material focusable"
+          <div
+            class="dockTabs"
+            role="tablist"
           >
-            <span
-              class="icon"
-              data-icon-name="list"
+            <div
+              class="Tabs tabs"
             >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        id="tooltip_target_51"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                        <div />
+                      </i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="toolbar flex gaps align-center box grow"
           >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-some-item-id"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-some-item-id"
-          href="/"
-        >
-          <span
-            class="link-text box grow"
-          >
-            Some item
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
+            <div
+              class="dock-menu box grow"
             >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_52"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+                <div />
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_54"
+              tabindex="0"
             >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+              <div />
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_55"
+              tabindex="0"
             >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-namespaces"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-namespaces"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="layers"
-            >
-              layers
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Namespaces
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+              <div />
+            </i>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
diff --git a/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx b/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx
index 96b4a6b2d7..2aec78a47a 100644
--- a/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx
+++ b/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx
@@ -22,6 +22,7 @@ import pathExistsInjectable from "../../common/fs/path-exists.injectable";
 import readJsonFileInjectable from "../../common/fs/read-json-file.injectable";
 import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token";
 import sidebarStorageInjectable from "../../renderer/components/layout/sidebar-storage/sidebar-storage.injectable";
+import hostedClusterIdInjectable from "../../renderer/cluster-frame-context/hosted-cluster-id.injectable";
 import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
 
 describe("cluster - sidebar and tab navigation for core", () => {
@@ -38,6 +39,8 @@ describe("cluster - sidebar and tab navigation for core", () => {
     applicationBuilder.setEnvironmentToClusterFrame();
 
     applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
+      rendererDi.override(hostedClusterIdInjectable, () => "some-hosted-cluster-id");
+
       rendererDi.override(
         directoryForLensLocalStorageInjectable,
         () => "/some-directory-for-lens-local-storage",
@@ -94,7 +97,7 @@ describe("cluster - sidebar and tab navigation for core", () => {
           const writeJsonFileFake = rendererDi.inject(writeJsonFileInjectable);
 
           await writeJsonFileFake(
-            "/some-directory-for-lens-local-storage/app.json",
+            "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
             {
               sidebar: {
                 expanded: { "some-parent-id": true },
@@ -136,7 +139,7 @@ describe("cluster - sidebar and tab navigation for core", () => {
           const writeJsonFileFake = rendererDi.inject(writeJsonFileInjectable);
 
           await writeJsonFileFake(
-            "/some-directory-for-lens-local-storage/app.json",
+            "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
             {
               sidebar: {
                 expanded: { "some-unknown-parent-id": true },
@@ -166,7 +169,7 @@ describe("cluster - sidebar and tab navigation for core", () => {
           const writeJsonFileFake = rendererDi.inject(writeJsonFileInjectable);
 
           await writeJsonFileFake(
-            "/some-directory-for-lens-local-storage/app.json",
+            "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
             {
               someThingButSidebar: {},
             },
@@ -268,7 +271,7 @@ describe("cluster - sidebar and tab navigation for core", () => {
             const pathExistsFake = rendererDi.inject(pathExistsInjectable);
 
             const actual = await pathExistsFake(
-              "/some-directory-for-lens-local-storage/app.json",
+              "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
             );
 
             expect(actual).toBe(false);
@@ -280,7 +283,7 @@ describe("cluster - sidebar and tab navigation for core", () => {
             const readJsonFileFake = rendererDi.inject(readJsonFileInjectable);
 
             const actual = await readJsonFileFake(
-              "/some-directory-for-lens-local-storage/app.json",
+              "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
             );
 
             expect(actual).toEqual({
diff --git a/src/behaviours/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx b/src/behaviours/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx
index 75389c6631..fbfb425fe2 100644
--- a/src/behaviours/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx
+++ b/src/behaviours/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx
@@ -18,8 +18,14 @@ import { navigateToRouteInjectionToken } from "../../common/front-end-routing/na
 import assert from "assert";
 import type { FakeExtensionData } from "../../renderer/components/test-utils/get-renderer-extension-fake";
 import { getRendererExtensionFakeFor } from "../../renderer/components/test-utils/get-renderer-extension-fake";
+import hostedClusterIdInjectable from "../../renderer/cluster-frame-context/hosted-cluster-id.injectable";
 import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
 
+// TODO: Make tooltips free of side effects by making it deterministic
+jest.mock("../../renderer/components/tooltip/withTooltip", () => ({
+  withTooltip: (target: any) => target,
+}));
+
 describe("cluster - sidebar and tab navigation for extensions", () => {
   let applicationBuilder: ApplicationBuilder;
   let rendererDi: DiContainer;
@@ -34,6 +40,8 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
     applicationBuilder.setEnvironmentToClusterFrame();
 
     applicationBuilder.beforeApplicationStart(({ rendererDi }) => {
+      rendererDi.override(hostedClusterIdInjectable, () => "some-hosted-cluster-id");
+
       rendererDi.override(
         directoryForLensLocalStorageInjectable,
         () => "/some-directory-for-lens-local-storage",
@@ -96,7 +104,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
           const writeJsonFileFake = rendererDi.inject(writeJsonFileInjectable);
 
           await writeJsonFileFake(
-            "/some-directory-for-lens-local-storage/app.json",
+            "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
             {
               sidebar: {
                 expanded: { "some-extension-name-some-parent-id": true },
@@ -132,7 +140,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
           const writeJsonFileFake = rendererDi.inject(writeJsonFileInjectable);
 
           await writeJsonFileFake(
-            "/some-directory-for-lens-local-storage/app.json",
+            "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
             {
               sidebar: {
                 expanded: { "some-extension-name-some-unknown-parent-id": true },
@@ -162,7 +170,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
           const writeJsonFileFake = rendererDi.inject(writeJsonFileInjectable);
 
           await writeJsonFileFake(
-            "/some-directory-for-lens-local-storage/app.json",
+            "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
             {
               someThingButSidebar: {},
             },
@@ -284,7 +292,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
             const pathExistsFake = rendererDi.inject(pathExistsInjectable);
 
             const actual = await pathExistsFake(
-              "/some-directory-for-lens-local-storage/app.json",
+              "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
             );
 
             expect(actual).toBe(false);
@@ -296,7 +304,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
             const readJsonFileFake = rendererDi.inject(readJsonFileInjectable);
 
             const actual = await readJsonFileFake(
-              "/some-directory-for-lens-local-storage/app.json",
+              "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json",
             );
 
             expect(actual).toEqual({
diff --git a/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
index 8109ff7f3f..7abb5b3bf5 100644
--- a/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -3,71 +3,206 @@
 exports[`extensions - navigation using application menu renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
+      >
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="flex justify-center Welcome align-center"
+        data-testid="welcome-page"
       >
         <div
-          data-testid="app-update-not-available"
+          data-testid="welcome-banner-container"
+          style="width: 320px;"
         >
-          No new updates available
+          <i
+            class="Icon logo svg focusable"
+          >
+            <span
+              class="icon"
+            />
+          </i>
+          <div
+            class="flex justify-center"
+          >
+            <div
+              data-testid="welcome-text-container"
+              style="width: 320px;"
+            >
+              <h2>
+                Welcome to OpenLens 5!
+              </h2>
+              <p>
+                To get you started we have auto-detected your clusters in your
+                 
+                kubeconfig file and added them to the catalog, your centralized
+                 
+                view for managing all your cloud-native resources.
+                <br />
+                <br />
+                If you have any questions or feedback, please join our 
+                <a
+                  class="link"
+                  href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                  rel="noreferrer"
+                  target="_blank"
+                >
+                  Lens Community slack channel
+                </a>
+                .
+              </p>
+              <ul
+                class="block"
+                data-testid="welcome-menu-container"
+                style="width: 320px;"
+              >
+                <li
+                  class="flex grid-12"
+                >
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="view_list"
+                    >
+                      view_list
+                    </span>
+                  </i>
+                  <a
+                    class="box col-10"
+                  >
+                    Browse Clusters in Catalog
+                  </a>
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="navigate_next"
+                    >
+                      navigate_next
+                    </span>
+                  </i>
+                </li>
+              </ul>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
@@ -78,184 +213,236 @@ exports[`extensions - navigation using application menu renders 1`] = `
 exports[`extensions - navigation using application menu when navigating to extensions using application menu renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
+      >
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout DropFileInput Extensions"
+        data-testid="extensions-page"
       >
         <div
-          data-testid="app-update-not-available"
+          class="contentRegion"
+          id="ScrollSpyRoot"
         >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout DropFileInput Extensions"
-    data-testid="extensions-page"
-  >
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section>
-          <h1>
-            Extensions
-          </h1>
           <div
-            class="notice mb-14 mt-3"
+            class="content"
           >
-            <p>
-              Add new features via Lens Extensions. Check out the 
-              <a
-                href="https://docs.k8slens.dev/main/extensions/"
-                rel="noreferrer"
-                target="_blank"
-              >
-                docs
-              </a>
-               and list of 
-              <a
-                href="https://github.com/lensapp/lens-extensions/blob/main/README.md"
-                rel="noreferrer"
-                target="_blank"
-              >
-                available extensions
-              </a>
-              .
-            </p>
-          </div>
-          <section
-            class="mt-2"
-          >
-            <div
-              class="SubTitle"
-            >
-              Name or file path or URL to an extension package (tar, tgz)
-               
-            </div>
-            <div
-              class="flex"
-            >
+            <section>
+              <h1>
+                Extensions
+              </h1>
               <div
-                class="flex-1"
-              />
-              <div
-                class="flex-initial"
+                class="notice mb-14 mt-3"
               >
-                <button
-                  class="Button w-80 h-full primary"
-                  type="button"
+                <p>
+                  Add new features via Lens Extensions. Check out the 
+                  <a
+                    href="https://docs.k8slens.dev/main/extensions/"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    docs
+                  </a>
+                   and list of 
+                  <a
+                    href="https://github.com/lensapp/lens-extensions/blob/main/README.md"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    available extensions
+                  </a>
+                  .
+                </p>
+              </div>
+              <section
+                class="mt-2"
+              >
+                <div
+                  class="SubTitle"
                 >
-                  Install
-                </button>
+                  Name or file path or URL to an extension package (tar, tgz)
+                   
+                </div>
+                <div
+                  class="flex"
+                >
+                  <div
+                    class="flex-1"
+                  />
+                  <div
+                    class="flex-initial"
+                  >
+                    <button
+                      class="Button w-80 h-full primary"
+                      type="button"
+                    >
+                      Install
+                    </button>
+                  </div>
+                </div>
+                <small
+                  class="mt-3"
+                >
+                  <b>
+                    Pro-Tip
+                  </b>
+                  : you can drag-n-drop tarball-file to this area
+                </small>
+              </section>
+              <div>
+                <div
+                  class="Spinner singleColor center"
+                />
+              </div>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div>
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
               </div>
             </div>
-            <small
-              class="mt-3"
-            >
-              <b>
-                Pro-Tip
-              </b>
-              : you can drag-n-drop tarball-file to this area
-            </small>
-          </section>
-          <div>
-            <div
-              class="Spinner singleColor center"
-            />
-          </div>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div>
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
diff --git a/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
index 4717bd140d..3d1ebabd58 100644
--- a/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
@@ -4,386 +4,187 @@ exports[`add custom helm repository in preferences when navigating to preference
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -399,9 +200,9 @@ exports[`add custom helm repository in preferences when navigating to preference
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
                             class="Select__input-container css-jzldcf-Input"
@@ -409,7 +210,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
@@ -417,7 +218,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               autocorrect="off"
                               class="Select__input"
                               disabled=""
-                              id="selection-of-active-public-helm-repository"
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -430,20 +231,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                         <div
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
                           <span
                             class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
@@ -467,66 +254,331 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="pt-5 relative"
+                      class="flex-grow text-center"
                     >
-                      <div
-                        class="Spinner singleColor center"
-                        data-testid="helm-repositories-are-loading"
-                      />
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                              >
+                                <span
+                                  class="css-1xtdfmb-LoadingDot"
+                                />
+                                <span
+                                  class="css-zoievk-LoadingDot"
+                                />
+                                <span
+                                  class="css-x748d8-LoadingDot"
+                                />
+                              </div>
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="pt-5 relative"
+                        >
+                          <div
+                            class="Spinner singleColor center"
+                            data-testid="helm-repositories-are-loading"
+                          />
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -540,386 +592,187 @@ exports[`add custom helm repository in preferences when navigating to preference
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -928,31 +781,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                         class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        class="Select__control css-1s2u09g-control"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
                         <div
                           class="Select__value-container css-319lph-ValueContainer"
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
-                            class="Select__input-container css-6j8wv5-Input"
+                            class="Select__input-container css-jzldcf-Input"
                             data-value=""
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
                               autocomplete="off"
                               autocorrect="off"
                               class="Select__input"
-                              id="selection-of-active-public-helm-repository"
+                              disabled=""
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -966,7 +820,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
                           <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
                           <div
                             aria-hidden="true"
@@ -988,88 +842,338 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="item flex gaps align-center justify-space-between repo"
+                      class="flex-grow text-center"
                     >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some active repository"
-                        >
-                          Some active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some active repository"
+                            >
+                              Some active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -1083,386 +1187,187 @@ exports[`add custom helm repository in preferences when navigating to preference
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -1471,31 +1376,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                         class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        class="Select__control css-1s2u09g-control"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
                         <div
                           class="Select__value-container css-319lph-ValueContainer"
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
-                            class="Select__input-container css-6j8wv5-Input"
+                            class="Select__input-container css-jzldcf-Input"
                             data-value=""
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
                               autocomplete="off"
                               autocorrect="off"
                               class="Select__input"
-                              id="selection-of-active-public-helm-repository"
+                              disabled=""
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1509,7 +1415,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
                           <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
                           <div
                             aria-hidden="true"
@@ -1531,88 +1437,338 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="item flex gaps align-center justify-space-between repo"
+                      class="flex-grow text-center"
                     >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some active repository"
-                        >
-                          Some active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some active repository"
+                            >
+                              Some active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -1735,386 +1891,187 @@ exports[`add custom helm repository in preferences when navigating to preference
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -2123,31 +2080,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                         class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        class="Select__control css-1s2u09g-control"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
                         <div
                           class="Select__value-container css-319lph-ValueContainer"
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
-                            class="Select__input-container css-6j8wv5-Input"
+                            class="Select__input-container css-jzldcf-Input"
                             data-value=""
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
                               autocomplete="off"
                               autocorrect="off"
                               class="Select__input"
-                              id="selection-of-active-public-helm-repository"
+                              disabled=""
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2161,7 +2119,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
                           <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
                           <div
                             aria-hidden="true"
@@ -2183,88 +2141,338 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="item flex gaps align-center justify-space-between repo"
+                      class="flex-grow text-center"
                     >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some active repository"
-                        >
-                          Some active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some active repository"
+                            >
+                              Some active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -2286,386 +2494,187 @@ exports[`add custom helm repository in preferences when navigating to preference
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -2674,31 +2683,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                         class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        class="Select__control css-1s2u09g-control"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
                         <div
                           class="Select__value-container css-319lph-ValueContainer"
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
-                            class="Select__input-container css-6j8wv5-Input"
+                            class="Select__input-container css-jzldcf-Input"
                             data-value=""
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
                               autocomplete="off"
                               autocorrect="off"
                               class="Select__input"
-                              id="selection-of-active-public-helm-repository"
+                              disabled=""
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2712,7 +2722,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
                           <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
                           <div
                             aria-hidden="true"
@@ -2734,88 +2744,338 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="item flex gaps align-center justify-space-between repo"
+                      class="flex-grow text-center"
                     >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some active repository"
-                        >
-                          Some active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some active repository"
+                            >
+                              Some active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -2938,386 +3198,187 @@ exports[`add custom helm repository in preferences when navigating to preference
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -3326,31 +3387,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                         class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        class="Select__control css-1s2u09g-control"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
                         <div
                           class="Select__value-container css-319lph-ValueContainer"
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
-                            class="Select__input-container css-6j8wv5-Input"
+                            class="Select__input-container css-jzldcf-Input"
                             data-value=""
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
                               autocomplete="off"
                               autocorrect="off"
                               class="Select__input"
-                              id="selection-of-active-public-helm-repository"
+                              disabled=""
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -3364,7 +3426,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
                           <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
                           <div
                             aria-hidden="true"
@@ -3386,88 +3448,338 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="item flex gaps align-center justify-space-between repo"
+                      class="flex-grow text-center"
                     >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some active repository"
-                        >
-                          Some active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some active repository"
+                            >
+                              Some active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -3766,386 +4078,187 @@ exports[`add custom helm repository in preferences when navigating to preference
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -4154,31 +4267,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                         class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        class="Select__control css-1s2u09g-control"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
                         <div
                           class="Select__value-container css-319lph-ValueContainer"
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
-                            class="Select__input-container css-6j8wv5-Input"
+                            class="Select__input-container css-jzldcf-Input"
                             data-value=""
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
                               autocomplete="off"
                               autocorrect="off"
                               class="Select__input"
-                              id="selection-of-active-public-helm-repository"
+                              disabled=""
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -4192,7 +4306,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
                           <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
                           <div
                             aria-hidden="true"
@@ -4214,88 +4328,338 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="item flex gaps align-center justify-space-between repo"
+                      class="flex-grow text-center"
                     >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some active repository"
-                        >
-                          Some active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some active repository"
+                            >
+                              Some active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -4418,386 +4782,187 @@ exports[`add custom helm repository in preferences when navigating to preference
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -4806,31 +4971,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                         class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        class="Select__control css-1s2u09g-control"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
                         <div
                           class="Select__value-container css-319lph-ValueContainer"
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
-                            class="Select__input-container css-6j8wv5-Input"
+                            class="Select__input-container css-jzldcf-Input"
                             data-value=""
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
                               autocomplete="off"
                               autocorrect="off"
                               class="Select__input"
-                              id="selection-of-active-public-helm-repository"
+                              disabled=""
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -4844,7 +5010,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
                           <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
                           <div
                             aria-hidden="true"
@@ -4866,88 +5032,338 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="item flex gaps align-center justify-space-between repo"
+                      class="flex-grow text-center"
                     >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some active repository"
-                        >
-                          Some active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some active repository"
+                            >
+                              Some active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -5246,386 +5662,187 @@ exports[`add custom helm repository in preferences when navigating to preference
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -5634,31 +5851,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                         class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        class="Select__control css-1s2u09g-control"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
                         <div
                           class="Select__value-container css-319lph-ValueContainer"
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
-                            class="Select__input-container css-6j8wv5-Input"
+                            class="Select__input-container css-jzldcf-Input"
                             data-value=""
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
                               autocomplete="off"
                               autocorrect="off"
                               class="Select__input"
-                              id="selection-of-active-public-helm-repository"
+                              disabled=""
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -5672,7 +5890,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
                           <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
                           <div
                             aria-hidden="true"
@@ -5694,88 +5912,338 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="item flex gaps align-center justify-space-between repo"
+                      class="flex-grow text-center"
                     >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some active repository"
-                        >
-                          Some active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some active repository"
+                            >
+                              Some active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -5898,386 +6366,187 @@ exports[`add custom helm repository in preferences when navigating to preference
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -6286,31 +6555,32 @@ exports[`add custom helm repository in preferences when navigating to preference
                         class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        class="Select__control css-1s2u09g-control"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
                         <div
                           class="Select__value-container css-319lph-ValueContainer"
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
-                            class="Select__input-container css-6j8wv5-Input"
+                            class="Select__input-container css-jzldcf-Input"
                             data-value=""
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
                               autocomplete="off"
                               autocorrect="off"
                               class="Select__input"
-                              id="selection-of-active-public-helm-repository"
+                              disabled=""
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -6324,7 +6594,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
                           <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
                           <div
                             aria-hidden="true"
@@ -6346,88 +6616,338 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="item flex gaps align-center justify-space-between repo"
+                      class="flex-grow text-center"
                     >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some active repository"
-                        >
-                          Some active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some active repository"
+                            >
+                              Some active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -6449,386 +6969,187 @@ exports[`add custom helm repository in preferences when navigating to preference
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -6844,9 +7165,9 @@ exports[`add custom helm repository in preferences when navigating to preference
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
                             class="Select__input-container css-jzldcf-Input"
@@ -6854,7 +7175,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
@@ -6862,7 +7183,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               autocorrect="off"
                               class="Select__input"
                               disabled=""
-                              id="selection-of-active-public-helm-repository"
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -6875,20 +7196,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                         <div
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
                           <span
                             class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
@@ -6912,66 +7219,331 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="pt-5 relative"
+                      class="flex-grow text-center"
                     >
-                      <div
-                        class="Spinner singleColor center"
-                        data-testid="helm-repositories-are-loading"
-                      />
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                              >
+                                <span
+                                  class="css-1xtdfmb-LoadingDot"
+                                />
+                                <span
+                                  class="css-zoievk-LoadingDot"
+                                />
+                                <span
+                                  class="css-x748d8-LoadingDot"
+                                />
+                              </div>
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="pt-5 relative"
+                        >
+                          <div
+                            class="Spinner singleColor center"
+                            data-testid="helm-repositories-are-loading"
+                          />
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -6993,386 +7565,187 @@ exports[`add custom helm repository in preferences when navigating to preference
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -7388,9 +7761,9 @@ exports[`add custom helm repository in preferences when navigating to preference
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
                             class="Select__input-container css-jzldcf-Input"
@@ -7398,7 +7771,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
@@ -7406,7 +7779,7 @@ exports[`add custom helm repository in preferences when navigating to preference
                               autocorrect="off"
                               class="Select__input"
                               disabled=""
-                              id="selection-of-active-public-helm-repository"
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -7419,20 +7792,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                         <div
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
                           <span
                             class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
@@ -7456,66 +7815,331 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="pt-5 relative"
+                      class="flex-grow text-center"
                     >
-                      <div
-                        class="Spinner singleColor center"
-                        data-testid="helm-repositories-are-loading"
-                      />
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                              >
+                                <span
+                                  class="css-1xtdfmb-LoadingDot"
+                                />
+                                <span
+                                  class="css-zoievk-LoadingDot"
+                                />
+                                <span
+                                  class="css-x748d8-LoadingDot"
+                                />
+                              </div>
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="pt-5 relative"
+                        >
+                          <div
+                            class="Spinner singleColor center"
+                            data-testid="helm-repositories-are-loading"
+                          />
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
diff --git a/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
index ce90b64cb8..b6dc2a11c8 100644
--- a/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
@@ -4,386 +4,187 @@ exports[`add helm repository from list in preferences when navigating to prefere
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -399,9 +200,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
                             class="Select__input-container css-jzldcf-Input"
@@ -409,7 +210,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
@@ -417,7 +218,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               autocorrect="off"
                               class="Select__input"
                               disabled=""
-                              id="selection-of-active-public-helm-repository"
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -430,20 +231,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         <div
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
                           <span
                             class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
@@ -467,66 +254,331 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="pt-5 relative"
+                      class="flex-grow text-center"
                     >
-                      <div
-                        class="Spinner singleColor center"
-                        data-testid="helm-repositories-are-loading"
-                      />
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                              >
+                                <span
+                                  class="css-1xtdfmb-LoadingDot"
+                                />
+                                <span
+                                  class="css-zoievk-LoadingDot"
+                                />
+                                <span
+                                  class="css-x748d8-LoadingDot"
+                                />
+                              </div>
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="pt-5 relative"
+                        >
+                          <div
+                            class="Spinner singleColor center"
+                            data-testid="helm-repositories-are-loading"
+                          />
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -540,386 +592,187 @@ exports[`add helm repository from list in preferences when navigating to prefere
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -928,31 +781,32 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        class="Select__control css-1s2u09g-control"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
                         <div
                           class="Select__value-container css-319lph-ValueContainer"
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
-                            class="Select__input-container css-6j8wv5-Input"
+                            class="Select__input-container css-jzldcf-Input"
                             data-value=""
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
                               autocomplete="off"
                               autocorrect="off"
                               class="Select__input"
-                              id="selection-of-active-public-helm-repository"
+                              disabled=""
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -966,7 +820,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
                           <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
                           <div
                             aria-hidden="true"
@@ -988,88 +842,338 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="item flex gaps align-center justify-space-between repo"
+                      class="flex-grow text-center"
                     >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some already active repository"
-                        >
-                          Some already active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some already active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some already active repository"
+                            >
+                              Some already active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some already active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -1083,386 +1187,187 @@ exports[`add helm repository from list in preferences when navigating to prefere
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -1471,33 +1376,32 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        class="Select__control Select__control--menu-is-open css-1s2u09g-control"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
                         <div
                           class="Select__value-container css-319lph-ValueContainer"
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
-                            class="Select__input-container css-6j8wv5-Input"
+                            class="Select__input-container css-jzldcf-Input"
                             data-value=""
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="true"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
+                              aria-expanded="false"
                               aria-haspopup="true"
-                              aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
                               autocapitalize="none"
                               autocomplete="off"
                               autocorrect="off"
                               class="Select__input"
-                              id="selection-of-active-public-helm-repository"
+                              disabled=""
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1511,7 +1415,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
                           <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
                           <div
                             aria-hidden="true"
@@ -1533,88 +1437,340 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="item flex gaps align-center justify-space-between repo"
+                      class="flex-grow text-center"
                     >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some already active repository"
-                        >
-                          Some already active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some already active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--menu-is-open css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="true"
+                                  aria-haspopup="true"
+                                  aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some already active repository"
+                            >
+                              Some already active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some already active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -1679,1472 +1835,187 @@ exports[`add helm repository from list in preferences when navigating to prefere
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
-                      type="button"
-                    >
-                      Add Custom Helm Repo
-                    </button>
-                  </div>
-                  <div
-                    class="repos"
-                  >
-                    <div
-                      class="item flex gaps align-center justify-space-between repo"
-                    >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some already active repository"
-                        >
-                          Some already active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some already active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
-                    </div>
-                  </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
-            <div
-              data-testid="close-preferences"
-            >
-              <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
-              >
-                <i
-                  class="Icon icon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
-                  >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="Notifications flex column align-flex-end"
-    />
-  </div>
-</body>
-`;
-
-exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding rejects renders 1`] = `
-<body>
-  <div>
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      >
-        <div
-          class="item"
-        >
-          <div
-            data-testid="app-update-not-available"
-          >
-            No new updates available
-          </div>
-        </div>
-      </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
-        <div
-          class="sidebar"
-        >
-          <div
-            class="Tabs flex column"
-          >
-            <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
-                </div>
-                <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
-                  >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
-            >
-              <h2
-                data-testid="kubernetes-sync-header"
-              >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
-                >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
-                  >
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
-                      type="button"
-                    >
-                      Add Custom Helm Repo
-                    </button>
-                  </div>
-                  <div
-                    class="repos"
-                  >
-                    <div
-                      class="item flex gaps align-center justify-space-between repo"
-                    >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some already active repository"
-                        >
-                          Some already active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some already active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
-                    </div>
-                  </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
-            <div
-              data-testid="close-preferences"
-            >
-              <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
-              >
-                <i
-                  class="Icon icon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
-                  >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="Notifications flex column align-flex-end"
-    />
-  </div>
-</body>
-`;
-
-exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves renders 1`] = `
-<body>
-  <div>
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      >
-        <div
-          class="item"
-        >
-          <div
-            data-testid="app-update-not-available"
-          >
-            No new updates available
-          </div>
-        </div>
-      </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
-        <div
-          class="sidebar"
-        >
-          <div
-            class="Tabs flex column"
-          >
-            <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
-                </div>
-                <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
-                  >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
-            >
-              <h2
-                data-testid="kubernetes-sync-header"
-              >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
-                >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
-                  >
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -3160,9 +2031,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
                             class="Select__input-container css-jzldcf-Input"
@@ -3170,7 +2041,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
@@ -3178,10 +2049,10 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               autocorrect="off"
                               class="Select__input"
                               disabled=""
-                              id="selection-of-active-public-helm-repository"
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
-                              style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                               tabindex="0"
                               type="text"
                               value=""
@@ -3191,20 +2062,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         <div
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
                           <span
                             class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
@@ -3228,66 +2085,338 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="pt-5 relative"
+                      class="flex-grow text-center"
                     >
-                      <div
-                        class="Spinner singleColor center"
-                        data-testid="helm-repositories-are-loading"
-                      />
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some already active repository"
+                            >
+                              Some already active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some already active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -3297,390 +2426,191 @@ exports[`add helm repository from list in preferences when navigating to prefere
 </body>
 `;
 
-exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again renders 1`] = `
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding rejects renders 1`] = `
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -3689,606 +2619,32 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        class="Select__control css-1s2u09g-control"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
                         <div
                           class="Select__value-container css-319lph-ValueContainer"
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
-                            class="Select__input-container css-6j8wv5-Input"
+                            class="Select__input-container css-jzldcf-Input"
                             data-value=""
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
                               autocomplete="off"
                               autocorrect="off"
                               class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
-                      type="button"
-                    >
-                      Add Custom Helm Repo
-                    </button>
-                  </div>
-                  <div
-                    class="repos"
-                  >
-                    <div
-                      class="item flex gaps align-center justify-space-between repo"
-                    >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some already active repository"
-                        >
-                          Some already active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some already active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
-                    </div>
-                    <div
-                      class="item flex gaps align-center justify-space-between repo"
-                    >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some to be added repository"
-                        >
-                          Some to be added repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-other-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some to be added repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
-                    </div>
-                  </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
-            <div
-              data-testid="close-preferences"
-            >
-              <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
-              >
-                <i
-                  class="Icon icon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
-                  >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="Notifications flex column align-flex-end"
-    />
-  </div>
-</body>
-`;
-
-exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again when select for selecting active repositories is clicked renders 1`] = `
-<body>
-  <div>
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      >
-        <div
-          class="item"
-        >
-          <div
-            data-testid="app-update-not-available"
-          >
-            No new updates available
-          </div>
-        </div>
-      </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
-        <div
-          class="sidebar"
-        >
-          <div
-            class="Tabs flex column"
-          >
-            <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
-                </div>
-                <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
-                  >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
-            >
-              <h2
-                data-testid="kubernetes-sync-header"
-              >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
-                >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
-                  >
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control Select__control--menu-is-open css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="true"
-                              aria-haspopup="true"
-                              aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
+                              disabled=""
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -4302,7 +2658,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
                           <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
                           <div
                             aria-hidden="true"
@@ -4324,118 +2680,2178 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="item flex gaps align-center justify-space-between repo"
+                      class="flex-grow text-center"
                     >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some already active repository"
-                        >
-                          Some already active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some already active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
-                    </div>
-                    <div
-                      class="item flex gaps align-center justify-space-between repo"
-                    >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some to be added repository"
-                        >
-                          Some to be added repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-other-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some to be added repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some already active repository"
+                            >
+                              Some already active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some already active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  class="header"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="kubernetes"
+              >
+                <section
+                  id="kubectl"
+                >
+                  <h2
+                    data-testid="kubernetes-header"
+                  >
+                    Kubernetes
+                  </h2>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-download-mirror-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
+                          >
+                            Download mirror for kubectl
+                          </div>
+                          <div
+                            class="Select__input-container css-jzldcf-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              disabled=""
+                              id="download-mirror-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
+                    <button
+                      class="Button PathPicker primary"
+                      type="button"
+                    >
+                      Sync Files and Folders
+                    </button>
+                  </div>
+                  <div
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
+                  >
+                    <div
+                      class="flex-grow text-center"
+                    >
+                      No files and folders have been synced yet
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                              >
+                                <span
+                                  class="css-1xtdfmb-LoadingDot"
+                                />
+                                <span
+                                  class="css-zoievk-LoadingDot"
+                                />
+                                <span
+                                  class="css-x748d8-LoadingDot"
+                                />
+                              </div>
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="pt-5 relative"
+                        >
+                          <div
+                            class="Spinner singleColor center"
+                            data-testid="helm-repositories-are-loading"
+                          />
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  class="header"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="kubernetes"
+              >
+                <section
+                  id="kubectl"
+                >
+                  <h2
+                    data-testid="kubernetes-header"
+                  >
+                    Kubernetes
+                  </h2>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-download-mirror-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
+                          >
+                            Download mirror for kubectl
+                          </div>
+                          <div
+                            class="Select__input-container css-jzldcf-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              disabled=""
+                              id="download-mirror-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
+                    <button
+                      class="Button PathPicker primary"
+                      type="button"
+                    >
+                      Sync Files and Folders
+                    </button>
+                  </div>
+                  <div
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
+                  >
+                    <div
+                      class="flex-grow text-center"
+                    >
+                      No files and folders have been synced yet
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some already active repository"
+                            >
+                              Some already active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some already active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some to be added repository"
+                            >
+                              Some to be added repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-other-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some to be added repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again when select for selecting active repositories is clicked renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  class="header"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="kubernetes"
+              >
+                <section
+                  id="kubectl"
+                >
+                  <h2
+                    data-testid="kubernetes-header"
+                  >
+                    Kubernetes
+                  </h2>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-download-mirror-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
+                          >
+                            Download mirror for kubectl
+                          </div>
+                          <div
+                            class="Select__input-container css-jzldcf-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              disabled=""
+                              id="download-mirror-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
+                    <button
+                      class="Button PathPicker primary"
+                      type="button"
+                    >
+                      Sync Files and Folders
+                    </button>
+                  </div>
+                  <div
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
+                  >
+                    <div
+                      class="flex-grow text-center"
+                    >
+                      No files and folders have been synced yet
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--menu-is-open css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-controls="react-select-selection-of-active-public-helm-repository-listbox"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="true"
+                                  aria-haspopup="true"
+                                  aria-owns="react-select-selection-of-active-public-helm-repository-listbox"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some already active repository"
+                            >
+                              Some already active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some already active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some to be added repository"
+                            >
+                              Some to be added repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-other-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some to be added repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -4510,959 +4926,187 @@ exports[`add helm repository from list in preferences when navigating to prefere
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
-                      type="button"
-                    >
-                      Add Custom Helm Repo
-                    </button>
-                  </div>
-                  <div
-                    class="repos"
-                  >
-                    <div
-                      class="item flex gaps align-center justify-space-between repo"
-                    >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some already active repository"
-                        >
-                          Some already active repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some already active repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
-                    </div>
-                    <div
-                      class="item flex gaps align-center justify-space-between repo"
-                    >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-Some to be added repository"
-                        >
-                          Some to be added repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-other-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-Some to be added repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
-                    </div>
-                  </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
-            <div
-              data-testid="close-preferences"
-            >
-              <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
-              >
-                <i
-                  class="Icon icon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
-                  >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="Notifications flex column align-flex-end"
-    />
-  </div>
-</body>
-`;
-
-exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again when select for selecting active repositories is clicked when active repository is selected when removing resolves renders 1`] = `
-<body>
-  <div>
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      >
-        <div
-          class="item"
-        >
-          <div
-            data-testid="app-update-not-available"
-          >
-            No new updates available
-          </div>
-        </div>
-      </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
-        <div
-          class="sidebar"
-        >
-          <div
-            class="Tabs flex column"
-          >
-            <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
-                </div>
-                <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
-                  >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
-            >
-              <h2
-                data-testid="kubernetes-sync-header"
-              >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
-                >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
-                  >
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -5478,9 +5122,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
                             class="Select__input-container css-jzldcf-Input"
@@ -5488,7 +5132,7 @@ exports[`add helm repository from list in preferences when navigating to prefere
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
@@ -5496,10 +5140,10 @@ exports[`add helm repository from list in preferences when navigating to prefere
                               autocorrect="off"
                               class="Select__input"
                               disabled=""
-                              id="selection-of-active-public-helm-repository"
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
-                              style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
                               tabindex="0"
                               type="text"
                               value=""
@@ -5509,20 +5153,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         <div
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
                           <span
                             class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
@@ -5546,66 +5176,956 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="pt-5 relative"
+                      class="flex-grow text-center"
                     >
-                      <div
-                        class="Spinner singleColor center"
-                        data-testid="helm-repositories-are-loading"
-                      />
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some already active repository"
+                            >
+                              Some already active repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some already active repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-Some to be added repository"
+                            >
+                              Some to be added repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-other-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-Some to be added repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again when select for selecting active repositories is clicked when active repository is selected when removing resolves renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  class="header"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="kubernetes"
+              >
+                <section
+                  id="kubectl"
+                >
+                  <h2
+                    data-testid="kubernetes-header"
+                  >
+                    Kubernetes
+                  </h2>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-download-mirror-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
+                          >
+                            Download mirror for kubectl
+                          </div>
+                          <div
+                            class="Select__input-container css-jzldcf-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              disabled=""
+                              id="download-mirror-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
+                    <button
+                      class="Button PathPicker primary"
+                      type="button"
+                    >
+                      Sync Files and Folders
+                    </button>
+                  </div>
+                  <div
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
+                  >
+                    <div
+                      class="flex-grow text-center"
+                    >
+                      No files and folders have been synced yet
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 0; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                              >
+                                <span
+                                  class="css-1xtdfmb-LoadingDot"
+                                />
+                                <span
+                                  class="css-zoievk-LoadingDot"
+                                />
+                                <span
+                                  class="css-x748d8-LoadingDot"
+                                />
+                              </div>
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="pt-5 relative"
+                        >
+                          <div
+                            class="Spinner singleColor center"
+                            data-testid="helm-repositories-are-loading"
+                          />
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
diff --git a/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
index 582f997ac1..e9ab4d90d3 100644
--- a/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
@@ -4,386 +4,187 @@ exports[`listing active helm repositories in preferences when navigating to pref
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -399,9 +200,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
                             class="Select__input-container css-jzldcf-Input"
@@ -409,7 +210,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
@@ -417,7 +218,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               autocorrect="off"
                               class="Select__input"
                               disabled=""
-                              id="selection-of-active-public-helm-repository"
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -430,20 +231,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         <div
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
                           <span
                             class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
@@ -467,66 +254,331 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="pt-5 relative"
+                      class="flex-grow text-center"
                     >
-                      <div
-                        class="Spinner singleColor center"
-                        data-testid="helm-repositories-are-loading"
-                      />
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                              >
+                                <span
+                                  class="css-1xtdfmb-LoadingDot"
+                                />
+                                <span
+                                  class="css-zoievk-LoadingDot"
+                                />
+                                <span
+                                  class="css-x748d8-LoadingDot"
+                                />
+                              </div>
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="pt-5 relative"
+                        >
+                          <div
+                            class="Spinner singleColor center"
+                            data-testid="helm-repositories-are-loading"
+                          />
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -540,386 +592,187 @@ exports[`listing active helm repositories in preferences when navigating to pref
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -935,9 +788,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
                             class="Select__input-container css-jzldcf-Input"
@@ -945,7 +798,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
@@ -953,7 +806,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               autocorrect="off"
                               class="Select__input"
                               disabled=""
-                              id="selection-of-active-public-helm-repository"
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -966,20 +819,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         <div
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
                           <span
                             class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
@@ -1003,66 +842,331 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="pt-5 relative"
+                      class="flex-grow text-center"
                     >
-                      <div
-                        class="Spinner singleColor center"
-                        data-testid="helm-repositories-are-loading"
-                      />
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                              >
+                                <span
+                                  class="css-1xtdfmb-LoadingDot"
+                                />
+                                <span
+                                  class="css-zoievk-LoadingDot"
+                                />
+                                <span
+                                  class="css-x748d8-LoadingDot"
+                                />
+                              </div>
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="pt-5 relative"
+                        >
+                          <div
+                            class="Spinner singleColor center"
+                            data-testid="helm-repositories-are-loading"
+                          />
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -1076,421 +1180,473 @@ exports[`listing active helm repositories in preferences when navigating to pref
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="kubernetes"
+              >
+                <section
+                  id="kubectl"
+                >
+                  <h2
+                    data-testid="kubernetes-header"
+                  >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="SubTitle"
                     >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
                     </div>
                     <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-download-mirror-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
+                          >
+                            Download mirror for kubectl
+                          </div>
+                          <div
+                            class="Select__input-container css-jzldcf-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              disabled=""
+                              id="download-mirror-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
-                        </svg>
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
+                    <button
+                      class="Button PathPicker primary"
+                      type="button"
+                    >
+                      Sync Files and Folders
+                    </button>
+                  </div>
+                  <div
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
+                  >
+                    <div
+                      class="flex-grow text-center"
+                    >
+                      No files and folders have been synced yet
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      class="notice"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        Error updating Helm repositories: Some error
                       </div>
                     </div>
                   </div>
-                </div>
+                </section>
               </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+            </div>
+            <div
+              class="toolsRegion"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
-              >
-                Kubeconfig Syncs
-              </h2>
               <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
-                >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
+                class="fixed top-[60px]"
               >
                 <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  class="notice"
+                  data-testid="close-preferences"
                 >
                   <div
-                    class="flex-grow text-center"
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    Error updating Helm repositories: Some error
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
                   </div>
                 </div>
               </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
-            <div
-              data-testid="close-preferences"
-            >
-              <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
-              >
-                <i
-                  class="Icon icon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
-                  >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
-              </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -1504,386 +1660,187 @@ exports[`listing active helm repositories in preferences when navigating to pref
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -1899,9 +1856,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
                             class="Select__input-container css-jzldcf-Input"
@@ -1909,7 +1866,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
@@ -1917,7 +1874,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               autocorrect="off"
                               class="Select__input"
                               disabled=""
-                              id="selection-of-active-public-helm-repository"
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1930,20 +1887,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         <div
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
                           <span
                             class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
@@ -1967,66 +1910,331 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="pt-5 relative"
+                      class="flex-grow text-center"
                     >
-                      <div
-                        class="Spinner singleColor center"
-                        data-testid="helm-repositories-are-loading"
-                      />
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                              >
+                                <span
+                                  class="css-1xtdfmb-LoadingDot"
+                                />
+                                <span
+                                  class="css-zoievk-LoadingDot"
+                                />
+                                <span
+                                  class="css-x748d8-LoadingDot"
+                                />
+                              </div>
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="pt-5 relative"
+                        >
+                          <div
+                            class="Spinner singleColor center"
+                            data-testid="helm-repositories-are-loading"
+                          />
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -2040,814 +2248,187 @@ exports[`listing active helm repositories in preferences when navigating to pref
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="kubernetes"
+              >
+                <section
+                  id="kubectl"
+                >
+                  <h2
+                    data-testid="kubernetes-header"
+                  >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="SubTitle"
                     >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
+                      Kubectl binary download
+                       
                     </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    <label
+                      class="Switch"
+                      data-testid="switch"
                     >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
                       />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
-            >
-              <h2
-                data-testid="kubernetes-sync-header"
-              >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
-                >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  class="notice"
-                >
-                  <div
-                    class="flex-grow text-center"
-                  >
-                    Error when adding default Helm repository: Some error
-                  </div>
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
-            <div
-              data-testid="close-preferences"
-            >
-              <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
-              >
-                <i
-                  class="Icon icon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
-                  >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="Notifications flex column align-flex-end"
-    />
-  </div>
-</body>
-`;
-
-exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories reject with error about no existing repositories when adding of default repository resolves renders 1`] = `
-<body>
-  <div>
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      >
-        <div
-          class="item"
-        >
-          <div
-            data-testid="app-update-not-available"
-          >
-            No new updates available
-          </div>
-        </div>
-      </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
-        <div
-          class="sidebar"
-        >
-          <div
-            class="Tabs flex column"
-          >
-            <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
-                </div>
-                <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
-                  >
+                    </label>
+                  </section>
+                  <section>
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="SubTitle"
                     >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
+                      Download mirror
+                       
                     </div>
                     <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
-            >
-              <h2
-                data-testid="kubernetes-sync-header"
-              >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
-                >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
-                  >
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -2863,9 +2444,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
                             class="Select__input-container css-jzldcf-Input"
@@ -2873,7 +2454,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
@@ -2881,7 +2462,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                               autocorrect="off"
                               class="Select__input"
                               disabled=""
-                              id="selection-of-active-public-helm-repository"
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2894,20 +2475,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         <div
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
                           <span
                             class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
@@ -2931,66 +2498,223 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="pt-5 relative"
+                      class="flex-grow text-center"
                     >
-                      <div
-                        class="Spinner singleColor center"
-                        data-testid="helm-repositories-are-loading"
-                      />
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      class="notice"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        Error when adding default Helm repository: Some error
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -3000,390 +2724,191 @@ exports[`listing active helm repositories in preferences when navigating to pref
 </body>
 `;
 
-exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories resolve when repositories resolves renders 1`] = `
+exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories reject with error about no existing repositories when adding of default repository resolves renders 1`] = `
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -3392,31 +2917,32 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        class="Select__control css-1s2u09g-control"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
                         <div
                           class="Select__value-container css-319lph-ValueContainer"
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
-                            class="Select__input-container css-6j8wv5-Input"
+                            class="Select__input-container css-jzldcf-Input"
                             data-value=""
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
                               autocomplete="off"
                               autocorrect="off"
                               class="Select__input"
-                              id="selection-of-active-public-helm-repository"
+                              disabled=""
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -3430,7 +2956,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
                           <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
                           <div
                             aria-hidden="true"
@@ -3452,118 +2978,956 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="item flex gaps align-center justify-space-between repo"
+                      class="flex-grow text-center"
                     >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-some-repository"
-                        >
-                          some-repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-repository-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-some-repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
-                    </div>
-                    <div
-                      class="item flex gaps align-center justify-space-between repo"
-                    >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-some-other-repository"
-                        >
-                          some-other-repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-other-repository-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-some-other-repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                              >
+                                <span
+                                  class="css-1xtdfmb-LoadingDot"
+                                />
+                                <span
+                                  class="css-zoievk-LoadingDot"
+                                />
+                                <span
+                                  class="css-x748d8-LoadingDot"
+                                />
+                              </div>
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="pt-5 relative"
+                        >
+                          <div
+                            class="Spinner singleColor center"
+                            data-testid="helm-repositories-are-loading"
+                          />
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories resolve when repositories resolves renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  class="header"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="kubernetes"
+              >
+                <section
+                  id="kubectl"
+                >
+                  <h2
+                    data-testid="kubernetes-header"
+                  >
+                    Kubernetes
+                  </h2>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-download-mirror-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
+                          >
+                            Download mirror for kubectl
+                          </div>
+                          <div
+                            class="Select__input-container css-jzldcf-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              disabled=""
+                              id="download-mirror-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
+                    <button
+                      class="Button PathPicker primary"
+                      type="button"
+                    >
+                      Sync Files and Folders
+                    </button>
+                  </div>
+                  <div
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
+                  >
+                    <div
+                      class="flex-grow text-center"
+                    >
+                      No files and folders have been synced yet
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-some-repository"
+                            >
+                              some-repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-repository-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-some-repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-some-other-repository"
+                            >
+                              some-other-repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-other-repository-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-some-other-repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -3577,421 +3941,473 @@ exports[`listing active helm repositories in preferences when navigating to pref
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="kubernetes"
+              >
+                <section
+                  id="kubectl"
+                >
+                  <h2
+                    data-testid="kubernetes-header"
+                  >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="SubTitle"
                     >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
                     </div>
                     <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-download-mirror-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
+                          >
+                            Download mirror for kubectl
+                          </div>
+                          <div
+                            class="Select__input-container css-jzldcf-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              disabled=""
+                              id="download-mirror-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
-                        </svg>
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
+                    <button
+                      class="Button PathPicker primary"
+                      type="button"
+                    >
+                      Sync Files and Folders
+                    </button>
+                  </div>
+                  <div
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
+                  >
+                    <div
+                      class="flex-grow text-center"
+                    >
+                      No files and folders have been synced yet
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      class="notice"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in \`$ helm env\`.
                       </div>
                     </div>
                   </div>
-                </div>
+                </section>
               </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+            </div>
+            <div
+              class="toolsRegion"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
-              >
-                Kubeconfig Syncs
-              </h2>
               <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
-                >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
+                class="fixed top-[60px]"
               >
                 <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  class="notice"
+                  data-testid="close-preferences"
                 >
                   <div
-                    class="flex-grow text-center"
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in \`$ helm env\`.
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
                   </div>
                 </div>
               </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
-            <div
-              data-testid="close-preferences"
-            >
-              <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
-              >
-                <i
-                  class="Icon icon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
-                  >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
-              </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -4005,421 +4421,473 @@ exports[`listing active helm repositories in preferences when navigating to pref
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="kubernetes"
+              >
+                <section
+                  id="kubectl"
+                >
+                  <h2
+                    data-testid="kubernetes-header"
+                  >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="SubTitle"
                     >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
                     </div>
                     <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-download-mirror-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
+                          >
+                            Download mirror for kubectl
+                          </div>
+                          <div
+                            class="Select__input-container css-jzldcf-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              disabled=""
+                              id="download-mirror-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
-                        </svg>
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
+                    <button
+                      class="Button PathPicker primary"
+                      type="button"
+                    >
+                      Sync Files and Folders
+                    </button>
+                  </div>
+                  <div
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
+                  >
+                    <div
+                      class="flex-grow text-center"
+                    >
+                      No files and folders have been synced yet
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      class="notice"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in \`$ helm env\`.
                       </div>
                     </div>
                   </div>
-                </div>
+                </section>
               </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+            </div>
+            <div
+              class="toolsRegion"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
-              >
-                Kubeconfig Syncs
-              </h2>
               <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
-                >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
+                class="fixed top-[60px]"
               >
                 <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  class="notice"
+                  data-testid="close-preferences"
                 >
                   <div
-                    class="flex-grow text-center"
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in \`$ helm env\`.
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
                   </div>
                 </div>
               </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
-            <div
-              data-testid="close-preferences"
-            >
-              <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
-              >
-                <i
-                  class="Icon icon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
-                  >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
-              </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -4433,421 +4901,473 @@ exports[`listing active helm repositories in preferences when navigating to pref
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="kubernetes"
+              >
+                <section
+                  id="kubectl"
+                >
+                  <h2
+                    data-testid="kubernetes-header"
+                  >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select__value-container css-319lph-ValueContainer"
+                      class="SubTitle"
                     >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
                     </div>
                     <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-download-mirror-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
                       />
                       <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
                       >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
                         >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
+                          >
+                            Download mirror for kubectl
+                          </div>
+                          <div
+                            class="Select__input-container css-jzldcf-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              disabled=""
+                              id="download-mirror-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
-                        </svg>
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
+                    <button
+                      class="Button PathPicker primary"
+                      type="button"
+                    >
+                      Sync Files and Folders
+                    </button>
+                  </div>
+                  <div
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
+                  >
+                    <div
+                      class="flex-grow text-center"
+                    >
+                      No files and folders have been synced yet
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      class="notice"
+                    >
+                      <div
+                        class="flex-grow text-center"
+                      >
+                        Error getting Helm configuration: some-error
                       </div>
                     </div>
                   </div>
-                </div>
+                </section>
               </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+            </div>
+            <div
+              class="toolsRegion"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
-              >
-                Kubeconfig Syncs
-              </h2>
               <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
-                >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
+                class="fixed top-[60px]"
               >
                 <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  class="notice"
+                  data-testid="close-preferences"
                 >
                   <div
-                    class="flex-grow text-center"
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    Error getting Helm configuration: some-error
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
                   </div>
                 </div>
               </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
-            <div
-              data-testid="close-preferences"
-            >
-              <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
-              >
-                <i
-                  class="Icon icon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
-                  >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
-              </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
diff --git a/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap
index 27fc9c463b..8fbc3d9a49 100644
--- a/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap
@@ -3,451 +3,586 @@
 exports[`helm-charts - navigation to Helm charts when navigating to Helm charts renders 1`] = `
 <div>
   <div
-    class="flex flex-col"
-    data-testid="cluster-sidebar"
-  >
-    <div
-      class="SidebarCluster"
-    >
-      <div
-        class="Avatar rounded loadingAvatar"
-        style="width: 40px; height: 40px;"
-      >
-        ??
-      </div>
-      <div
-        class="loadingClusterName"
-      />
-    </div>
-    <div
-      class="sidebarNav sidebar-active-status"
-    >
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-workloads"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-workloads"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Workloads
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-config"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-config"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="list"
-            >
-              list
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Config
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-network"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-network"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="device_hub"
-            >
-              device_hub
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Network
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-storage"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-storage"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="storage"
-            >
-              storage
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Storage
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="true"
-        data-testid="sidebar-item-helm"
-      >
-        <a
-          aria-current="page"
-          class="nav-item flex gaps align-center expandable active"
-          data-testid="sidebar-item-link-for-helm"
-          href="/"
-        >
-          <i
-            class="Icon svg focusable"
-          >
-            <span
-              class="icon"
-            />
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Helm
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-user-management"
-      >
-        <a
-          class="nav-item flex gaps align-center"
-          data-testid="sidebar-item-link-for-user-management"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="security"
-            >
-              security
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Access Control
-          </span>
-        </a>
-      </div>
-      <div
-        class="SidebarItem"
-        data-is-active-test="false"
-        data-testid="sidebar-item-custom-resources"
-      >
-        <a
-          class="nav-item flex gaps align-center expandable"
-          data-testid="sidebar-item-link-for-custom-resources"
-          href="/"
-        >
-          <i
-            class="Icon material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="extension"
-            >
-              extension
-            </span>
-          </i>
-          <span
-            class="link-text box grow"
-          >
-            Custom Resources
-          </span>
-          <i
-            class="Icon expand-icon box right material focusable"
-          >
-            <span
-              class="icon"
-              data-icon-name="keyboard_arrow_down"
-            >
-              keyboard_arrow_down
-            </span>
-          </i>
-        </a>
-      </div>
-    </div>
-  </div>
+    class="Notifications flex column align-flex-end"
+  />
   <div
-    class="TabLayout"
-    data-testid="tab-layout"
+    class="mainLayout"
+    style="--sidebar-width: 200px;"
   >
     <div
-      class="Tabs center scrollable"
+      class="sidebar"
     >
       <div
-        class="Tab flex gaps align-center active"
-        data-is-active-test="true"
-        data-testid="tab-link-for-charts"
-        role="tab"
-        tabindex="0"
+        class="flex flex-col"
+        data-testid="cluster-sidebar"
       >
         <div
-          class="label"
-        >
-          Charts
-        </div>
-      </div>
-      <div
-        class="Tab flex gaps align-center"
-        data-is-active-test="false"
-        data-testid="tab-link-for-releases"
-        role="tab"
-        tabindex="0"
-      >
-        <div
-          class="label"
-        >
-          Releases
-        </div>
-      </div>
-    </div>
-    <main>
-      <div
-        data-testid="page-for-helm-charts"
-        style="display: none;"
-      />
-      <div
-        class="ItemListLayout flex column HelmCharts"
-      >
-        <div
-          class="header flex gaps align-center"
+          class="SidebarCluster"
         >
           <div
-            class="Input SearchInput focused"
+            class="Avatar rounded loadingAvatar"
+            style="width: 40px; height: 40px;"
           >
-            <label
-              class="input-area flex gaps align-center"
-              id=""
+            ??
+          </div>
+          <div
+            class="loadingClusterName"
+          />
+        </div>
+        <div
+          class="sidebarNav sidebar-active-status"
+        >
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-workloads"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-workloads"
+              href="/"
             >
-              <input
-                class="input box grow"
-                placeholder="Search Helm Charts..."
-                spellcheck="false"
-                value=""
-              />
               <i
-                class="Icon material focusable small"
+                class="Icon svg focusable"
               >
                 <span
                   class="icon"
-                  data-icon-name="search"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Workloads
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
                 >
-                  search
+                  keyboard_arrow_down
                 </span>
               </i>
-            </label>
-            <div
-              class="input-info flex gaps"
-            />
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-config"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-config"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="list"
+                >
+                  list
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Config
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-network"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-network"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="device_hub"
+                >
+                  device_hub
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Network
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-storage"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-storage"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="storage"
+                >
+                  storage
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Storage
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="true"
+            data-testid="sidebar-item-helm"
+          >
+            <a
+              aria-current="page"
+              class="nav-item flex gaps align-center expandable active"
+              data-testid="sidebar-item-link-for-helm"
+              href="/"
+            >
+              <i
+                class="Icon svg focusable"
+              >
+                <span
+                  class="icon"
+                />
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Helm
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-user-management"
+          >
+            <a
+              class="nav-item flex gaps align-center"
+              data-testid="sidebar-item-link-for-user-management"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="security"
+                >
+                  security
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Access Control
+              </span>
+            </a>
+          </div>
+          <div
+            class="SidebarItem"
+            data-is-active-test="false"
+            data-testid="sidebar-item-custom-resources"
+          >
+            <a
+              class="nav-item flex gaps align-center expandable"
+              data-testid="sidebar-item-link-for-custom-resources"
+              href="/"
+            >
+              <i
+                class="Icon material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="extension"
+                >
+                  extension
+                </span>
+              </i>
+              <span
+                class="link-text box grow"
+              >
+                Custom Resources
+              </span>
+              <i
+                class="Icon expand-icon box right material focusable"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="keyboard_arrow_down"
+                >
+                  keyboard_arrow_down
+                </span>
+              </i>
+            </a>
           </div>
         </div>
+      </div>
+      <div
+        class="ResizingAnchor horizontal trailing"
+      />
+    </div>
+    <div
+      class="contents"
+    >
+      <div
+        class="TabLayout"
+        data-testid="tab-layout"
+      >
         <div
-          class="items box grow flex column"
+          class="Tabs center scrollable"
         >
           <div
-            class="Table flex column HelmCharts box grow dark selectable scrollable sortable autoSize virtual"
+            class="Tab flex gaps align-center active"
+            data-is-active-test="true"
+            data-testid="tab-link-for-charts"
+            role="tab"
+            tabindex="0"
           >
             <div
-              class="TableHead sticky nowrap topLine"
+              class="label"
+            >
+              Charts
+            </div>
+          </div>
+          <div
+            class="Tab flex gaps align-center"
+            data-is-active-test="false"
+            data-testid="tab-link-for-releases"
+            role="tab"
+            tabindex="0"
+          >
+            <div
+              class="label"
+            >
+              Releases
+            </div>
+          </div>
+        </div>
+        <main>
+          <div
+            data-testid="page-for-helm-charts"
+            style="display: none;"
+          />
+          <div
+            class="ItemListLayout flex column HelmCharts"
+          >
+            <div
+              class="header flex gaps align-center"
             >
               <div
-                class="TableCell icon nowrap"
+                class="Input SearchInput focused"
               >
-                <div
-                  class="content"
-                />
-              </div>
-              <div
-                class="TableCell name nowrap sorting"
-                id="name"
-              >
-                <div
-                  class="content"
-                >
-                  Name
-                </div>
-                <i
-                  class="Icon sortIcon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="arrow_drop_down"
-                  >
-                    arrow_drop_down
-                  </span>
-                </i>
-              </div>
-              <div
-                class="TableCell description nowrap"
-                id="description"
-              >
-                <div
-                  class="content"
-                >
-                  Description
-                </div>
-              </div>
-              <div
-                class="TableCell version nowrap"
-                id="version"
-              >
-                <div
-                  class="content"
-                >
-                  Version
-                </div>
-              </div>
-              <div
-                class="TableCell app-version nowrap"
-                id="app-version"
-              >
-                <div
-                  class="content"
-                >
-                  App Version
-                </div>
-              </div>
-              <div
-                class="TableCell repository nowrap sorting"
-                id="repo"
-              >
-                <div
-                  class="content"
-                >
-                  Repository
-                </div>
-                <i
-                  class="Icon sortIcon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="arrow_drop_down"
-                  >
-                    arrow_drop_down
-                  </span>
-                </i>
-              </div>
-              <div
-                class="TableCell menu nowrap"
-              >
-                <div
-                  class="content"
+                <label
+                  class="input-area flex gaps align-center"
+                  id=""
                 >
+                  <input
+                    class="input box grow"
+                    placeholder="Search Helm Charts..."
+                    spellcheck="false"
+                    value=""
+                  />
                   <i
-                    class="Icon material interactive focusable"
-                    id="menu_actions_17"
-                    tabindex="0"
+                    class="Icon material focusable small"
                   >
                     <span
                       class="icon"
-                      data-icon-name="more_vert"
+                      data-icon-name="search"
                     >
-                      more_vert
+                      search
                     </span>
                   </i>
-                </div>
+                </label>
+                <div
+                  class="input-info flex gaps"
+                />
               </div>
             </div>
             <div
-              class="NoItems flex box grow"
+              class="items box grow flex column"
             >
               <div
-                class="box center"
+                class="Table flex column HelmCharts box grow dark selectable scrollable sortable autoSize virtual"
               >
-                Item list is empty
+                <div
+                  class="TableHead sticky nowrap topLine"
+                >
+                  <div
+                    class="TableCell icon nowrap"
+                  >
+                    <div
+                      class="content"
+                    />
+                  </div>
+                  <div
+                    class="TableCell name nowrap sorting"
+                    id="name"
+                  >
+                    <div
+                      class="content"
+                    >
+                      Name
+                    </div>
+                    <i
+                      class="Icon sortIcon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="arrow_drop_down"
+                      >
+                        arrow_drop_down
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    class="TableCell description nowrap"
+                    id="description"
+                  >
+                    <div
+                      class="content"
+                    >
+                      Description
+                    </div>
+                  </div>
+                  <div
+                    class="TableCell version nowrap"
+                    id="version"
+                  >
+                    <div
+                      class="content"
+                    >
+                      Version
+                    </div>
+                  </div>
+                  <div
+                    class="TableCell app-version nowrap"
+                    id="app-version"
+                  >
+                    <div
+                      class="content"
+                    >
+                      App Version
+                    </div>
+                  </div>
+                  <div
+                    class="TableCell repository nowrap sorting"
+                    id="repo"
+                  >
+                    <div
+                      class="content"
+                    >
+                      Repository
+                    </div>
+                    <i
+                      class="Icon sortIcon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="arrow_drop_down"
+                      >
+                        arrow_drop_down
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    class="TableCell menu nowrap"
+                  >
+                    <div
+                      class="content"
+                    >
+                      <i
+                        class="Icon material interactive focusable"
+                        id="menu_actions_27"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="more_vert"
+                        >
+                          more_vert
+                        </span>
+                      </i>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="NoItems flex box grow"
+                >
+                  <div
+                    class="box center"
+                  >
+                    Item list is empty
+                  </div>
+                </div>
+              </div>
+              <div
+                class="AddRemoveButtons flex gaps"
+              />
+            </div>
+          </div>
+        </main>
+      </div>
+    </div>
+    <div
+      class="footer"
+    >
+      <div
+        class="Dock"
+        tabindex="-1"
+      >
+        <div
+          class="ResizingAnchor vertical leading"
+        />
+        <div
+          class="tabs-container flex align-center"
+        >
+          <div
+            class="dockTabs"
+            role="tablist"
+          >
+            <div
+              class="Tabs tabs"
+            >
+              <div
+                class="Tab flex gaps align-center DockTab TerminalTab active"
+                id="tab-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <i
+                  class="Icon material focusable"
+                >
+                  <span
+                    class="icon"
+                    data-icon-name="terminal"
+                  >
+                    terminal
+                  </span>
+                </i>
+                <div
+                  class="label"
+                >
+                  <div
+                    class="flex align-center"
+                  >
+                    <span
+                      class="title"
+                    >
+                      Terminal
+                    </span>
+                    <div
+                      class="close"
+                    >
+                      <i
+                        class="Icon material interactive focusable small"
+                        id="tooltip_target_13"
+                        tabindex="0"
+                      >
+                        <span
+                          class="icon"
+                          data-icon-name="close"
+                        >
+                          close
+                        </span>
+                        <div />
+                      </i>
+                    </div>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
           <div
-            class="AddRemoveButtons flex gaps"
-          />
+            class="toolbar flex gaps align-center box grow"
+          >
+            <div
+              class="dock-menu box grow"
+            >
+              <i
+                class="Icon new-dock-tab material interactive focusable"
+                id="menu_actions_14"
+                tabindex="0"
+              >
+                <span
+                  class="icon"
+                  data-icon-name="add"
+                >
+                  add
+                </span>
+                <div />
+              </i>
+            </div>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_16"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="fullscreen"
+              >
+                fullscreen
+              </span>
+              <div />
+            </i>
+            <i
+              class="Icon material interactive focusable"
+              id="tooltip_target_17"
+              tabindex="0"
+            >
+              <span
+                class="icon"
+                data-icon-name="keyboard_arrow_up"
+              >
+                keyboard_arrow_up
+              </span>
+              <div />
+            </i>
+          </div>
         </div>
       </div>
-    </main>
+    </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
diff --git a/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
index 2e1d0c89d7..50c5d599f2 100644
--- a/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
@@ -4,386 +4,187 @@ exports[`remove helm repository from list of active repositories in preferences
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -399,9 +200,9 @@ exports[`remove helm repository from list of active repositories in preferences
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
                             class="Select__input-container css-jzldcf-Input"
@@ -409,7 +210,7 @@ exports[`remove helm repository from list of active repositories in preferences
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
@@ -417,7 +218,7 @@ exports[`remove helm repository from list of active repositories in preferences
                               autocorrect="off"
                               class="Select__input"
                               disabled=""
-                              id="selection-of-active-public-helm-repository"
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -430,20 +231,6 @@ exports[`remove helm repository from list of active repositories in preferences
                         <div
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
                           <span
                             class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
@@ -467,66 +254,331 @@ exports[`remove helm repository from list of active repositories in preferences
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="pt-5 relative"
+                      class="flex-grow text-center"
                     >
-                      <div
-                        class="Spinner singleColor center"
-                        data-testid="helm-repositories-are-loading"
-                      />
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                              >
+                                <span
+                                  class="css-1xtdfmb-LoadingDot"
+                                />
+                                <span
+                                  class="css-zoievk-LoadingDot"
+                                />
+                                <span
+                                  class="css-x748d8-LoadingDot"
+                                />
+                              </div>
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="pt-5 relative"
+                        >
+                          <div
+                            class="Spinner singleColor center"
+                            data-testid="helm-repositories-are-loading"
+                          />
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
@@ -540,1472 +592,187 @@ exports[`remove helm repository from list of active repositories in preferences
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
-          </div>
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
         </div>
+        <div
+          class="items"
+        />
       </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
+      <main>
         <div
-          class="sidebar"
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
         >
-          <div
-            class="Tabs flex column"
+          <nav
+            class="sidebarRegion"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="sidebar"
             >
               <div
-                class="label"
+                class="Tabs flex column"
               >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="header"
                 >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
+                  Preferences
                 </div>
                 <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
                 >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
                   <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
+                    class="label"
                   >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
+                    App
                   </div>
                 </div>
-              </section>
-              <section>
                 <div
-                  class="SubTitle"
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
                 >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
                   <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
+                    class="label"
                   >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
+                    Proxy
+                  </div>
                 </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
             >
-              <h2
-                data-testid="kubernetes-sync-header"
+              <section
+                id="kubernetes"
               >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
+                <section
+                  id="kubectl"
                 >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
+                  <h2
+                    data-testid="kubernetes-header"
                   >
+                    Kubernetes
+                  </h2>
+                  <section>
                     <div
-                      class="Select theme-lens box grow css-b62m3t-container"
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
                     >
                       <span
                         class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
-                      type="button"
-                    >
-                      Add Custom Helm Repo
-                    </button>
-                  </div>
-                  <div
-                    class="repos"
-                  >
-                    <div
-                      class="item flex gaps align-center justify-space-between repo"
-                    >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-some-active-repository"
-                        >
-                          some-active-repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-some-active-repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
-                    </div>
-                  </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
-            <div
-              data-testid="close-preferences"
-            >
-              <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
-              >
-                <i
-                  class="Icon icon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
-                  >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="Notifications flex column align-flex-end"
-    />
-  </div>
-</body>
-`;
-
-exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve when removing repository renders 1`] = `
-<body>
-  <div>
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      >
-        <div
-          class="item"
-        >
-          <div
-            data-testid="app-update-not-available"
-          >
-            No new updates available
-          </div>
-        </div>
-      </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
-        <div
-          class="sidebar"
-        >
-          <div
-            class="Tabs flex column"
-          >
-            <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
-                </div>
-                <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
-                  >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
-            >
-              <h2
-                data-testid="kubernetes-sync-header"
-              >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
-                >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
-                  >
-                    <div
-                      class="Select theme-lens box grow css-b62m3t-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
-                      />
-                      <span
-                        aria-atomic="false"
-                        aria-live="polite"
-                        aria-relevant="additions text"
-                        class="css-1f43avz-a11yText-A11yText"
-                      />
-                      <div
-                        class="Select__control css-1s2u09g-control"
-                      >
-                        <div
-                          class="Select__value-container css-319lph-ValueContainer"
-                        >
-                          <div
-                            class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
-                          >
-                            Repositories
-                          </div>
-                          <div
-                            class="Select__input-container css-6j8wv5-Input"
-                            data-value=""
-                          >
-                            <input
-                              aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
-                              aria-expanded="false"
-                              aria-haspopup="true"
-                              autocapitalize="none"
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="Select__input"
-                              id="selection-of-active-public-helm-repository"
-                              role="combobox"
-                              spellcheck="false"
-                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                              tabindex="0"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                        </div>
-                        <div
-                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                        >
-                          <span
-                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                          />
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="css-tj5bde-Svg"
-                              focusable="false"
-                              height="20"
-                              viewBox="0 0 20 20"
-                              width="20"
-                            >
-                              <path
-                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                              />
-                            </svg>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
-                      type="button"
-                    >
-                      Add Custom Helm Repo
-                    </button>
-                  </div>
-                  <div
-                    class="repos"
-                  >
-                    <div
-                      class="item flex gaps align-center justify-space-between repo"
-                    >
-                      <div>
-                        <div
-                          class="repoName"
-                          data-testid="helm-repository-some-active-repository"
-                        >
-                          some-active-repository
-                        </div>
-                        <div
-                          class="repoUrl"
-                        >
-                          some-url
-                        </div>
-                      </div>
-                      <i
-                        class="Icon material interactive focusable"
-                        data-testid="remove-helm-repository-some-active-repository"
-                        tabindex="0"
-                        tooltip="Remove"
-                      >
-                        <span
-                          class="icon"
-                          data-icon-name="delete"
-                        >
-                          delete
-                        </span>
-                      </i>
-                    </div>
-                  </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
-            <div
-              data-testid="close-preferences"
-            >
-              <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
-              >
-                <i
-                  class="Icon icon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
-                  >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="Notifications flex column align-flex-end"
-    />
-  </div>
-</body>
-`;
-
-exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve when removing repository when removing resolves renders 1`] = `
-<body>
-  <div>
-    <div
-      class="topBar"
-    >
-      <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
-      >
-        <div
-          class="item"
-        >
-          <div
-            data-testid="app-update-not-available"
-          >
-            No new updates available
-          </div>
-        </div>
-      </div>
-      <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="kubernetes-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
-      >
-        <div
-          class="sidebar"
-        >
-          <div
-            class="Tabs flex column"
-          >
-            <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
-            </div>
-          </div>
-        </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
-        <div
-          class="content"
-        >
-          <section
-            id="kubernetes"
-          >
-            <section
-              id="kubectl"
-            >
-              <h2
-                data-testid="kubernetes-header"
-              >
-                Kubernetes
-              </h2>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Kubectl binary download
-                   
-                </div>
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Download kubectl binaries matching the Kubernetes cluster version
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Download mirror
-                   
-                </div>
-                <div
-                  class="Select theme-lens Select--is-disabled css-3iigni-container"
-                >
-                  <span
-                    class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-download-mirror-input-live-region"
-                  />
-                  <span
-                    aria-atomic="false"
-                    aria-live="polite"
-                    aria-relevant="additions text"
-                    class="css-1f43avz-a11yText-A11yText"
-                  />
-                  <div
-                    class="Select__control Select__control--is-disabled css-1insrsq-control"
-                  >
-                    <div
-                      class="Select__value-container css-319lph-ValueContainer"
-                    >
-                      <div
-                        class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-download-mirror-input-placeholder"
-                      >
-                        Download mirror for kubectl
-                      </div>
-                      <div
-                        class="Select__input-container css-jzldcf-Input"
-                        data-value=""
-                      >
-                        <input
-                          aria-autocomplete="list"
-                          aria-describedby="react-select-download-mirror-input-placeholder"
-                          aria-expanded="false"
-                          aria-haspopup="true"
-                          autocapitalize="none"
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="Select__input"
-                          disabled=""
-                          id="download-mirror-input"
-                          role="combobox"
-                          spellcheck="false"
-                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                          tabindex="0"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                    >
-                      <span
-                        class="Select__indicator-separator css-109onse-indicatorSeparator"
-                      />
-                      <div
-                        aria-hidden="true"
-                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="css-tj5bde-Svg"
-                          focusable="false"
-                          height="20"
-                          viewBox="0 0 20 20"
-                          width="20"
-                        >
-                          <path
-                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                          />
-                        </svg>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Directory for binaries
-                   
-                </div>
-                <div
-                  class="Input theme round black disabled"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      disabled=""
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-                <div
-                  class="hint"
-                >
-                  The directory to download binaries into.
-                </div>
-              </section>
-              <section>
-                <div
-                  class="SubTitle"
-                >
-                  Path to kubectl binary
-                   
-                </div>
-                <div
-                  class="Input theme round black"
-                >
-                  <label
-                    class="input-area flex gaps align-center"
-                    id=""
-                  >
-                    <input
-                      class="input box grow"
-                      placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                      spellcheck="false"
-                      value=""
-                    />
-                  </label>
-                  <div
-                    class="input-info flex gaps"
-                  />
-                </div>
-              </section>
-            </section>
-            <hr />
-            <section
-              id="kube-sync"
-            >
-              <h2
-                data-testid="kubernetes-sync-header"
-              >
-                Kubeconfig Syncs
-              </h2>
-              <div
-                class="self-start mb-5"
-              >
-                <button
-                  class="Button PathPicker primary"
-                  type="button"
-                >
-                  Sync Files and Folders
-                </button>
-              </div>
-              <div
-                class="SubTitle pt-5"
-              >
-                Synced Items
-                 
-              </div>
-              <div
-                class="notice mt-3"
-              >
-                <div
-                  class="flex-grow text-center"
-                >
-                  No files and folders have been synced yet
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="helm"
-            >
-              <h2>
-                Helm Charts
-              </h2>
-              <div>
-                <div
-                  data-testid="helm-controls"
-                >
-                  <div
-                    class="flex gaps"
-                  >
-                    <div
-                      class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
-                    >
-                      <span
-                        class="css-1f43avz-a11yText-A11yText"
-                        id="react-select-selection-of-active-public-helm-repository-live-region"
+                        id="react-select-download-mirror-input-live-region"
                       />
                       <span
                         aria-atomic="false"
@@ -2021,9 +788,9 @@ exports[`remove helm repository from list of active repositories in preferences
                         >
                           <div
                             class="Select__placeholder css-14el2xx-placeholder"
-                            id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
                           >
-                            Repositories
+                            Download mirror for kubectl
                           </div>
                           <div
                             class="Select__input-container css-jzldcf-Input"
@@ -2031,7 +798,7 @@ exports[`remove helm repository from list of active repositories in preferences
                           >
                             <input
                               aria-autocomplete="list"
-                              aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
                               aria-expanded="false"
                               aria-haspopup="true"
                               autocapitalize="none"
@@ -2039,7 +806,7 @@ exports[`remove helm repository from list of active repositories in preferences
                               autocorrect="off"
                               class="Select__input"
                               disabled=""
-                              id="selection-of-active-public-helm-repository"
+                              id="download-mirror-input"
                               role="combobox"
                               spellcheck="false"
                               style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -2052,20 +819,6 @@ exports[`remove helm repository from list of active repositories in preferences
                         <div
                           class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                         >
-                          <div
-                            aria-hidden="true"
-                            class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
-                          >
-                            <span
-                              class="css-1xtdfmb-LoadingDot"
-                            />
-                            <span
-                              class="css-zoievk-LoadingDot"
-                            />
-                            <span
-                              class="css-x748d8-LoadingDot"
-                            />
-                          </div>
                           <span
                             class="Select__indicator-separator css-109onse-indicatorSeparator"
                           />
@@ -2089,66 +842,1521 @@ exports[`remove helm repository from list of active repositories in preferences
                         </div>
                       </div>
                     </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
                     <button
-                      class="Button primary"
-                      data-testid="add-custom-helm-repo-button"
+                      class="Button PathPicker primary"
                       type="button"
                     >
-                      Add Custom Helm Repo
+                      Sync Files and Folders
                     </button>
                   </div>
                   <div
-                    class="repos"
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
                   >
                     <div
-                      class="pt-5 relative"
+                      class="flex-grow text-center"
                     >
-                      <div
-                        class="Spinner singleColor center"
-                        data-testid="helm-repositories-are-loading"
-                      />
+                      No files and folders have been synced yet
                     </div>
                   </div>
-                  <div />
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-some-active-repository"
+                            >
+                              some-active-repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-some-active-repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
             <div
-              data-testid="close-preferences"
+              class="toolsRegion"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="fixed top-[60px]"
               >
-                <i
-                  class="Icon icon material focusable"
+                <div
+                  data-testid="close-preferences"
                 >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve when removing repository renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  class="header"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="kubernetes"
+              >
+                <section
+                  id="kubectl"
+                >
+                  <h2
+                    data-testid="kubernetes-header"
+                  >
+                    Kubernetes
+                  </h2>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-download-mirror-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
+                          >
+                            Download mirror for kubectl
+                          </div>
+                          <div
+                            class="Select__input-container css-jzldcf-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              disabled=""
+                              id="download-mirror-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
+                    <button
+                      class="Button PathPicker primary"
+                      type="button"
+                    >
+                      Sync Files and Folders
+                    </button>
+                  </div>
+                  <div
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
+                  >
+                    <div
+                      class="flex-grow text-center"
+                    >
+                      No files and folders have been synced yet
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow css-b62m3t-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control css-1s2u09g-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-6j8wv5-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <span
+                                class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="item flex gaps align-center justify-space-between repo"
+                        >
+                          <div>
+                            <div
+                              class="repoName"
+                              data-testid="helm-repository-some-active-repository"
+                            >
+                              some-active-repository
+                            </div>
+                            <div
+                              class="repoUrl"
+                            >
+                              some-url
+                            </div>
+                          </div>
+                          <i
+                            class="Icon material interactive focusable"
+                            data-testid="remove-helm-repository-some-active-repository"
+                            tabindex="0"
+                            tooltip="Remove"
+                          >
+                            <span
+                              class="icon"
+                              data-icon-name="delete"
+                            >
+                              delete
+                            </span>
+                          </i>
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve when removing repository when removing resolves renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="kubernetes-preferences-page"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  class="header"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="kubernetes"
+              >
+                <section
+                  id="kubectl"
+                >
+                  <h2
+                    data-testid="kubernetes-header"
+                  >
+                    Kubernetes
+                  </h2>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Kubectl binary download
+                       
+                    </div>
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Download kubectl binaries matching the Kubernetes cluster version
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Download mirror
+                       
+                    </div>
+                    <div
+                      class="Select theme-lens Select--is-disabled css-3iigni-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-download-mirror-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control Select__control--is-disabled css-1insrsq-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-download-mirror-input-placeholder"
+                          >
+                            Download mirror for kubectl
+                          </div>
+                          <div
+                            class="Select__input-container css-jzldcf-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-download-mirror-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              disabled=""
+                              id="download-mirror-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-109onse-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Directory for binaries
+                       
+                    </div>
+                    <div
+                      class="Input theme round black disabled"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          disabled=""
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                    <div
+                      class="hint"
+                    >
+                      The directory to download binaries into.
+                    </div>
+                  </section>
+                  <section>
+                    <div
+                      class="SubTitle"
+                    >
+                      Path to kubectl binary
+                       
+                    </div>
+                    <div
+                      class="Input theme round black"
+                    >
+                      <label
+                        class="input-area flex gaps align-center"
+                        id=""
+                      >
+                        <input
+                          class="input box grow"
+                          placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                          spellcheck="false"
+                          value=""
+                        />
+                      </label>
+                      <div
+                        class="input-info flex gaps"
+                      />
+                    </div>
+                  </section>
+                </section>
+                <hr />
+                <section
+                  id="kube-sync"
+                >
+                  <h2
+                    data-testid="kubernetes-sync-header"
+                  >
+                    Kubeconfig Syncs
+                  </h2>
+                  <div
+                    class="self-start mb-5"
+                  >
+                    <button
+                      class="Button PathPicker primary"
+                      type="button"
+                    >
+                      Sync Files and Folders
+                    </button>
+                  </div>
+                  <div
+                    class="SubTitle pt-5"
+                  >
+                    Synced Items
+                     
+                  </div>
+                  <div
+                    class="notice mt-3"
+                  >
+                    <div
+                      class="flex-grow text-center"
+                    >
+                      No files and folders have been synced yet
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="helm"
+                >
+                  <h2>
+                    Helm Charts
+                  </h2>
+                  <div>
+                    <div
+                      data-testid="helm-controls"
+                    >
+                      <div
+                        class="flex gaps"
+                      >
+                        <div
+                          class="Select theme-lens box grow Select--is-disabled css-3iigni-container"
+                        >
+                          <span
+                            class="css-1f43avz-a11yText-A11yText"
+                            id="react-select-selection-of-active-public-helm-repository-live-region"
+                          />
+                          <span
+                            aria-atomic="false"
+                            aria-live="polite"
+                            aria-relevant="additions text"
+                            class="css-1f43avz-a11yText-A11yText"
+                          />
+                          <div
+                            class="Select__control Select__control--is-disabled css-1insrsq-control"
+                          >
+                            <div
+                              class="Select__value-container css-319lph-ValueContainer"
+                            >
+                              <div
+                                class="Select__placeholder css-14el2xx-placeholder"
+                                id="react-select-selection-of-active-public-helm-repository-placeholder"
+                              >
+                                Repositories
+                              </div>
+                              <div
+                                class="Select__input-container css-jzldcf-Input"
+                                data-value=""
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                  aria-expanded="false"
+                                  aria-haspopup="true"
+                                  autocapitalize="none"
+                                  autocomplete="off"
+                                  autocorrect="off"
+                                  class="Select__input"
+                                  disabled=""
+                                  id="selection-of-active-public-helm-repository"
+                                  role="combobox"
+                                  spellcheck="false"
+                                  style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                  tabindex="0"
+                                  type="text"
+                                  value=""
+                                />
+                              </div>
+                            </div>
+                            <div
+                              class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                            >
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__loading-indicator css-at12u2-loadingIndicator"
+                              >
+                                <span
+                                  class="css-1xtdfmb-LoadingDot"
+                                />
+                                <span
+                                  class="css-zoievk-LoadingDot"
+                                />
+                                <span
+                                  class="css-x748d8-LoadingDot"
+                                />
+                              </div>
+                              <span
+                                class="Select__indicator-separator css-109onse-indicatorSeparator"
+                              />
+                              <div
+                                aria-hidden="true"
+                                class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  class="css-tj5bde-Svg"
+                                  focusable="false"
+                                  height="20"
+                                  viewBox="0 0 20 20"
+                                  width="20"
+                                >
+                                  <path
+                                    d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                  />
+                                </svg>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <button
+                          class="Button primary"
+                          data-testid="add-custom-helm-repo-button"
+                          type="button"
+                        >
+                          Add Custom Helm Repo
+                        </button>
+                      </div>
+                      <div
+                        class="repos"
+                      >
+                        <div
+                          class="pt-5 relative"
+                        >
+                          <div
+                            class="Spinner singleColor center"
+                            data-testid="helm-repositories-are-loading"
+                          />
+                        </div>
+                      </div>
+                      <div />
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
diff --git a/src/behaviours/preferences/__snapshots__/closing-preferences.test.tsx.snap b/src/behaviours/preferences/__snapshots__/closing-preferences.test.tsx.snap
index 8a0c129e80..e896159621 100644
--- a/src/behaviours/preferences/__snapshots__/closing-preferences.test.tsx.snap
+++ b/src/behaviours/preferences/__snapshots__/closing-preferences.test.tsx.snap
@@ -3,603 +3,655 @@
 exports[`preferences - closing-preferences given accessing preferences directly renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="application-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-some-test-preference-navigation-item-id"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Some preference navigation item
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="application"
+            >
+              <h2
+                data-testid="application-header"
+              >
+                Application
+              </h2>
+              <section
+                id="appearance"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Theme
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-theme-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-theme-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-theme-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="theme-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="extensionRegistryUrl"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Extension Install Registry
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-extension-install-registry-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-extension-install-registry-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-extension-install-registry-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="extension-install-registry-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <p
+                  class="mt-4 mb-5 leading-relaxed"
+                >
+                  This setting is to change the registry URL for installing extensions by name. 
+                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                  <b>
+                    .npmrc
+                  </b>
+                   file or in the input below.
+                </p>
+                <div
+                  class="Input theme round black disabled invalid"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      disabled=""
+                      placeholder="Custom Extension Registry URL..."
+                      spellcheck="false"
+                      value="some-custom-url"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <hr />
+              <section
+                id="other"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Start-up
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Automatically start Lens on login
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+              </section>
+              <hr />
+              <section
+                id="update-channel"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Update Channel
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-update-channel-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__single-value css-qc6sy-singleValue"
+                      >
+                        Stable
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="update-channel-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="locale"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Locale Timezone
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-timezone-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-timezone-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-timezone-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="timezone-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="application-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
+      class="StatusBar"
     >
       <div
-        class="sidebar"
+        class="leftSide"
+        data-testid="status-bar-left"
       >
         <div
-          class="Tabs flex column"
+          class="item"
         >
           <div
-            class="header"
+            data-testid="app-update-not-available"
           >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-some-test-preference-navigation-item-id"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Some preference navigation item
-            </div>
+            No new updates available
           </div>
         </div>
       </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
       <div
-        class="content"
-      >
-        <section
-          id="application"
-        >
-          <h2
-            data-testid="application-header"
-          >
-            Application
-          </h2>
-          <section
-            id="appearance"
-          >
-            <div
-              class="SubTitle"
-            >
-              Theme
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-theme-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-theme-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-theme-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="theme-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="extensionRegistryUrl"
-          >
-            <div
-              class="SubTitle"
-            >
-              Extension Install Registry
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-extension-install-registry-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-extension-install-registry-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-extension-install-registry-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="extension-install-registry-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <p
-              class="mt-4 mb-5 leading-relaxed"
-            >
-              This setting is to change the registry URL for installing extensions by name. 
-              If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-              <b>
-                .npmrc
-              </b>
-               file or in the input below.
-            </p>
-            <div
-              class="Input theme round black disabled invalid"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  disabled=""
-                  placeholder="Custom Extension Registry URL..."
-                  spellcheck="false"
-                  value="some-custom-url"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <hr />
-          <section
-            id="other"
-          >
-            <div
-              class="SubTitle"
-            >
-              Start-up
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Automatically start Lens on login
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-          </section>
-          <hr />
-          <section
-            id="update-channel"
-          >
-            <div
-              class="SubTitle"
-            >
-              Update Channel
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-update-channel-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__single-value css-qc6sy-singleValue"
-                  >
-                    Stable
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="update-channel-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="locale"
-          >
-            <div
-              class="SubTitle"
-            >
-              Locale Timezone
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-timezone-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-timezone-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-timezone-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="timezone-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -611,207 +663,259 @@ exports[`preferences - closing-preferences given accessing preferences directly
 exports[`preferences - closing-preferences given accessing preferences directly when navigating to a tab in preferences renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
+      class="topBar"
     >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
+      <div
+        class="items"
       >
-        <span
-          class="icon"
-          data-icon-name="home"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
         >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
         >
-          arrow_forward
-        </span>
-      </i>
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
+    <main>
       <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-  >
-    <nav
-      class="sidebarRegion"
-    >
+        id="lens-views"
+      />
       <div
-        class="sidebar"
+        class="SettingLayout showNavigation Preferences"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
+              class="Tabs flex column"
             >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-some-test-preference-navigation-item-id"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Some preference navigation item
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        Some test page
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
+              <div
+                class="header"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
                 >
-                  close
-                </span>
-              </i>
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-some-test-preference-navigation-item-id"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Some preference navigation item
+                </div>
+              </div>
             </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            Some test page
+          </div>
+          <div
+            class="toolsRegion"
+          >
             <div
-              aria-hidden="true"
-              class="esc"
+              class="fixed top-[60px]"
             >
-              ESC
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -823,74 +927,126 @@ exports[`preferences - closing-preferences given accessing preferences directly
 exports[`preferences - closing-preferences given accessing preferences directly when navigating to a tab in preferences when preferences are closed renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div>
+        Some front page
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
         </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
       </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div>
-    Some front page
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
@@ -901,74 +1057,126 @@ exports[`preferences - closing-preferences given accessing preferences directly
 exports[`preferences - closing-preferences given accessing preferences directly when preferences are closed renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div>
+        Some front page
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
         </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
       </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div>
-    Some front page
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
@@ -979,603 +1187,655 @@ exports[`preferences - closing-preferences given accessing preferences directly
 exports[`preferences - closing-preferences given already in a page and then navigated to preferences renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="application-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-some-test-preference-navigation-item-id"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Some preference navigation item
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="application"
+            >
+              <h2
+                data-testid="application-header"
+              >
+                Application
+              </h2>
+              <section
+                id="appearance"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Theme
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-theme-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-theme-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-theme-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="theme-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="extensionRegistryUrl"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Extension Install Registry
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-extension-install-registry-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-extension-install-registry-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-extension-install-registry-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="extension-install-registry-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <p
+                  class="mt-4 mb-5 leading-relaxed"
+                >
+                  This setting is to change the registry URL for installing extensions by name. 
+                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                  <b>
+                    .npmrc
+                  </b>
+                   file or in the input below.
+                </p>
+                <div
+                  class="Input theme round black disabled invalid"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      disabled=""
+                      placeholder="Custom Extension Registry URL..."
+                      spellcheck="false"
+                      value="some-custom-url"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <hr />
+              <section
+                id="other"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Start-up
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Automatically start Lens on login
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+              </section>
+              <hr />
+              <section
+                id="update-channel"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Update Channel
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-update-channel-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__single-value css-qc6sy-singleValue"
+                      >
+                        Stable
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="update-channel-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="locale"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Locale Timezone
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-timezone-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-timezone-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-timezone-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="timezone-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="application-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
+      class="StatusBar"
     >
       <div
-        class="sidebar"
+        class="leftSide"
+        data-testid="status-bar-left"
       >
         <div
-          class="Tabs flex column"
+          class="item"
         >
           <div
-            class="header"
+            data-testid="app-update-not-available"
           >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-some-test-preference-navigation-item-id"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Some preference navigation item
-            </div>
+            No new updates available
           </div>
         </div>
       </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
       <div
-        class="content"
-      >
-        <section
-          id="application"
-        >
-          <h2
-            data-testid="application-header"
-          >
-            Application
-          </h2>
-          <section
-            id="appearance"
-          >
-            <div
-              class="SubTitle"
-            >
-              Theme
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-theme-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-theme-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-theme-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="theme-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="extensionRegistryUrl"
-          >
-            <div
-              class="SubTitle"
-            >
-              Extension Install Registry
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-extension-install-registry-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-extension-install-registry-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-extension-install-registry-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="extension-install-registry-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <p
-              class="mt-4 mb-5 leading-relaxed"
-            >
-              This setting is to change the registry URL for installing extensions by name. 
-              If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-              <b>
-                .npmrc
-              </b>
-               file or in the input below.
-            </p>
-            <div
-              class="Input theme round black disabled invalid"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  disabled=""
-                  placeholder="Custom Extension Registry URL..."
-                  spellcheck="false"
-                  value="some-custom-url"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <hr />
-          <section
-            id="other"
-          >
-            <div
-              class="SubTitle"
-            >
-              Start-up
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Automatically start Lens on login
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-          </section>
-          <hr />
-          <section
-            id="update-channel"
-          >
-            <div
-              class="SubTitle"
-            >
-              Update Channel
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-update-channel-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__single-value css-qc6sy-singleValue"
-                  >
-                    Stable
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="update-channel-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="locale"
-          >
-            <div
-              class="SubTitle"
-            >
-              Locale Timezone
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-timezone-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-timezone-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-timezone-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="timezone-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -1587,207 +1847,259 @@ exports[`preferences - closing-preferences given already in a page and then navi
 exports[`preferences - closing-preferences given already in a page and then navigated to preferences when navigating to a tab in preferences renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
+      class="topBar"
     >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
+      <div
+        class="items"
       >
-        <span
-          class="icon"
-          data-icon-name="home"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
         >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
         >
-          arrow_forward
-        </span>
-      </i>
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
+    <main>
       <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-  >
-    <nav
-      class="sidebarRegion"
-    >
+        id="lens-views"
+      />
       <div
-        class="sidebar"
+        class="SettingLayout showNavigation Preferences"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
+              class="Tabs flex column"
             >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-some-test-preference-navigation-item-id"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Some preference navigation item
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        Some test page
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
+              <div
+                class="header"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
                 >
-                  close
-                </span>
-              </i>
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-some-test-preference-navigation-item-id"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Some preference navigation item
+                </div>
+              </div>
             </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            Some test page
+          </div>
+          <div
+            class="toolsRegion"
+          >
             <div
-              aria-hidden="true"
-              class="esc"
+              class="fixed top-[60px]"
             >
-              ESC
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -1799,207 +2111,259 @@ exports[`preferences - closing-preferences given already in a page and then navi
 exports[`preferences - closing-preferences given already in a page and then navigated to preferences when navigating to a tab in preferences when preferences are closed renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
+      class="topBar"
     >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
+      <div
+        class="items"
       >
-        <span
-          class="icon"
-          data-icon-name="home"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
         >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
         >
-          arrow_forward
-        </span>
-      </i>
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
+    <main>
       <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-  >
-    <nav
-      class="sidebarRegion"
-    >
+        id="lens-views"
+      />
       <div
-        class="sidebar"
+        class="SettingLayout showNavigation Preferences"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
+              class="Tabs flex column"
             >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-some-test-preference-navigation-item-id"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Some preference navigation item
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        Some test page
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
+              <div
+                class="header"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
                 >
-                  close
-                </span>
-              </i>
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-some-test-preference-navigation-item-id"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Some preference navigation item
+                </div>
+              </div>
             </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            Some test page
+          </div>
+          <div
+            class="toolsRegion"
+          >
             <div
-              aria-hidden="true"
-              class="esc"
+              class="fixed top-[60px]"
             >
-              ESC
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -2011,207 +2375,259 @@ exports[`preferences - closing-preferences given already in a page and then navi
 exports[`preferences - closing-preferences given already in a page and then navigated to preferences when preferences are closed renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
+      class="topBar"
     >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
+      <div
+        class="items"
       >
-        <span
-          class="icon"
-          data-icon-name="home"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
         >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
         >
-          arrow_forward
-        </span>
-      </i>
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
+    <main>
       <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-  >
-    <nav
-      class="sidebarRegion"
-    >
+        id="lens-views"
+      />
       <div
-        class="sidebar"
+        class="SettingLayout showNavigation Preferences"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
+              class="Tabs flex column"
             >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-some-test-preference-navigation-item-id"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Some preference navigation item
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        Some test page
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
+              <div
+                class="header"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
                 >
-                  close
-                </span>
-              </i>
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-some-test-preference-navigation-item-id"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Some preference navigation item
+                </div>
+              </div>
             </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            Some test page
+          </div>
+          <div
+            class="toolsRegion"
+          >
             <div
-              aria-hidden="true"
-              class="esc"
+              class="fixed top-[60px]"
             >
-              ESC
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
index 090cad4ed9..e585203a28 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
@@ -3,267 +3,319 @@
 exports[`preferences - navigation to application preferences given in some child page of preferences, when rendered renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
-        </div>
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
       </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="proxy-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
+    <main>
       <div
-        class="sidebar"
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="proxy-preferences-page"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
+              class="Tabs flex column"
             >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="proxy"
-        >
-          <section>
-            <h2
-              data-testid="proxy-header"
-            >
-              Proxy
-            </h2>
-            <div
-              class="SubTitle"
-            >
-              HTTP Proxy
-               
-            </div>
-            <div
-              class="Input theme round black"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
-                  spellcheck="false"
-                  value=""
-                />
-              </label>
               <div
-                class="input-info flex gaps"
-              />
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
             </div>
-            <small
-              class="hint"
-            >
-              Proxy is used only for non-cluster communication.
-            </small>
-          </section>
-          <hr
-            class="small"
-          />
-          <section
-            class="small"
-          >
-            <div
-              class="SubTitle"
-            >
-              Certificate Trust
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Allow untrusted Certificate Authorities
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-            <small
-              class="hint"
-            >
-              This will make Lens to trust ANY certificate authority without any validations.
-               
-              Needed with some corporate proxies that do certificate re-writing.
-               
-              Does not affect cluster communications!
-            </small>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
+          </div>
+        </nav>
         <div
-          class="fixed top-[60px]"
+          class="contentRegion"
+          id="ScrollSpyRoot"
         >
           <div
-            data-testid="close-preferences"
+            class="content"
+          >
+            <section
+              id="proxy"
+            >
+              <section>
+                <h2
+                  data-testid="proxy-header"
+                >
+                  Proxy
+                </h2>
+                <div
+                  class="SubTitle"
+                >
+                  HTTP Proxy
+                   
+                </div>
+                <div
+                  class="Input theme round black"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
+                      spellcheck="false"
+                      value=""
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+                <small
+                  class="hint"
+                >
+                  Proxy is used only for non-cluster communication.
+                </small>
+              </section>
+              <hr
+                class="small"
+              />
+              <section
+                class="small"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Certificate Trust
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Allow untrusted Certificate Authorities
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+                <small
+                  class="hint"
+                >
+                  This will make Lens to trust ANY certificate authority without any validations.
+                   
+                  Needed with some corporate proxies that do certificate re-writing.
+                   
+                  Does not affect cluster communications!
+                </small>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
           >
             <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
+              class="fixed top-[60px]"
             >
-              <i
-                class="Icon icon material focusable"
+              <div
+                data-testid="close-preferences"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
                 >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -275,591 +327,643 @@ exports[`preferences - navigation to application preferences given in some child
 exports[`preferences - navigation to application preferences given in some child page of preferences, when rendered when navigating to application preferences using navigation renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="application-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="application"
+            >
+              <h2
+                data-testid="application-header"
+              >
+                Application
+              </h2>
+              <section
+                id="appearance"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Theme
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-theme-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-theme-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-theme-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="theme-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="extensionRegistryUrl"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Extension Install Registry
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-extension-install-registry-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-extension-install-registry-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-extension-install-registry-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="extension-install-registry-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <p
+                  class="mt-4 mb-5 leading-relaxed"
+                >
+                  This setting is to change the registry URL for installing extensions by name. 
+                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                  <b>
+                    .npmrc
+                  </b>
+                   file or in the input below.
+                </p>
+                <div
+                  class="Input theme round black disabled invalid"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      disabled=""
+                      placeholder="Custom Extension Registry URL..."
+                      spellcheck="false"
+                      value="some-custom-url"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <hr />
+              <section
+                id="other"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Start-up
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Automatically start Lens on login
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+              </section>
+              <hr />
+              <section
+                id="update-channel"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Update Channel
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-update-channel-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__single-value css-qc6sy-singleValue"
+                      >
+                        Stable
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="update-channel-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="locale"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Locale Timezone
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-timezone-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-timezone-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-timezone-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="timezone-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="application-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
+      class="StatusBar"
     >
       <div
-        class="sidebar"
+        class="leftSide"
+        data-testid="status-bar-left"
       >
         <div
-          class="Tabs flex column"
+          class="item"
         >
           <div
-            class="header"
+            data-testid="app-update-not-available"
           >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
+            No new updates available
           </div>
         </div>
       </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
       <div
-        class="content"
-      >
-        <section
-          id="application"
-        >
-          <h2
-            data-testid="application-header"
-          >
-            Application
-          </h2>
-          <section
-            id="appearance"
-          >
-            <div
-              class="SubTitle"
-            >
-              Theme
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-theme-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-theme-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-theme-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="theme-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="extensionRegistryUrl"
-          >
-            <div
-              class="SubTitle"
-            >
-              Extension Install Registry
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-extension-install-registry-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-extension-install-registry-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-extension-install-registry-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="extension-install-registry-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <p
-              class="mt-4 mb-5 leading-relaxed"
-            >
-              This setting is to change the registry URL for installing extensions by name. 
-              If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-              <b>
-                .npmrc
-              </b>
-               file or in the input below.
-            </p>
-            <div
-              class="Input theme round black disabled invalid"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  disabled=""
-                  placeholder="Custom Extension Registry URL..."
-                  spellcheck="false"
-                  value="some-custom-url"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <hr />
-          <section
-            id="other"
-          >
-            <div
-              class="SubTitle"
-            >
-              Start-up
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Automatically start Lens on login
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-          </section>
-          <hr />
-          <section
-            id="update-channel"
-          >
-            <div
-              class="SubTitle"
-            >
-              Update Channel
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-update-channel-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__single-value css-qc6sy-singleValue"
-                  >
-                    Stable
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="update-channel-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="locale"
-          >
-            <div
-              class="SubTitle"
-            >
-              Locale Timezone
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-timezone-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-timezone-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-timezone-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="timezone-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
index 7d7bfb929d..0ab7565ad1 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
@@ -3,802 +3,168 @@
 exports[`preferences - navigation to editor preferences given in preferences, when rendered renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
-        </div>
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
       </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="application-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
+    <main>
       <div
-        class="sidebar"
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="application-preferences-page"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
+              class="Tabs flex column"
             >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="application"
-        >
-          <h2
-            data-testid="application-header"
-          >
-            Application
-          </h2>
-          <section
-            id="appearance"
-          >
-            <div
-              class="SubTitle"
-            >
-              Theme
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-theme-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
               <div
-                class="Select__control css-1s2u09g-control"
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
               >
                 <div
-                  class="Select__value-container css-319lph-ValueContainer"
+                  class="label"
                 >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-theme-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-theme-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="theme-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
+                  App
                 </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
                 <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                  class="label"
                 >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
                 </div>
               </div>
             </div>
-          </section>
-          <hr />
-          <section
-            id="extensionRegistryUrl"
-          >
-            <div
-              class="SubTitle"
-            >
-              Extension Install Registry
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-extension-install-registry-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-extension-install-registry-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-extension-install-registry-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="extension-install-registry-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <p
-              class="mt-4 mb-5 leading-relaxed"
-            >
-              This setting is to change the registry URL for installing extensions by name. 
-              If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-              <b>
-                .npmrc
-              </b>
-               file or in the input below.
-            </p>
-            <div
-              class="Input theme round black disabled invalid"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  disabled=""
-                  placeholder="Custom Extension Registry URL..."
-                  spellcheck="false"
-                  value="some-custom-url"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <hr />
-          <section
-            id="other"
-          >
-            <div
-              class="SubTitle"
-            >
-              Start-up
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Automatically start Lens on login
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-          </section>
-          <hr />
-          <section
-            id="update-channel"
-          >
-            <div
-              class="SubTitle"
-            >
-              Update Channel
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-update-channel-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__single-value css-qc6sy-singleValue"
-                  >
-                    Stable
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="update-channel-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="locale"
-          >
-            <div
-              class="SubTitle"
-            >
-              Locale Timezone
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-timezone-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-timezone-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-timezone-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="timezone-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
+          </div>
+        </nav>
         <div
-          class="fixed top-[60px]"
+          class="contentRegion"
+          id="ScrollSpyRoot"
         >
           <div
-            data-testid="close-preferences"
+            class="content"
           >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
+            <section
+              id="application"
             >
-              <i
-                class="Icon icon material focusable"
+              <h2
+                data-testid="application-header"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to editor preferences given in preferences, when rendered when navigating to editor preferences using navigation renders 1`] = `
-<div>
-  <div
-    class="topBar"
-  >
-    <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
-      <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="editor-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
-      <div
-        class="sidebar"
-      >
-        <div
-          class="Tabs flex column"
-        >
-          <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="editor"
-        >
-          <h2
-            data-testid="editor-configuration-header"
-          >
-            Editor configuration
-          </h2>
-          <div
-            class="SubTitle"
-          >
-            Minimap
-             
-          </div>
-          <section>
-            <div
-              class="flex gaps justify-space-between"
-            >
-              <div
-                class="flex gaps align-center"
-              >
-                <label
-                  class="Switch"
-                  data-testid="switch"
-                >
-                  Show minimap
-                  <input
-                    role="switch"
-                    type="checkbox"
-                  />
-                </label>
-              </div>
-              <div
-                class="flex gaps align-center"
+                Application
+              </h2>
+              <section
+                id="appearance"
               >
                 <div
-                  class="SubHeader compact"
+                  class="SubTitle"
                 >
-                  Position
+                  Theme
+                   
                 </div>
                 <div
                   class="Select theme-lens css-b62m3t-container"
                 >
                   <span
                     class="css-1f43avz-a11yText-A11yText"
-                    id="react-select-minimap-input-live-region"
+                    id="react-select-theme-input-live-region"
                   />
                   <span
                     aria-atomic="false"
@@ -814,7 +180,7 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
                     >
                       <div
                         class="Select__placeholder css-14el2xx-placeholder"
-                        id="react-select-minimap-input-placeholder"
+                        id="react-select-theme-input-placeholder"
                       >
                         Select...
                       </div>
@@ -824,14 +190,14 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
                       >
                         <input
                           aria-autocomplete="list"
-                          aria-describedby="react-select-minimap-input-placeholder"
+                          aria-describedby="react-select-theme-input-placeholder"
                           aria-expanded="false"
                           aria-haspopup="true"
                           autocapitalize="none"
                           autocomplete="off"
                           autocorrect="off"
                           class="Select__input"
-                          id="minimap-input"
+                          id="theme-input"
                           role="combobox"
                           spellcheck="false"
                           style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -867,207 +233,945 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
                     </div>
                   </div>
                 </div>
-              </div>
-            </div>
-          </section>
-          <section>
-            <div
-              class="SubTitle"
-            >
-              Line numbers
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-editor-line-numbers-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
+              </section>
+              <hr />
+              <section
+                id="extensionRegistryUrl"
               >
                 <div
-                  class="Select__value-container css-319lph-ValueContainer"
+                  class="SubTitle"
                 >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-editor-line-numbers-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-editor-line-numbers-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="editor-line-numbers-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
+                  Extension Install Registry
+                   
                 </div>
                 <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                  class="Select theme-lens css-b62m3t-container"
                 >
                   <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-extension-install-registry-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
                   />
                   <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                    class="Select__control css-1s2u09g-control"
                   >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
                     >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-extension-install-registry-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-extension-install-registry-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="extension-install-registry-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
                       />
-                    </svg>
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
                   </div>
                 </div>
-              </div>
-            </div>
-          </section>
-          <section>
-            <div
-              class="SubTitle"
-            >
-              Tab size
-               
-            </div>
-            <div
-              class="Input theme round black"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
+                <p
+                  class="mt-4 mb-5 leading-relaxed"
+                >
+                  This setting is to change the registry URL for installing extensions by name. 
+                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                  <b>
+                    .npmrc
+                  </b>
+                   file or in the input below.
+                </p>
+                <div
+                  class="Input theme round black disabled invalid"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      disabled=""
+                      placeholder="Custom Extension Registry URL..."
+                      spellcheck="false"
+                      value="some-custom-url"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <hr />
+              <section
+                id="other"
               >
-                <input
-                  class="input box grow"
-                  min="1"
-                  spellcheck="false"
-                  type="number"
-                  value="42"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <section>
-            <div
-              class="SubTitle"
-            >
-              Font size
-               
-            </div>
-            <div
-              class="Input theme round black"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
+                <div
+                  class="SubTitle"
+                >
+                  Start-up
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Automatically start Lens on login
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+              </section>
+              <hr />
+              <section
+                id="update-channel"
               >
-                <input
-                  class="input box grow"
-                  min="10"
-                  spellcheck="false"
-                  type="number"
-                  value="42"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <section>
-            <div
-              class="SubTitle"
-            >
-              Font family
-               
-            </div>
-            <div
-              class="Input theme round black"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
+                <div
+                  class="SubTitle"
+                >
+                  Update Channel
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-update-channel-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__single-value css-qc6sy-singleValue"
+                      >
+                        Stable
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="update-channel-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="locale"
               >
-                <input
-                  class="input box grow"
-                  spellcheck="false"
-                  type="text"
-                  value=""
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
+                <div
+                  class="SubTitle"
+                >
+                  Locale Timezone
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-timezone-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-timezone-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-timezone-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="timezone-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
           <div
-            data-testid="close-preferences"
+            class="toolsRegion"
           >
             <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
+              class="fixed top-[60px]"
             >
-              <i
-                class="Icon icon material focusable"
+              <div
+                data-testid="close-preferences"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
                 >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - navigation to editor preferences given in preferences, when rendered when navigating to editor preferences using navigation renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="editor-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="editor"
+            >
+              <h2
+                data-testid="editor-configuration-header"
+              >
+                Editor configuration
+              </h2>
+              <div
+                class="SubTitle"
+              >
+                Minimap
+                 
+              </div>
+              <section>
+                <div
+                  class="flex gaps justify-space-between"
+                >
+                  <div
+                    class="flex gaps align-center"
+                  >
+                    <label
+                      class="Switch"
+                      data-testid="switch"
+                    >
+                      Show minimap
+                      <input
+                        role="switch"
+                        type="checkbox"
+                      />
+                    </label>
+                  </div>
+                  <div
+                    class="flex gaps align-center"
+                  >
+                    <div
+                      class="SubHeader compact"
+                    >
+                      Position
+                    </div>
+                    <div
+                      class="Select theme-lens css-b62m3t-container"
+                    >
+                      <span
+                        class="css-1f43avz-a11yText-A11yText"
+                        id="react-select-minimap-input-live-region"
+                      />
+                      <span
+                        aria-atomic="false"
+                        aria-live="polite"
+                        aria-relevant="additions text"
+                        class="css-1f43avz-a11yText-A11yText"
+                      />
+                      <div
+                        class="Select__control css-1s2u09g-control"
+                      >
+                        <div
+                          class="Select__value-container css-319lph-ValueContainer"
+                        >
+                          <div
+                            class="Select__placeholder css-14el2xx-placeholder"
+                            id="react-select-minimap-input-placeholder"
+                          >
+                            Select...
+                          </div>
+                          <div
+                            class="Select__input-container css-6j8wv5-Input"
+                            data-value=""
+                          >
+                            <input
+                              aria-autocomplete="list"
+                              aria-describedby="react-select-minimap-input-placeholder"
+                              aria-expanded="false"
+                              aria-haspopup="true"
+                              autocapitalize="none"
+                              autocomplete="off"
+                              autocorrect="off"
+                              class="Select__input"
+                              id="minimap-input"
+                              role="combobox"
+                              spellcheck="false"
+                              style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                              tabindex="0"
+                              type="text"
+                              value=""
+                            />
+                          </div>
+                        </div>
+                        <div
+                          class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                        >
+                          <span
+                            class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          />
+                          <div
+                            aria-hidden="true"
+                            class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              class="css-tj5bde-Svg"
+                              focusable="false"
+                              height="20"
+                              viewBox="0 0 20 20"
+                              width="20"
+                            >
+                              <path
+                                d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                              />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <section>
+                <div
+                  class="SubTitle"
+                >
+                  Line numbers
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-editor-line-numbers-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-editor-line-numbers-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-editor-line-numbers-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="editor-line-numbers-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <section>
+                <div
+                  class="SubTitle"
+                >
+                  Tab size
+                   
+                </div>
+                <div
+                  class="Input theme round black"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      min="1"
+                      spellcheck="false"
+                      type="number"
+                      value="42"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <section>
+                <div
+                  class="SubTitle"
+                >
+                  Font size
+                   
+                </div>
+                <div
+                  class="Input theme round black"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      min="10"
+                      spellcheck="false"
+                      type="number"
+                      value="42"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <section>
+                <div
+                  class="SubTitle"
+                >
+                  Font family
+                   
+                </div>
+                <div
+                  class="Input theme round black"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      spellcheck="false"
+                      type="text"
+                      value=""
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap b/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
index 6fa66f0dde..2a15a9e3a4 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
@@ -18,2545 +18,8 @@ exports[`preferences - navigation to extension specific preferences given in pre
 exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extension with registered tab when navigating to specific extension tab renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
-    <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
-      <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="extension-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
-      <div
-        class="sidebar"
-      >
-        <div
-          class="Tabs flex column"
-        >
-          <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Metrics tab
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="extensions"
-        >
-          <h2>
-            registered-tab-page-id
-             
-            preferences
-          </h2>
-          <section
-            class="small"
-            data-testid="extension-preference-item-for-metrics-preference-item-id"
-            id="metrics-preference-item-id"
-          >
-            <div
-              class="SubTitle"
-            >
-              License item
-               
-            </div>
-            <div
-              data-testid="metrics-preference-item-input"
-            />
-            <div
-              class="hint"
-            >
-              <div
-                data-testid="metrics-preference-item-hint"
-              />
-            </div>
-          </section>
-          <hr
-            class="small"
-          />
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extensions with tabs having same id when navigating to first extension tab renders 1`] = `
-<div>
-  <div
-    class="topBar"
-  >
-    <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
-      <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="extension-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
-      <div
-        class="sidebar"
-      >
-        <div
-          class="Tabs flex column"
-        >
-          <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Metrics tab
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Metrics tab
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="extensions"
-        >
-          <h2>
-            registered-tab-page-id
-             
-            preferences
-          </h2>
-          <section
-            class="small"
-            data-testid="extension-preference-item-for-metrics-preference-item-id"
-            id="metrics-preference-item-id"
-          >
-            <div
-              class="SubTitle"
-            >
-              License item
-               
-            </div>
-            <div
-              data-testid="metrics-preference-item-input"
-            />
-            <div
-              class="hint"
-            >
-              <div
-                data-testid="metrics-preference-item-hint"
-              />
-            </div>
-          </section>
-          <hr
-            class="small"
-          />
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extensions with tabs having same id when navigating to second extension tab renders 1`] = `
-<div>
-  <div
-    class="topBar"
-  >
-    <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
-      <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="extension-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
-      <div
-        class="sidebar"
-      >
-        <div
-          class="Tabs flex column"
-        >
-          <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Metrics tab
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Metrics tab
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="extensions"
-        >
-          <h2>
-            duplicated-tab-page-id
-             
-            preferences
-          </h2>
-          <section
-            class="small"
-            data-testid="extension-preference-item-for-another-metrics-preference-item-id"
-            id="another-metrics-preference-item-id"
-          >
-            <div
-              class="SubTitle"
-            >
-              Another metrics
-               
-            </div>
-            <div
-              data-testid="another-metrics-preference-item-input"
-            />
-            <div
-              class="hint"
-            >
-              <div
-                data-testid="another-metrics-preference-item-hint"
-              />
-            </div>
-          </section>
-          <hr
-            class="small"
-          />
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given multiple extensions with specific preferences, when navigating to extension specific preferences page renders 1`] = `
-<div>
-  <div
-    class="topBar"
-  >
-    <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
-      <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="extension-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
-      <div
-        class="sidebar"
-      >
-        <div
-          class="Tabs flex column"
-        >
-          <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            data-testid="extension-settings"
-          >
-            <hr />
-            <div
-              class="header flex items-center"
-            >
-              <i
-                class="Icon mr-3 material focusable smallest"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="extension"
-                >
-                  extension
-                </span>
-              </i>
-               
-              Extensions
-            </div>
-            <div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-some-test-extension-id"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  some-test-extension-id
-                </div>
-              </div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-extension-some-other-test-extension-id"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  some-other-test-extension-id
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="extensions"
-        >
-          <h2>
-            some-test-extension-id
-             
-            preferences
-          </h2>
-          <section
-            class="small"
-            data-testid="extension-preference-item-for-some-preference-item-id"
-            id="some-preference-item-id"
-          >
-            <div
-              class="SubTitle"
-            >
-              Some preference item
-               
-            </div>
-            <div
-              data-testid="some-preference-item-input"
-            />
-            <div
-              class="hint"
-            >
-              <div
-                data-testid="some-preference-item-hint"
-              />
-            </div>
-          </section>
-          <hr
-            class="small"
-          />
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered renders 1`] = `
-<div>
-  <div
-    class="topBar"
-  >
-    <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
-      <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="application-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
-      <div
-        class="sidebar"
-      >
-        <div
-          class="Tabs flex column"
-        >
-          <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="application"
-        >
-          <h2
-            data-testid="application-header"
-          >
-            Application
-          </h2>
-          <section
-            id="appearance"
-          >
-            <div
-              class="SubTitle"
-            >
-              Theme
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-theme-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-theme-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-theme-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="theme-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="extensionRegistryUrl"
-          >
-            <div
-              class="SubTitle"
-            >
-              Extension Install Registry
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-extension-install-registry-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-extension-install-registry-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-extension-install-registry-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="extension-install-registry-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <p
-              class="mt-4 mb-5 leading-relaxed"
-            >
-              This setting is to change the registry URL for installing extensions by name. 
-              If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-              <b>
-                .npmrc
-              </b>
-               file or in the input below.
-            </p>
-            <div
-              class="Input theme round black disabled invalid"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  disabled=""
-                  placeholder="Custom Extension Registry URL..."
-                  spellcheck="false"
-                  value="some-custom-url"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <hr />
-          <section
-            id="other"
-          >
-            <div
-              class="SubTitle"
-            >
-              Start-up
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Automatically start Lens on login
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-          </section>
-          <hr />
-          <section
-            id="update-channel"
-          >
-            <div
-              class="SubTitle"
-            >
-              Update Channel
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-update-channel-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__single-value css-qc6sy-singleValue"
-                  >
-                    Stable
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="update-channel-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="locale"
-          >
-            <div
-              class="SubTitle"
-            >
-              Locale Timezone
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-timezone-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-timezone-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-timezone-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="timezone-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered when extension with specific preferences is enabled renders 1`] = `
-<div>
-  <div
-    class="topBar"
-  >
-    <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
-      <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="application-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
-      <div
-        class="sidebar"
-      >
-        <div
-          class="Tabs flex column"
-        >
-          <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            data-testid="extension-settings"
-          >
-            <hr />
-            <div
-              class="header flex items-center"
-            >
-              <i
-                class="Icon mr-3 material focusable smallest"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="extension"
-                >
-                  extension
-                </span>
-              </i>
-               
-              Extensions
-            </div>
-            <div>
-              <div
-                class="Tab flex gaps align-center"
-                data-testid="tab-link-for-extension-some-test-extension-id"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  some-test-extension-id
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="application"
-        >
-          <h2
-            data-testid="application-header"
-          >
-            Application
-          </h2>
-          <section
-            id="appearance"
-          >
-            <div
-              class="SubTitle"
-            >
-              Theme
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-theme-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-theme-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-theme-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="theme-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="extensionRegistryUrl"
-          >
-            <div
-              class="SubTitle"
-            >
-              Extension Install Registry
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-extension-install-registry-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-extension-install-registry-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-extension-install-registry-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="extension-install-registry-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <p
-              class="mt-4 mb-5 leading-relaxed"
-            >
-              This setting is to change the registry URL for installing extensions by name. 
-              If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-              <b>
-                .npmrc
-              </b>
-               file or in the input below.
-            </p>
-            <div
-              class="Input theme round black disabled invalid"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  disabled=""
-                  placeholder="Custom Extension Registry URL..."
-                  spellcheck="false"
-                  value="some-custom-url"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <hr />
-          <section
-            id="other"
-          >
-            <div
-              class="SubTitle"
-            >
-              Start-up
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Automatically start Lens on login
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-          </section>
-          <hr />
-          <section
-            id="update-channel"
-          >
-            <div
-              class="SubTitle"
-            >
-              Update Channel
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-update-channel-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__single-value css-qc6sy-singleValue"
-                  >
-                    Stable
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="update-channel-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="locale"
-          >
-            <div
-              class="SubTitle"
-            >
-              Locale Timezone
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-timezone-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-timezone-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-timezone-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="timezone-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered when extension with specific preferences is enabled when navigating to extension preferences using navigation renders 1`] = `
-<div>
-  <div
-    class="topBar"
-  >
-    <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
-      <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="extension-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
-      <div
-        class="sidebar"
-      >
-        <div
-          class="Tabs flex column"
-        >
-          <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            data-testid="extension-settings"
-          >
-            <hr />
-            <div
-              class="header flex items-center"
-            >
-              <i
-                class="Icon mr-3 material focusable smallest"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="extension"
-                >
-                  extension
-                </span>
-              </i>
-               
-              Extensions
-            </div>
-            <div>
-              <div
-                class="Tab flex gaps align-center active"
-                data-testid="tab-link-for-extension-some-test-extension-id"
-                role="tab"
-                tabindex="0"
-              >
-                <div
-                  class="label"
-                >
-                  some-test-extension-id
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="extensions"
-        >
-          <h2>
-            some-test-extension-id
-             
-            preferences
-          </h2>
-          <section
-            class="small"
-            data-testid="extension-preference-item-for-some-preference-item-id"
-            id="some-preference-item-id"
-          >
-            <div
-              class="SubTitle"
-            >
-              Some preference item
-               
-            </div>
-            <div
-              data-testid="some-preference-item-input"
-            />
-            <div
-              class="hint"
-            >
-              <div
-                data-testid="some-preference-item-hint"
-              />
-            </div>
-          </section>
-          <hr
-            class="small"
-          />
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
-</div>
-`;
-
-exports[`preferences - navigation to extension specific preferences given in preferences, when rendered when extension with specific preferences is enabled when navigating to extension preferences using navigation when extension is disabled renders 1`] = `
-<body>
-  <div>
     <div
       class="topBar"
     >
@@ -2602,6 +65,225 @@ exports[`preferences - navigation to extension specific preferences given in pre
         class="items"
       />
     </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="extension-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Metrics tab
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="extensions"
+            >
+              <h2>
+                registered-tab-page-id
+                 
+                preferences
+              </h2>
+              <section
+                class="small"
+                data-testid="extension-preference-item-for-metrics-preference-item-id"
+                id="metrics-preference-item-id"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  License item
+                   
+                </div>
+                <div
+                  data-testid="metrics-preference-item-input"
+                />
+                <div
+                  class="hint"
+                >
+                  <div
+                    data-testid="metrics-preference-item-hint"
+                  />
+                </div>
+              </section>
+              <hr
+                class="small"
+              />
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
     <div
       class="StatusBar"
     >
@@ -2624,144 +306,2878 @@ exports[`preferences - navigation to extension specific preferences given in pre
         data-testid="status-bar-right"
       />
     </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extensions with tabs having same id when navigating to first extension tab renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
     <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="extension-preferences-page"
+      class="topBar"
     >
-      <nav
-        class="sidebarRegion"
+      <div
+        class="items"
       >
-        <div
-          class="sidebar"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="extension-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="Tabs flex column"
+            class="sidebar"
           >
             <div
-              class="header"
-            >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
+              class="Tabs flex column"
             >
               <div
-                class="label"
+                class="header"
               >
-                App
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Metrics tab
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Metrics tab
+                </div>
               </div>
             </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="extensions"
+            >
+              <h2>
+                registered-tab-page-id
+                 
+                preferences
+              </h2>
+              <section
+                class="small"
+                data-testid="extension-preference-item-for-metrics-preference-item-id"
+                id="metrics-preference-item-id"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  License item
+                   
+                </div>
+                <div
+                  data-testid="metrics-preference-item-input"
+                />
+                <div
+                  class="hint"
+                >
+                  <div
+                    data-testid="metrics-preference-item-hint"
+                  />
+                </div>
+              </section>
+              <hr
+                class="small"
+              />
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
             <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
+              class="fixed top-[60px]"
             >
               <div
-                class="label"
+                data-testid="close-preferences"
               >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
               </div>
             </div>
           </div>
         </div>
-      </nav>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
       <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
       >
-        <div
-          class="content"
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
         >
-          <section
-            id="extensions"
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
           >
-            <h2>
-               
-              preferences
-            </h2>
-            <div
-              class="flex items-center"
-              data-testid="error-for-extension-not-being-present"
-            >
-              No extension found
-            </div>
-          </section>
-        </div>
+            arrow_left
+          </span>
+        </i>
         <div
-          class="toolsRegion"
+          class="HotbarIndex"
         >
           <div
-            class="fixed top-[60px]"
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extensions with tabs having same id when navigating to second extension tab renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="extension-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
           >
             <div
-              data-testid="close-preferences"
+              class="Tabs flex column"
             >
               <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
+                class="header"
               >
-                <i
-                  class="Icon icon material focusable"
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Metrics tab
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Metrics tab
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="extensions"
+            >
+              <h2>
+                duplicated-tab-page-id
+                 
+                preferences
+              </h2>
+              <section
+                class="small"
+                data-testid="extension-preference-item-for-another-metrics-preference-item-id"
+                id="another-metrics-preference-item-id"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Another metrics
+                   
+                </div>
+                <div
+                  data-testid="another-metrics-preference-item-input"
+                />
+                <div
+                  class="hint"
+                >
+                  <div
+                    data-testid="another-metrics-preference-item-hint"
+                  />
+                </div>
+              </section>
+              <hr
+                class="small"
+              />
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given multiple extensions with specific preferences, when navigating to extension specific preferences page renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="extension-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                data-testid="extension-settings"
+              >
+                <hr />
+                <div
+                  class="header flex items-center"
+                >
+                  <i
+                    class="Icon mr-3 material focusable smallest"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="extension"
+                    >
+                      extension
+                    </span>
+                  </i>
+                   
+                  Extensions
+                </div>
+                <div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-testid="tab-link-for-extension-some-test-extension-id"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      some-test-extension-id
+                    </div>
+                  </div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-testid="tab-link-for-extension-some-other-test-extension-id"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      some-other-test-extension-id
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="extensions"
+            >
+              <h2>
+                some-test-extension-id
+                 
+                preferences
+              </h2>
+              <section
+                class="small"
+                data-testid="extension-preference-item-for-some-preference-item-id"
+                id="some-preference-item-id"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Some preference item
+                   
+                </div>
+                <div
+                  data-testid="some-preference-item-input"
+                />
+                <div
+                  class="hint"
+                >
+                  <div
+                    data-testid="some-preference-item-hint"
+                  />
+                </div>
+              </section>
+              <hr
+                class="small"
+              />
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="application-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="application"
+            >
+              <h2
+                data-testid="application-header"
+              >
+                Application
+              </h2>
+              <section
+                id="appearance"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Theme
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
                 >
                   <span
-                    class="icon"
-                    data-icon-name="close"
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-theme-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
                   >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-theme-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-theme-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="theme-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="extensionRegistryUrl"
               >
-                ESC
+                <div
+                  class="SubTitle"
+                >
+                  Extension Install Registry
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-extension-install-registry-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-extension-install-registry-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-extension-install-registry-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="extension-install-registry-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <p
+                  class="mt-4 mb-5 leading-relaxed"
+                >
+                  This setting is to change the registry URL for installing extensions by name. 
+                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                  <b>
+                    .npmrc
+                  </b>
+                   file or in the input below.
+                </p>
+                <div
+                  class="Input theme round black disabled invalid"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      disabled=""
+                      placeholder="Custom Extension Registry URL..."
+                      spellcheck="false"
+                      value="some-custom-url"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <hr />
+              <section
+                id="other"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Start-up
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Automatically start Lens on login
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+              </section>
+              <hr />
+              <section
+                id="update-channel"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Update Channel
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-update-channel-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__single-value css-qc6sy-singleValue"
+                      >
+                        Stable
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="update-channel-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="locale"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Locale Timezone
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-timezone-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-timezone-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-timezone-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="timezone-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
               </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered when extension with specific preferences is enabled renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="application-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                data-testid="extension-settings"
+              >
+                <hr />
+                <div
+                  class="header flex items-center"
+                >
+                  <i
+                    class="Icon mr-3 material focusable smallest"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="extension"
+                    >
+                      extension
+                    </span>
+                  </i>
+                   
+                  Extensions
+                </div>
+                <div>
+                  <div
+                    class="Tab flex gaps align-center"
+                    data-testid="tab-link-for-extension-some-test-extension-id"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      some-test-extension-id
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="application"
+            >
+              <h2
+                data-testid="application-header"
+              >
+                Application
+              </h2>
+              <section
+                id="appearance"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Theme
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-theme-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-theme-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-theme-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="theme-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="extensionRegistryUrl"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Extension Install Registry
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-extension-install-registry-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-extension-install-registry-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-extension-install-registry-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="extension-install-registry-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <p
+                  class="mt-4 mb-5 leading-relaxed"
+                >
+                  This setting is to change the registry URL for installing extensions by name. 
+                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                  <b>
+                    .npmrc
+                  </b>
+                   file or in the input below.
+                </p>
+                <div
+                  class="Input theme round black disabled invalid"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      disabled=""
+                      placeholder="Custom Extension Registry URL..."
+                      spellcheck="false"
+                      value="some-custom-url"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <hr />
+              <section
+                id="other"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Start-up
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Automatically start Lens on login
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+              </section>
+              <hr />
+              <section
+                id="update-channel"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Update Channel
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-update-channel-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__single-value css-qc6sy-singleValue"
+                      >
+                        Stable
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="update-channel-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="locale"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Locale Timezone
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-timezone-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-timezone-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-timezone-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="timezone-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered when extension with specific preferences is enabled when navigating to extension preferences using navigation renders 1`] = `
+<div>
+  <div
+    class="ClusterManager"
+  >
+    <div
+      class="topBar"
+    >
+      <div
+        class="items"
+      >
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="extension-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                data-testid="extension-settings"
+              >
+                <hr />
+                <div
+                  class="header flex items-center"
+                >
+                  <i
+                    class="Icon mr-3 material focusable smallest"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="extension"
+                    >
+                      extension
+                    </span>
+                  </i>
+                   
+                  Extensions
+                </div>
+                <div>
+                  <div
+                    class="Tab flex gaps align-center active"
+                    data-testid="tab-link-for-extension-some-test-extension-id"
+                    role="tab"
+                    tabindex="0"
+                  >
+                    <div
+                      class="label"
+                    >
+                      some-test-extension-id
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="extensions"
+            >
+              <h2>
+                some-test-extension-id
+                 
+                preferences
+              </h2>
+              <section
+                class="small"
+                data-testid="extension-preference-item-for-some-preference-item-id"
+                id="some-preference-item-id"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Some preference item
+                   
+                </div>
+                <div
+                  data-testid="some-preference-item-input"
+                />
+                <div
+                  class="hint"
+                >
+                  <div
+                    data-testid="some-preference-item-hint"
+                  />
+                </div>
+              </section>
+              <hr
+                class="small"
+              />
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
+  </div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
+</div>
+`;
+
+exports[`preferences - navigation to extension specific preferences given in preferences, when rendered when extension with specific preferences is enabled when navigating to extension preferences using navigation when extension is disabled renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="extension-preferences-page"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  class="header"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="extensions"
+              >
+                <h2>
+                   
+                  preferences
+                </h2>
+                <div
+                  class="flex items-center"
+                  data-testid="error-for-extension-not-being-present"
+                >
+                  No extension found
+                </div>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
@@ -2773,241 +3189,293 @@ exports[`preferences - navigation to extension specific preferences given in pre
 exports[`preferences - navigation to extension specific preferences when navigating to extension specific tab renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
-        </div>
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
       </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="extension-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
+    <main>
       <div
-        class="sidebar"
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="extension-preferences-page"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Metrics tab
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="extensions"
-        >
-          <h2>
-            duplicated-tab-page-id
-             
-            preferences
-          </h2>
-          <section
-            class="small"
-            data-testid="extension-preference-item-for-another-metrics-preference-item-id"
-            id="another-metrics-preference-item-id"
-          >
-            <div
-              class="SubTitle"
-            >
-              Another metrics
-               
-            </div>
-            <div
-              data-testid="another-metrics-preference-item-input"
-            />
-            <div
-              class="hint"
+              class="Tabs flex column"
             >
               <div
-                data-testid="another-metrics-preference-item-hint"
-              />
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Metrics tab
+                </div>
+              </div>
             </div>
-          </section>
-          <hr
-            class="small"
-          />
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
+          </div>
+        </nav>
         <div
-          class="fixed top-[60px]"
+          class="contentRegion"
+          id="ScrollSpyRoot"
         >
           <div
-            data-testid="close-preferences"
+            class="content"
+          >
+            <section
+              id="extensions"
+            >
+              <h2>
+                duplicated-tab-page-id
+                 
+                preferences
+              </h2>
+              <section
+                class="small"
+                data-testid="extension-preference-item-for-another-metrics-preference-item-id"
+                id="another-metrics-preference-item-id"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Another metrics
+                   
+                </div>
+                <div
+                  data-testid="another-metrics-preference-item-input"
+                />
+                <div
+                  class="hint"
+                >
+                  <div
+                    data-testid="another-metrics-preference-item-hint"
+                  />
+                </div>
+              </section>
+              <hr
+                class="small"
+              />
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
           >
             <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
+              class="fixed top-[60px]"
             >
-              <i
-                class="Icon icon material focusable"
+              <div
+                data-testid="close-preferences"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
                 >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -3019,241 +3487,293 @@ exports[`preferences - navigation to extension specific preferences when navigat
 exports[`preferences - navigation to extension specific preferences when navigating to someone else extension specific tab renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
-        </div>
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
       </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="extension-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
+    <main>
       <div
-        class="sidebar"
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="extension-preferences-page"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Metrics tab
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="extensions"
-        >
-          <h2>
-            extension-using-someone-else-tab-id
-             
-            preferences
-          </h2>
-          <section
-            class="small"
-            data-testid="extension-preference-item-for-my-preferences-item-id"
-            id="my-preferences-item-id"
-          >
-            <div
-              class="SubTitle"
-            >
-              My preferences
-               
-            </div>
-            <div
-              data-testid="my-preferences-item-input"
-            />
-            <div
-              class="hint"
+              class="Tabs flex column"
             >
               <div
-                data-testid="my-preferences-item-hint"
-              />
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Metrics tab
+                </div>
+              </div>
             </div>
-          </section>
-          <hr
-            class="small"
-          />
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
+          </div>
+        </nav>
         <div
-          class="fixed top-[60px]"
+          class="contentRegion"
+          id="ScrollSpyRoot"
         >
           <div
-            data-testid="close-preferences"
+            class="content"
+          >
+            <section
+              id="extensions"
+            >
+              <h2>
+                extension-using-someone-else-tab-id
+                 
+                preferences
+              </h2>
+              <section
+                class="small"
+                data-testid="extension-preference-item-for-my-preferences-item-id"
+                id="my-preferences-item-id"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  My preferences
+                   
+                </div>
+                <div
+                  data-testid="my-preferences-item-input"
+                />
+                <div
+                  class="hint"
+                >
+                  <div
+                    data-testid="my-preferences-item-hint"
+                  />
+                </div>
+              </section>
+              <hr
+                class="small"
+              />
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
           >
             <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
+              class="fixed top-[60px]"
             >
-              <i
-                class="Icon icon material focusable"
+              <div
+                data-testid="close-preferences"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
                 >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
index 4d6d8c71b5..5dfb39ed50 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
@@ -3,591 +3,643 @@
 exports[`preferences - navigation to kubernetes preferences given in preferences, when rendered renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="application-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="application"
+            >
+              <h2
+                data-testid="application-header"
+              >
+                Application
+              </h2>
+              <section
+                id="appearance"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Theme
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-theme-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-theme-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-theme-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="theme-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="extensionRegistryUrl"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Extension Install Registry
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-extension-install-registry-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-extension-install-registry-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-extension-install-registry-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="extension-install-registry-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <p
+                  class="mt-4 mb-5 leading-relaxed"
+                >
+                  This setting is to change the registry URL for installing extensions by name. 
+                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                  <b>
+                    .npmrc
+                  </b>
+                   file or in the input below.
+                </p>
+                <div
+                  class="Input theme round black disabled invalid"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      disabled=""
+                      placeholder="Custom Extension Registry URL..."
+                      spellcheck="false"
+                      value="some-custom-url"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <hr />
+              <section
+                id="other"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Start-up
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Automatically start Lens on login
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+              </section>
+              <hr />
+              <section
+                id="update-channel"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Update Channel
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-update-channel-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__single-value css-qc6sy-singleValue"
+                      >
+                        Stable
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="update-channel-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="locale"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Locale Timezone
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-timezone-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-timezone-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-timezone-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="timezone-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="application-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
+      class="StatusBar"
     >
       <div
-        class="sidebar"
+        class="leftSide"
+        data-testid="status-bar-left"
       >
         <div
-          class="Tabs flex column"
+          class="item"
         >
           <div
-            class="header"
+            data-testid="app-update-not-available"
           >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
+            No new updates available
           </div>
         </div>
       </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
       <div
-        class="content"
-      >
-        <section
-          id="application"
-        >
-          <h2
-            data-testid="application-header"
-          >
-            Application
-          </h2>
-          <section
-            id="appearance"
-          >
-            <div
-              class="SubTitle"
-            >
-              Theme
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-theme-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-theme-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-theme-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="theme-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="extensionRegistryUrl"
-          >
-            <div
-              class="SubTitle"
-            >
-              Extension Install Registry
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-extension-install-registry-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-extension-install-registry-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-extension-install-registry-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="extension-install-registry-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <p
-              class="mt-4 mb-5 leading-relaxed"
-            >
-              This setting is to change the registry URL for installing extensions by name. 
-              If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-              <b>
-                .npmrc
-              </b>
-               file or in the input below.
-            </p>
-            <div
-              class="Input theme round black disabled invalid"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  disabled=""
-                  placeholder="Custom Extension Registry URL..."
-                  spellcheck="false"
-                  value="some-custom-url"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <hr />
-          <section
-            id="other"
-          >
-            <div
-              class="SubTitle"
-            >
-              Start-up
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Automatically start Lens on login
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-          </section>
-          <hr />
-          <section
-            id="update-channel"
-          >
-            <div
-              class="SubTitle"
-            >
-              Update Channel
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-update-channel-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__single-value css-qc6sy-singleValue"
-                  >
-                    Stable
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="update-channel-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="locale"
-          >
-            <div
-              class="SubTitle"
-            >
-              Locale Timezone
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-timezone-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-timezone-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-timezone-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="timezone-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -599,386 +651,187 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
 exports[`preferences - navigation to kubernetes preferences given in preferences, when rendered when navigating to kubernetes preferences using navigation renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
-        </div>
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
       </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="kubernetes-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
+    <main>
       <div
-        class="sidebar"
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="kubernetes-preferences-page"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
+              class="Tabs flex column"
             >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="kubernetes"
-        >
-          <section
-            id="kubectl"
-          >
-            <h2
-              data-testid="kubernetes-header"
-            >
-              Kubernetes
-            </h2>
-            <section>
               <div
-                class="SubTitle"
+                class="header"
               >
-                Kubectl binary download
-                 
-              </div>
-              <label
-                class="Switch"
-                data-testid="switch"
-              >
-                Download kubectl binaries matching the Kubernetes cluster version
-                <input
-                  role="switch"
-                  type="checkbox"
-                />
-              </label>
-            </section>
-            <section>
-              <div
-                class="SubTitle"
-              >
-                Download mirror
-                 
+                Preferences
               </div>
               <div
-                class="Select theme-lens Select--is-disabled css-3iigni-container"
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
               >
-                <span
-                  class="css-1f43avz-a11yText-A11yText"
-                  id="react-select-download-mirror-input-live-region"
-                />
-                <span
-                  aria-atomic="false"
-                  aria-live="polite"
-                  aria-relevant="additions text"
-                  class="css-1f43avz-a11yText-A11yText"
-                />
                 <div
-                  class="Select__control Select__control--is-disabled css-1insrsq-control"
+                  class="label"
                 >
-                  <div
-                    class="Select__value-container css-319lph-ValueContainer"
-                  >
-                    <div
-                      class="Select__placeholder css-14el2xx-placeholder"
-                      id="react-select-download-mirror-input-placeholder"
-                    >
-                      Download mirror for kubectl
-                    </div>
-                    <div
-                      class="Select__input-container css-jzldcf-Input"
-                      data-value=""
-                    >
-                      <input
-                        aria-autocomplete="list"
-                        aria-describedby="react-select-download-mirror-input-placeholder"
-                        aria-expanded="false"
-                        aria-haspopup="true"
-                        autocapitalize="none"
-                        autocomplete="off"
-                        autocorrect="off"
-                        class="Select__input"
-                        disabled=""
-                        id="download-mirror-input"
-                        role="combobox"
-                        spellcheck="false"
-                        style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                        tabindex="0"
-                        type="text"
-                        value=""
-                      />
-                    </div>
-                  </div>
-                  <div
-                    class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                  >
-                    <span
-                      class="Select__indicator-separator css-109onse-indicatorSeparator"
-                    />
-                    <div
-                      aria-hidden="true"
-                      class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="css-tj5bde-Svg"
-                        focusable="false"
-                        height="20"
-                        viewBox="0 0 20 20"
-                        width="20"
-                      >
-                        <path
-                          d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                        />
-                      </svg>
-                    </div>
-                  </div>
+                  App
                 </div>
               </div>
-            </section>
-            <section>
               <div
-                class="SubTitle"
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
               >
-                Directory for binaries
-                 
-              </div>
-              <div
-                class="Input theme round black disabled"
-              >
-                <label
-                  class="input-area flex gaps align-center"
-                  id=""
-                >
-                  <input
-                    class="input box grow"
-                    disabled=""
-                    placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
-                    spellcheck="false"
-                    value=""
-                  />
-                </label>
                 <div
-                  class="input-info flex gaps"
-                />
-              </div>
-              <div
-                class="hint"
-              >
-                The directory to download binaries into.
-              </div>
-            </section>
-            <section>
-              <div
-                class="SubTitle"
-              >
-                Path to kubectl binary
-                 
-              </div>
-              <div
-                class="Input theme round black"
-              >
-                <label
-                  class="input-area flex gaps align-center"
-                  id=""
+                  class="label"
                 >
-                  <input
-                    class="input box grow"
-                    placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
-                    spellcheck="false"
-                    value=""
-                  />
-                </label>
-                <div
-                  class="input-info flex gaps"
-                />
+                  Proxy
+                </div>
               </div>
-            </section>
-          </section>
-          <hr />
-          <section
-            id="kube-sync"
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
           >
-            <h2
-              data-testid="kubernetes-sync-header"
+            <section
+              id="kubernetes"
             >
-              Kubeconfig Syncs
-            </h2>
-            <div
-              class="self-start mb-5"
-            >
-              <button
-                class="Button PathPicker primary"
-                type="button"
+              <section
+                id="kubectl"
               >
-                Sync Files and Folders
-              </button>
-            </div>
-            <div
-              class="SubTitle pt-5"
-            >
-              Synced Items
-               
-            </div>
-            <div
-              class="notice mt-3"
-            >
-              <div
-                class="flex-grow text-center"
-              >
-                No files and folders have been synced yet
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="helm"
-          >
-            <h2>
-              Helm Charts
-            </h2>
-            <div>
-              <div
-                data-testid="helm-controls"
-              >
-                <div
-                  class="flex gaps"
+                <h2
+                  data-testid="kubernetes-header"
                 >
+                  Kubernetes
+                </h2>
+                <section>
                   <div
-                    class="Select theme-lens box grow css-b62m3t-container"
+                    class="SubTitle"
+                  >
+                    Kubectl binary download
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Download kubectl binaries matching the Kubernetes cluster version
+                    <input
+                      role="switch"
+                      type="checkbox"
+                    />
+                  </label>
+                </section>
+                <section>
+                  <div
+                    class="SubTitle"
+                  >
+                    Download mirror
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens Select--is-disabled css-3iigni-container"
                   >
                     <span
                       class="css-1f43avz-a11yText-A11yText"
-                      id="react-select-selection-of-active-public-helm-repository-live-region"
+                      id="react-select-download-mirror-input-live-region"
                     />
                     <span
                       aria-atomic="false"
@@ -987,31 +840,32 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
                       class="css-1f43avz-a11yText-A11yText"
                     />
                     <div
-                      class="Select__control css-1s2u09g-control"
+                      class="Select__control Select__control--is-disabled css-1insrsq-control"
                     >
                       <div
                         class="Select__value-container css-319lph-ValueContainer"
                       >
                         <div
                           class="Select__placeholder css-14el2xx-placeholder"
-                          id="react-select-selection-of-active-public-helm-repository-placeholder"
+                          id="react-select-download-mirror-input-placeholder"
                         >
-                          Repositories
+                          Download mirror for kubectl
                         </div>
                         <div
-                          class="Select__input-container css-6j8wv5-Input"
+                          class="Select__input-container css-jzldcf-Input"
                           data-value=""
                         >
                           <input
                             aria-autocomplete="list"
-                            aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                            aria-describedby="react-select-download-mirror-input-placeholder"
                             aria-expanded="false"
                             aria-haspopup="true"
                             autocapitalize="none"
                             autocomplete="off"
                             autocorrect="off"
                             class="Select__input"
-                            id="selection-of-active-public-helm-repository"
+                            disabled=""
+                            id="download-mirror-input"
                             role="combobox"
                             spellcheck="false"
                             style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
@@ -1025,7 +879,7 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
                         class="Select__indicators css-1hb7zxy-IndicatorsContainer"
                       >
                         <span
-                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                          class="Select__indicator-separator css-109onse-indicatorSeparator"
                         />
                         <div
                           aria-hidden="true"
@@ -1047,57 +901,307 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
                       </div>
                     </div>
                   </div>
+                </section>
+                <section>
+                  <div
+                    class="SubTitle"
+                  >
+                    Directory for binaries
+                     
+                  </div>
+                  <div
+                    class="Input theme round black disabled"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries"
+                        spellcheck="false"
+                        value=""
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                  <div
+                    class="hint"
+                  >
+                    The directory to download binaries into.
+                  </div>
+                </section>
+                <section>
+                  <div
+                    class="SubTitle"
+                  >
+                    Path to kubectl binary
+                     
+                  </div>
+                  <div
+                    class="Input theme round black"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        placeholder="/some-absolute-root-directory/some-electron-app-path-for-user-data/binaries/kubectl"
+                        spellcheck="false"
+                        value=""
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+              </section>
+              <hr />
+              <section
+                id="kube-sync"
+              >
+                <h2
+                  data-testid="kubernetes-sync-header"
+                >
+                  Kubeconfig Syncs
+                </h2>
+                <div
+                  class="self-start mb-5"
+                >
                   <button
-                    class="Button primary"
-                    data-testid="add-custom-helm-repo-button"
+                    class="Button PathPicker primary"
                     type="button"
                   >
-                    Add Custom Helm Repo
+                    Sync Files and Folders
                   </button>
                 </div>
                 <div
-                  class="repos"
-                />
-                <div />
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
+                  class="SubTitle pt-5"
+                >
+                  Synced Items
+                   
+                </div>
+                <div
+                  class="notice mt-3"
+                >
+                  <div
+                    class="flex-grow text-center"
+                  >
+                    No files and folders have been synced yet
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="helm"
+              >
+                <h2>
+                  Helm Charts
+                </h2>
+                <div>
+                  <div
+                    data-testid="helm-controls"
+                  >
+                    <div
+                      class="flex gaps"
+                    >
+                      <div
+                        class="Select theme-lens box grow css-b62m3t-container"
+                      >
+                        <span
+                          class="css-1f43avz-a11yText-A11yText"
+                          id="react-select-selection-of-active-public-helm-repository-live-region"
+                        />
+                        <span
+                          aria-atomic="false"
+                          aria-live="polite"
+                          aria-relevant="additions text"
+                          class="css-1f43avz-a11yText-A11yText"
+                        />
+                        <div
+                          class="Select__control css-1s2u09g-control"
+                        >
+                          <div
+                            class="Select__value-container css-319lph-ValueContainer"
+                          >
+                            <div
+                              class="Select__placeholder css-14el2xx-placeholder"
+                              id="react-select-selection-of-active-public-helm-repository-placeholder"
+                            >
+                              Repositories
+                            </div>
+                            <div
+                              class="Select__input-container css-6j8wv5-Input"
+                              data-value=""
+                            >
+                              <input
+                                aria-autocomplete="list"
+                                aria-describedby="react-select-selection-of-active-public-helm-repository-placeholder"
+                                aria-expanded="false"
+                                aria-haspopup="true"
+                                autocapitalize="none"
+                                autocomplete="off"
+                                autocorrect="off"
+                                class="Select__input"
+                                id="selection-of-active-public-helm-repository"
+                                role="combobox"
+                                spellcheck="false"
+                                style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                                tabindex="0"
+                                type="text"
+                                value=""
+                              />
+                            </div>
+                          </div>
+                          <div
+                            class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                          >
+                            <span
+                              class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                            />
+                            <div
+                              aria-hidden="true"
+                              class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                            >
+                              <svg
+                                aria-hidden="true"
+                                class="css-tj5bde-Svg"
+                                focusable="false"
+                                height="20"
+                                viewBox="0 0 20 20"
+                                width="20"
+                              >
+                                <path
+                                  d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                                />
+                              </svg>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <button
+                        class="Button primary"
+                        data-testid="add-custom-helm-repo-button"
+                        type="button"
+                      >
+                        Add Custom Helm Repo
+                      </button>
+                    </div>
+                    <div
+                      class="repos"
+                    />
+                    <div />
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
           <div
-            data-testid="close-preferences"
+            class="toolsRegion"
           >
             <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
+              class="fixed top-[60px]"
             >
-              <i
-                class="Icon icon material focusable"
+              <div
+                data-testid="close-preferences"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
                 >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
index d2d3ede6b7..1666f75703 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
@@ -3,591 +3,643 @@
 exports[`preferences - navigation to proxy preferences given in preferences, when rendered renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="application-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="application"
+            >
+              <h2
+                data-testid="application-header"
+              >
+                Application
+              </h2>
+              <section
+                id="appearance"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Theme
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-theme-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-theme-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-theme-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="theme-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="extensionRegistryUrl"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Extension Install Registry
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-extension-install-registry-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-extension-install-registry-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-extension-install-registry-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="extension-install-registry-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <p
+                  class="mt-4 mb-5 leading-relaxed"
+                >
+                  This setting is to change the registry URL for installing extensions by name. 
+                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                  <b>
+                    .npmrc
+                  </b>
+                   file or in the input below.
+                </p>
+                <div
+                  class="Input theme round black disabled invalid"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      disabled=""
+                      placeholder="Custom Extension Registry URL..."
+                      spellcheck="false"
+                      value="some-custom-url"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <hr />
+              <section
+                id="other"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Start-up
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Automatically start Lens on login
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+              </section>
+              <hr />
+              <section
+                id="update-channel"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Update Channel
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-update-channel-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__single-value css-qc6sy-singleValue"
+                      >
+                        Stable
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="update-channel-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="locale"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Locale Timezone
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-timezone-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-timezone-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-timezone-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="timezone-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="application-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
+      class="StatusBar"
     >
       <div
-        class="sidebar"
+        class="leftSide"
+        data-testid="status-bar-left"
       >
         <div
-          class="Tabs flex column"
+          class="item"
         >
           <div
-            class="header"
+            data-testid="app-update-not-available"
           >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
+            No new updates available
           </div>
         </div>
       </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
       <div
-        class="content"
-      >
-        <section
-          id="application"
-        >
-          <h2
-            data-testid="application-header"
-          >
-            Application
-          </h2>
-          <section
-            id="appearance"
-          >
-            <div
-              class="SubTitle"
-            >
-              Theme
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-theme-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-theme-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-theme-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="theme-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="extensionRegistryUrl"
-          >
-            <div
-              class="SubTitle"
-            >
-              Extension Install Registry
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-extension-install-registry-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-extension-install-registry-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-extension-install-registry-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="extension-install-registry-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <p
-              class="mt-4 mb-5 leading-relaxed"
-            >
-              This setting is to change the registry URL for installing extensions by name. 
-              If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-              <b>
-                .npmrc
-              </b>
-               file or in the input below.
-            </p>
-            <div
-              class="Input theme round black disabled invalid"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  disabled=""
-                  placeholder="Custom Extension Registry URL..."
-                  spellcheck="false"
-                  value="some-custom-url"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <hr />
-          <section
-            id="other"
-          >
-            <div
-              class="SubTitle"
-            >
-              Start-up
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Automatically start Lens on login
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-          </section>
-          <hr />
-          <section
-            id="update-channel"
-          >
-            <div
-              class="SubTitle"
-            >
-              Update Channel
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-update-channel-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__single-value css-qc6sy-singleValue"
-                  >
-                    Stable
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="update-channel-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="locale"
-          >
-            <div
-              class="SubTitle"
-            >
-              Locale Timezone
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-timezone-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-timezone-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-timezone-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="timezone-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -599,267 +651,319 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
 exports[`preferences - navigation to proxy preferences given in preferences, when rendered when navigating to proxy preferences using navigation renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
-        </div>
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
       </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="proxy-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
+    <main>
       <div
-        class="sidebar"
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="proxy-preferences-page"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
+              class="Tabs flex column"
             >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="proxy"
-        >
-          <section>
-            <h2
-              data-testid="proxy-header"
-            >
-              Proxy
-            </h2>
-            <div
-              class="SubTitle"
-            >
-              HTTP Proxy
-               
-            </div>
-            <div
-              class="Input theme round black"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
-                  spellcheck="false"
-                  value=""
-                />
-              </label>
               <div
-                class="input-info flex gaps"
-              />
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
             </div>
-            <small
-              class="hint"
-            >
-              Proxy is used only for non-cluster communication.
-            </small>
-          </section>
-          <hr
-            class="small"
-          />
-          <section
-            class="small"
-          >
-            <div
-              class="SubTitle"
-            >
-              Certificate Trust
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Allow untrusted Certificate Authorities
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-            <small
-              class="hint"
-            >
-              This will make Lens to trust ANY certificate authority without any validations.
-               
-              Needed with some corporate proxies that do certificate re-writing.
-               
-              Does not affect cluster communications!
-            </small>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
+          </div>
+        </nav>
         <div
-          class="fixed top-[60px]"
+          class="contentRegion"
+          id="ScrollSpyRoot"
         >
           <div
-            data-testid="close-preferences"
+            class="content"
+          >
+            <section
+              id="proxy"
+            >
+              <section>
+                <h2
+                  data-testid="proxy-header"
+                >
+                  Proxy
+                </h2>
+                <div
+                  class="SubTitle"
+                >
+                  HTTP Proxy
+                   
+                </div>
+                <div
+                  class="Input theme round black"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      placeholder="Type HTTP proxy url (example: http://proxy.acme.org:8080)"
+                      spellcheck="false"
+                      value=""
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+                <small
+                  class="hint"
+                >
+                  Proxy is used only for non-cluster communication.
+                </small>
+              </section>
+              <hr
+                class="small"
+              />
+              <section
+                class="small"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Certificate Trust
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Allow untrusted Certificate Authorities
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+                <small
+                  class="hint"
+                >
+                  This will make Lens to trust ANY certificate authority without any validations.
+                   
+                  Needed with some corporate proxies that do certificate re-writing.
+                   
+                  Does not affect cluster communications!
+                </small>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
           >
             <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
+              class="fixed top-[60px]"
             >
-              <i
-                class="Icon icon material focusable"
+              <div
+                data-testid="close-preferences"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
                 >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap b/src/behaviours/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
index d8d1964ceb..b76a864502 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
@@ -3,253 +3,305 @@
 exports[`preferences - navigation to telemetry preferences given URL for Sentry DNS, when navigating to preferences when navigating to telemetry preferences renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
+      class="topBar"
     >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
+      <div
+        class="items"
       >
-        <span
-          class="icon"
-          data-icon-name="home"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
         >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
         >
-          arrow_forward
-        </span>
-      </i>
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
+    <main>
       <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="telemetry-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
+        id="lens-views"
+      />
       <div
-        class="sidebar"
+        class="SettingLayout showNavigation Preferences"
+        data-testid="telemetry-preferences-page"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
+              class="Tabs flex column"
             >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-telemetry"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Telemetry
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="telemetry"
-        >
-          <h2
-            data-testid="telemetry-header"
-          >
-            Telemetry
-          </h2>
-          <section
-            class="small"
-            data-testid="telemetry-preferences-for-automatic-error-reporting"
-            id="sentry"
-          >
-            <div
-              class="SubTitle"
-            >
-              Automatic Error Reporting
-               
-            </div>
-            <label
-              class="Checkbox flex align-center"
-            >
-              <input
-                type="checkbox"
-              />
-              <i
-                class="box flex align-center"
-              />
-              <span
-                class="label"
+              <div
+                class="header"
               >
-                Allow automatic error reporting
-              </span>
-            </label>
-            <div
-              class="hint"
-            >
-              <span>
-                Automatic error reports provide vital information about issues and application crashes. It is highly recommended to keep this feature enabled to ensure fast turnaround for issues you might encounter.
-              </span>
-            </div>
-          </section>
-          <hr
-            class="small"
-          />
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                <div
+                  class="label"
                 >
-                  close
-                </span>
-              </i>
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-telemetry"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Telemetry
+                </div>
+              </div>
             </div>
-            <div
-              aria-hidden="true"
-              class="esc"
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="telemetry"
             >
-              ESC
+              <h2
+                data-testid="telemetry-header"
+              >
+                Telemetry
+              </h2>
+              <section
+                class="small"
+                data-testid="telemetry-preferences-for-automatic-error-reporting"
+                id="sentry"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Automatic Error Reporting
+                   
+                </div>
+                <label
+                  class="Checkbox flex align-center"
+                >
+                  <input
+                    type="checkbox"
+                  />
+                  <i
+                    class="box flex align-center"
+                  />
+                  <span
+                    class="label"
+                  >
+                    Allow automatic error reporting
+                  </span>
+                </label>
+                <div
+                  class="hint"
+                >
+                  <span>
+                    Automatic error reports provide vital information about issues and application crashes. It is highly recommended to keep this feature enabled to ensure fast turnaround for issues you might encounter.
+                  </span>
+                </div>
+              </section>
+              <hr
+                class="small"
+              />
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -261,591 +313,643 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
 exports[`preferences - navigation to telemetry preferences given in preferences, when rendered renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="application-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="application"
+            >
+              <h2
+                data-testid="application-header"
+              >
+                Application
+              </h2>
+              <section
+                id="appearance"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Theme
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-theme-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-theme-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-theme-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="theme-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="extensionRegistryUrl"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Extension Install Registry
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-extension-install-registry-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-extension-install-registry-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-extension-install-registry-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="extension-install-registry-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <p
+                  class="mt-4 mb-5 leading-relaxed"
+                >
+                  This setting is to change the registry URL for installing extensions by name. 
+                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                  <b>
+                    .npmrc
+                  </b>
+                   file or in the input below.
+                </p>
+                <div
+                  class="Input theme round black disabled invalid"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      disabled=""
+                      placeholder="Custom Extension Registry URL..."
+                      spellcheck="false"
+                      value="some-custom-url"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <hr />
+              <section
+                id="other"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Start-up
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Automatically start Lens on login
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+              </section>
+              <hr />
+              <section
+                id="update-channel"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Update Channel
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-update-channel-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__single-value css-qc6sy-singleValue"
+                      >
+                        Stable
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="update-channel-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="locale"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Locale Timezone
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-timezone-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-timezone-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-timezone-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="timezone-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="application-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
+      class="StatusBar"
     >
       <div
-        class="sidebar"
+        class="leftSide"
+        data-testid="status-bar-left"
       >
         <div
-          class="Tabs flex column"
+          class="item"
         >
           <div
-            class="header"
+            data-testid="app-update-not-available"
           >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
+            No new updates available
           </div>
         </div>
       </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
       <div
-        class="content"
-      >
-        <section
-          id="application"
-        >
-          <h2
-            data-testid="application-header"
-          >
-            Application
-          </h2>
-          <section
-            id="appearance"
-          >
-            <div
-              class="SubTitle"
-            >
-              Theme
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-theme-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-theme-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-theme-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="theme-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="extensionRegistryUrl"
-          >
-            <div
-              class="SubTitle"
-            >
-              Extension Install Registry
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-extension-install-registry-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-extension-install-registry-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-extension-install-registry-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="extension-install-registry-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <p
-              class="mt-4 mb-5 leading-relaxed"
-            >
-              This setting is to change the registry URL for installing extensions by name. 
-              If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-              <b>
-                .npmrc
-              </b>
-               file or in the input below.
-            </p>
-            <div
-              class="Input theme round black disabled invalid"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  disabled=""
-                  placeholder="Custom Extension Registry URL..."
-                  spellcheck="false"
-                  value="some-custom-url"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <hr />
-          <section
-            id="other"
-          >
-            <div
-              class="SubTitle"
-            >
-              Start-up
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Automatically start Lens on login
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-          </section>
-          <hr />
-          <section
-            id="update-channel"
-          >
-            <div
-              class="SubTitle"
-            >
-              Update Channel
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-update-channel-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__single-value css-qc6sy-singleValue"
-                  >
-                    Stable
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="update-channel-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="locale"
-          >
-            <div
-              class="SubTitle"
-            >
-              Locale Timezone
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-timezone-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-timezone-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-timezone-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="timezone-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -857,603 +961,655 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
 exports[`preferences - navigation to telemetry preferences given in preferences, when rendered when extension with telemetry preference items gets enabled renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="application-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-telemetry"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Telemetry
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="application"
+            >
+              <h2
+                data-testid="application-header"
+              >
+                Application
+              </h2>
+              <section
+                id="appearance"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Theme
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-theme-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-theme-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-theme-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="theme-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="extensionRegistryUrl"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Extension Install Registry
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-extension-install-registry-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-extension-install-registry-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-extension-install-registry-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="extension-install-registry-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <p
+                  class="mt-4 mb-5 leading-relaxed"
+                >
+                  This setting is to change the registry URL for installing extensions by name. 
+                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                  <b>
+                    .npmrc
+                  </b>
+                   file or in the input below.
+                </p>
+                <div
+                  class="Input theme round black disabled invalid"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      disabled=""
+                      placeholder="Custom Extension Registry URL..."
+                      spellcheck="false"
+                      value="some-custom-url"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <hr />
+              <section
+                id="other"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Start-up
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Automatically start Lens on login
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+              </section>
+              <hr />
+              <section
+                id="update-channel"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Update Channel
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-update-channel-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__single-value css-qc6sy-singleValue"
+                      >
+                        Stable
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="update-channel-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="locale"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Locale Timezone
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-timezone-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-timezone-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-timezone-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="timezone-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="application-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
+      class="StatusBar"
     >
       <div
-        class="sidebar"
+        class="leftSide"
+        data-testid="status-bar-left"
       >
         <div
-          class="Tabs flex column"
+          class="item"
         >
           <div
-            class="header"
+            data-testid="app-update-not-available"
           >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-telemetry"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Telemetry
-            </div>
+            No new updates available
           </div>
         </div>
       </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
       <div
-        class="content"
-      >
-        <section
-          id="application"
-        >
-          <h2
-            data-testid="application-header"
-          >
-            Application
-          </h2>
-          <section
-            id="appearance"
-          >
-            <div
-              class="SubTitle"
-            >
-              Theme
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-theme-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-theme-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-theme-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="theme-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="extensionRegistryUrl"
-          >
-            <div
-              class="SubTitle"
-            >
-              Extension Install Registry
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-extension-install-registry-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-extension-install-registry-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-extension-install-registry-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="extension-install-registry-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <p
-              class="mt-4 mb-5 leading-relaxed"
-            >
-              This setting is to change the registry URL for installing extensions by name. 
-              If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-              <b>
-                .npmrc
-              </b>
-               file or in the input below.
-            </p>
-            <div
-              class="Input theme round black disabled invalid"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  disabled=""
-                  placeholder="Custom Extension Registry URL..."
-                  spellcheck="false"
-                  value="some-custom-url"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <hr />
-          <section
-            id="other"
-          >
-            <div
-              class="SubTitle"
-            >
-              Start-up
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Automatically start Lens on login
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-          </section>
-          <hr />
-          <section
-            id="update-channel"
-          >
-            <div
-              class="SubTitle"
-            >
-              Update Channel
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-update-channel-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__single-value css-qc6sy-singleValue"
-                  >
-                    Stable
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="update-channel-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="locale"
-          >
-            <div
-              class="SubTitle"
-            >
-              Locale Timezone
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-timezone-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-timezone-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-timezone-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="timezone-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -1465,241 +1621,293 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
 exports[`preferences - navigation to telemetry preferences given in preferences, when rendered when extension with telemetry preference items gets enabled when clicking link to telemetry preferences from navigation renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
-        </div>
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
       </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="telemetry-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
+    <main>
       <div
-        class="sidebar"
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="telemetry-preferences-page"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-telemetry"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Telemetry
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="telemetry"
-        >
-          <h2
-            data-testid="telemetry-header"
-          >
-            Telemetry
-          </h2>
-          <section
-            class="small"
-            data-testid="telemetry-preference-item-for-some-telemetry-preference-item-id"
-            id="some-telemetry-preference-item-id"
-          >
-            <div
-              class="SubTitle"
-            >
-              Some telemetry-preference item
-               
-            </div>
-            <div
-              data-testid="some-preference-item-input"
-            />
-            <div
-              class="hint"
+              class="Tabs flex column"
             >
               <div
-                data-testid="some-preference-item-hint"
-              />
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-telemetry"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Telemetry
+                </div>
+              </div>
             </div>
-          </section>
-          <hr
-            class="small"
-          />
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
+          </div>
+        </nav>
         <div
-          class="fixed top-[60px]"
+          class="contentRegion"
+          id="ScrollSpyRoot"
         >
           <div
-            data-testid="close-preferences"
+            class="content"
+          >
+            <section
+              id="telemetry"
+            >
+              <h2
+                data-testid="telemetry-header"
+              >
+                Telemetry
+              </h2>
+              <section
+                class="small"
+                data-testid="telemetry-preference-item-for-some-telemetry-preference-item-id"
+                id="some-telemetry-preference-item-id"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Some telemetry-preference item
+                   
+                </div>
+                <div
+                  data-testid="some-preference-item-input"
+                />
+                <div
+                  class="hint"
+                >
+                  <div
+                    data-testid="some-preference-item-hint"
+                  />
+                </div>
+              </section>
+              <hr
+                class="small"
+              />
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
           >
             <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
+              class="fixed top-[60px]"
             >
-              <i
-                class="Icon icon material focusable"
+              <div
+                data-testid="close-preferences"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
                 >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -1711,204 +1919,256 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
 exports[`preferences - navigation to telemetry preferences given no URL for Sentry DNS, when navigating to telemetry preferences renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
+      class="topBar"
     >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
+      <div
+        class="items"
       >
-        <span
-          class="icon"
-          data-icon-name="home"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
         >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
         >
-          arrow_forward
-        </span>
-      </i>
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
     </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
-    >
+    <main>
       <div
-        class="item"
-      >
-        <div
-          data-testid="app-update-not-available"
-        >
-          No new updates available
-        </div>
-      </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="telemetry-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
+        id="lens-views"
+      />
       <div
-        class="sidebar"
+        class="SettingLayout showNavigation Preferences"
+        data-testid="telemetry-preferences-page"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
+              class="Tabs flex column"
             >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section
-          id="telemetry"
-        >
-          <h2
-            data-testid="telemetry-header"
-          >
-            Telemetry
-          </h2>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
+              <div
+                class="header"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
                 >
-                  close
-                </span>
-              </i>
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
             </div>
-            <div
-              aria-hidden="true"
-              class="esc"
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="telemetry"
             >
-              ESC
+              <h2
+                data-testid="telemetry-header"
+              >
+                Telemetry
+              </h2>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
index e4ba66796c..d806b21f6c 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
@@ -3,591 +3,643 @@
 exports[`preferences - navigation to terminal preferences given in preferences, when rendered renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="application-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="application"
+            >
+              <h2
+                data-testid="application-header"
+              >
+                Application
+              </h2>
+              <section
+                id="appearance"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Theme
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-theme-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-theme-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-theme-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="theme-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="extensionRegistryUrl"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Extension Install Registry
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-extension-install-registry-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-extension-install-registry-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-extension-install-registry-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="extension-install-registry-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <p
+                  class="mt-4 mb-5 leading-relaxed"
+                >
+                  This setting is to change the registry URL for installing extensions by name. 
+                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                  <b>
+                    .npmrc
+                  </b>
+                   file or in the input below.
+                </p>
+                <div
+                  class="Input theme round black disabled invalid"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      disabled=""
+                      placeholder="Custom Extension Registry URL..."
+                      spellcheck="false"
+                      value="some-custom-url"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <hr />
+              <section
+                id="other"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Start-up
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Automatically start Lens on login
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+              </section>
+              <hr />
+              <section
+                id="update-channel"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Update Channel
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-update-channel-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__single-value css-qc6sy-singleValue"
+                      >
+                        Stable
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="update-channel-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="locale"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Locale Timezone
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-timezone-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-timezone-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-timezone-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="timezone-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="application-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
+      class="StatusBar"
     >
       <div
-        class="sidebar"
+        class="leftSide"
+        data-testid="status-bar-left"
       >
         <div
-          class="Tabs flex column"
+          class="item"
         >
           <div
-            class="header"
+            data-testid="app-update-not-available"
           >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
+            No new updates available
           </div>
         </div>
       </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
       <div
-        class="content"
-      >
-        <section
-          id="application"
-        >
-          <h2
-            data-testid="application-header"
-          >
-            Application
-          </h2>
-          <section
-            id="appearance"
-          >
-            <div
-              class="SubTitle"
-            >
-              Theme
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-theme-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-theme-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-theme-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="theme-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="extensionRegistryUrl"
-          >
-            <div
-              class="SubTitle"
-            >
-              Extension Install Registry
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-extension-install-registry-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-extension-install-registry-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-extension-install-registry-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="extension-install-registry-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <p
-              class="mt-4 mb-5 leading-relaxed"
-            >
-              This setting is to change the registry URL for installing extensions by name. 
-              If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-              <b>
-                .npmrc
-              </b>
-               file or in the input below.
-            </p>
-            <div
-              class="Input theme round black disabled invalid"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  disabled=""
-                  placeholder="Custom Extension Registry URL..."
-                  spellcheck="false"
-                  value="some-custom-url"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <hr />
-          <section
-            id="other"
-          >
-            <div
-              class="SubTitle"
-            >
-              Start-up
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Automatically start Lens on login
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-          </section>
-          <hr />
-          <section
-            id="update-channel"
-          >
-            <div
-              class="SubTitle"
-            >
-              Update Channel
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-update-channel-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__single-value css-qc6sy-singleValue"
-                  >
-                    Stable
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="update-channel-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="locale"
-          >
-            <div
-              class="SubTitle"
-            >
-              Locale Timezone
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-timezone-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-timezone-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-timezone-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="timezone-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
@@ -599,442 +651,494 @@ exports[`preferences - navigation to terminal preferences given in preferences,
 exports[`preferences - navigation to terminal preferences given in preferences, when rendered when navigating to terminal preferences using navigation renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
-        </div>
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
       </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="terminal-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
-    >
       <div
-        class="sidebar"
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="terminal-preferences-page"
       >
-        <div
-          class="Tabs flex column"
+        <nav
+          class="sidebarRegion"
         >
           <div
-            class="header"
-          >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
+            class="sidebar"
           >
             <div
-              class="label"
+              class="Tabs flex column"
             >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
-      <div
-        class="content"
-      >
-        <section>
-          <h2>
-            Terminal
-          </h2>
-          <section
-            id="shell"
-          >
-            <div
-              class="SubTitle"
-            >
-              Terminal Shell Path
-               
-            </div>
-            <div
-              class="Input theme round black"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
+              <div
+                class="header"
               >
-                <input
-                  class="input box grow"
-                  placeholder="some-default-shell"
-                  spellcheck="false"
-                  value=""
-                />
-              </label>
+                Preferences
+              </div>
               <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <section
-            id="terminalSelection"
-          >
-            <div
-              class="SubTitle"
-            >
-              Terminal copy & paste
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Copy on select and paste on right-click
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-          </section>
-          <section
-            id="terminalTheme"
-          >
-            <div
-              class="SubTitle"
-            >
-              Terminal theme
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-terminal-theme-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
               >
                 <div
-                  class="Select__value-container css-319lph-ValueContainer"
+                  class="label"
                 >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-terminal-theme-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-terminal-theme-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="terminal-theme-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
+                  App
                 </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
                 <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                  class="label"
                 >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
                 </div>
               </div>
             </div>
-          </section>
-          <section>
-            <div
-              class="SubTitle"
-            >
-              Font size
-               
-            </div>
-            <div
-              class="Input theme round black"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  max="50"
-                  min="10"
-                  spellcheck="false"
-                  type="number"
-                  value="42"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <section>
-            <div
-              class="SubTitle"
-            >
-              Font family
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-2-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-2-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-2-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="react-select-2-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
+          </div>
+        </nav>
         <div
-          class="fixed top-[60px]"
+          class="contentRegion"
+          id="ScrollSpyRoot"
         >
           <div
-            data-testid="close-preferences"
+            class="content"
+          >
+            <section>
+              <h2>
+                Terminal
+              </h2>
+              <section
+                id="shell"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Terminal Shell Path
+                   
+                </div>
+                <div
+                  class="Input theme round black"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      placeholder="some-default-shell"
+                      spellcheck="false"
+                      value=""
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <section
+                id="terminalSelection"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Terminal copy & paste
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Copy on select and paste on right-click
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+              </section>
+              <section
+                id="terminalTheme"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Terminal theme
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-terminal-theme-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-terminal-theme-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-terminal-theme-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="terminal-theme-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <section>
+                <div
+                  class="SubTitle"
+                >
+                  Font size
+                   
+                </div>
+                <div
+                  class="Input theme round black"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      max="50"
+                      min="10"
+                      spellcheck="false"
+                      type="number"
+                      value="42"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <section>
+                <div
+                  class="SubTitle"
+                >
+                  Font family
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-2-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-2-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-2-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="react-select-2-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
           >
             <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
+              class="fixed top-[60px]"
             >
-              <i
-                class="Icon icon material focusable"
+              <div
+                data-testid="close-preferences"
               >
-                <span
-                  class="icon"
-                  data-icon-name="close"
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
                 >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
diff --git a/src/behaviours/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
index 9b0f252a37..32ac6605e6 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -3,71 +3,206 @@
 exports[`preferences - navigation using application menu renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
+      >
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="flex justify-center Welcome align-center"
+        data-testid="welcome-page"
       >
         <div
-          data-testid="app-update-not-available"
+          data-testid="welcome-banner-container"
+          style="width: 320px;"
         >
-          No new updates available
+          <i
+            class="Icon logo svg focusable"
+          >
+            <span
+              class="icon"
+            />
+          </i>
+          <div
+            class="flex justify-center"
+          >
+            <div
+              data-testid="welcome-text-container"
+              style="width: 320px;"
+            >
+              <h2>
+                Welcome to OpenLens 5!
+              </h2>
+              <p>
+                To get you started we have auto-detected your clusters in your
+                 
+                kubeconfig file and added them to the catalog, your centralized
+                 
+                view for managing all your cloud-native resources.
+                <br />
+                <br />
+                If you have any questions or feedback, please join our 
+                <a
+                  class="link"
+                  href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                  rel="noreferrer"
+                  target="_blank"
+                >
+                  Lens Community slack channel
+                </a>
+                .
+              </p>
+              <ul
+                class="block"
+                data-testid="welcome-menu-container"
+                style="width: 320px;"
+              >
+                <li
+                  class="flex grid-12"
+                >
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="view_list"
+                    >
+                      view_list
+                    </span>
+                  </i>
+                  <a
+                    class="box col-10"
+                  >
+                    Browse Clusters in Catalog
+                  </a>
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="navigate_next"
+                    >
+                      navigate_next
+                    </span>
+                  </i>
+                </li>
+              </ul>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
@@ -78,591 +213,643 @@ exports[`preferences - navigation using application menu renders 1`] = `
 exports[`preferences - navigation using application menu when navigating to preferences using application menu renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="SettingLayout showNavigation Preferences"
+        data-testid="application-preferences-page"
+      >
+        <nav
+          class="sidebarRegion"
+        >
+          <div
+            class="sidebar"
+          >
+            <div
+              class="Tabs flex column"
+            >
+              <div
+                class="header"
+              >
+                Preferences
+              </div>
+              <div
+                class="Tab flex gaps align-center active"
+                data-testid="tab-link-for-application"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  App
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-proxy"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Proxy
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-kubernetes"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Kubernetes
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-editor"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Editor
+                </div>
+              </div>
+              <div
+                class="Tab flex gaps align-center"
+                data-testid="tab-link-for-terminal"
+                role="tab"
+                tabindex="0"
+              >
+                <div
+                  class="label"
+                >
+                  Terminal
+                </div>
+              </div>
+            </div>
+          </div>
+        </nav>
+        <div
+          class="contentRegion"
+          id="ScrollSpyRoot"
+        >
+          <div
+            class="content"
+          >
+            <section
+              id="application"
+            >
+              <h2
+                data-testid="application-header"
+              >
+                Application
+              </h2>
+              <section
+                id="appearance"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Theme
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-theme-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-theme-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-theme-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="theme-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="extensionRegistryUrl"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Extension Install Registry
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-extension-install-registry-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-extension-install-registry-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-extension-install-registry-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="extension-install-registry-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <p
+                  class="mt-4 mb-5 leading-relaxed"
+                >
+                  This setting is to change the registry URL for installing extensions by name. 
+                  If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                  <b>
+                    .npmrc
+                  </b>
+                   file or in the input below.
+                </p>
+                <div
+                  class="Input theme round black disabled invalid"
+                >
+                  <label
+                    class="input-area flex gaps align-center"
+                    id=""
+                  >
+                    <input
+                      class="input box grow"
+                      disabled=""
+                      placeholder="Custom Extension Registry URL..."
+                      spellcheck="false"
+                      value="some-custom-url"
+                    />
+                  </label>
+                  <div
+                    class="input-info flex gaps"
+                  />
+                </div>
+              </section>
+              <hr />
+              <section
+                id="other"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Start-up
+                   
+                </div>
+                <label
+                  class="Switch"
+                  data-testid="switch"
+                >
+                  Automatically start Lens on login
+                  <input
+                    role="switch"
+                    type="checkbox"
+                  />
+                </label>
+              </section>
+              <hr />
+              <section
+                id="update-channel"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Update Channel
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-update-channel-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__single-value css-qc6sy-singleValue"
+                      >
+                        Stable
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="update-channel-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+              <hr />
+              <section
+                id="locale"
+              >
+                <div
+                  class="SubTitle"
+                >
+                  Locale Timezone
+                   
+                </div>
+                <div
+                  class="Select theme-lens css-b62m3t-container"
+                >
+                  <span
+                    class="css-1f43avz-a11yText-A11yText"
+                    id="react-select-timezone-input-live-region"
+                  />
+                  <span
+                    aria-atomic="false"
+                    aria-live="polite"
+                    aria-relevant="additions text"
+                    class="css-1f43avz-a11yText-A11yText"
+                  />
+                  <div
+                    class="Select__control css-1s2u09g-control"
+                  >
+                    <div
+                      class="Select__value-container css-319lph-ValueContainer"
+                    >
+                      <div
+                        class="Select__placeholder css-14el2xx-placeholder"
+                        id="react-select-timezone-input-placeholder"
+                      >
+                        Select...
+                      </div>
+                      <div
+                        class="Select__input-container css-6j8wv5-Input"
+                        data-value=""
+                      >
+                        <input
+                          aria-autocomplete="list"
+                          aria-describedby="react-select-timezone-input-placeholder"
+                          aria-expanded="false"
+                          aria-haspopup="true"
+                          autocapitalize="none"
+                          autocomplete="off"
+                          autocorrect="off"
+                          class="Select__input"
+                          id="timezone-input"
+                          role="combobox"
+                          spellcheck="false"
+                          style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                          tabindex="0"
+                          type="text"
+                          value=""
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                    >
+                      <span
+                        class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                      />
+                      <div
+                        aria-hidden="true"
+                        class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="css-tj5bde-Svg"
+                          focusable="false"
+                          height="20"
+                          viewBox="0 0 20 20"
+                          width="20"
+                        >
+                          <path
+                            d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                          />
+                        </svg>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </section>
+            </section>
+          </div>
+          <div
+            class="toolsRegion"
+          >
+            <div
+              class="fixed top-[60px]"
+            >
+              <div
+                data-testid="close-preferences"
+              >
+                <div
+                  aria-label="Close"
+                  class="closeButton"
+                  role="button"
+                >
+                  <i
+                    class="Icon icon material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="close"
+                    >
+                      close
+                    </span>
+                  </i>
+                </div>
+                <div
+                  aria-hidden="true"
+                  class="esc"
+                >
+                  ESC
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="SettingLayout showNavigation Preferences"
-    data-testid="application-preferences-page"
-  >
-    <nav
-      class="sidebarRegion"
+      class="StatusBar"
     >
       <div
-        class="sidebar"
+        class="leftSide"
+        data-testid="status-bar-left"
       >
         <div
-          class="Tabs flex column"
+          class="item"
         >
           <div
-            class="header"
+            data-testid="app-update-not-available"
           >
-            Preferences
-          </div>
-          <div
-            class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-application"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              App
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-proxy"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Proxy
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-kubernetes"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Kubernetes
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-editor"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Editor
-            </div>
-          </div>
-          <div
-            class="Tab flex gaps align-center"
-            data-testid="tab-link-for-terminal"
-            role="tab"
-            tabindex="0"
-          >
-            <div
-              class="label"
-            >
-              Terminal
-            </div>
+            No new updates available
           </div>
         </div>
       </div>
-    </nav>
-    <div
-      class="contentRegion"
-      id="ScrollSpyRoot"
-    >
       <div
-        class="content"
-      >
-        <section
-          id="application"
-        >
-          <h2
-            data-testid="application-header"
-          >
-            Application
-          </h2>
-          <section
-            id="appearance"
-          >
-            <div
-              class="SubTitle"
-            >
-              Theme
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-theme-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-theme-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-theme-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="theme-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="extensionRegistryUrl"
-          >
-            <div
-              class="SubTitle"
-            >
-              Extension Install Registry
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-extension-install-registry-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-extension-install-registry-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-extension-install-registry-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="extension-install-registry-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <p
-              class="mt-4 mb-5 leading-relaxed"
-            >
-              This setting is to change the registry URL for installing extensions by name. 
-              If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-              <b>
-                .npmrc
-              </b>
-               file or in the input below.
-            </p>
-            <div
-              class="Input theme round black disabled invalid"
-            >
-              <label
-                class="input-area flex gaps align-center"
-                id=""
-              >
-                <input
-                  class="input box grow"
-                  disabled=""
-                  placeholder="Custom Extension Registry URL..."
-                  spellcheck="false"
-                  value="some-custom-url"
-                />
-              </label>
-              <div
-                class="input-info flex gaps"
-              />
-            </div>
-          </section>
-          <hr />
-          <section
-            id="other"
-          >
-            <div
-              class="SubTitle"
-            >
-              Start-up
-               
-            </div>
-            <label
-              class="Switch"
-              data-testid="switch"
-            >
-              Automatically start Lens on login
-              <input
-                role="switch"
-                type="checkbox"
-              />
-            </label>
-          </section>
-          <hr />
-          <section
-            id="update-channel"
-          >
-            <div
-              class="SubTitle"
-            >
-              Update Channel
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-update-channel-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__single-value css-qc6sy-singleValue"
-                  >
-                    Stable
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="update-channel-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-          <hr />
-          <section
-            id="locale"
-          >
-            <div
-              class="SubTitle"
-            >
-              Locale Timezone
-               
-            </div>
-            <div
-              class="Select theme-lens css-b62m3t-container"
-            >
-              <span
-                class="css-1f43avz-a11yText-A11yText"
-                id="react-select-timezone-input-live-region"
-              />
-              <span
-                aria-atomic="false"
-                aria-live="polite"
-                aria-relevant="additions text"
-                class="css-1f43avz-a11yText-A11yText"
-              />
-              <div
-                class="Select__control css-1s2u09g-control"
-              >
-                <div
-                  class="Select__value-container css-319lph-ValueContainer"
-                >
-                  <div
-                    class="Select__placeholder css-14el2xx-placeholder"
-                    id="react-select-timezone-input-placeholder"
-                  >
-                    Select...
-                  </div>
-                  <div
-                    class="Select__input-container css-6j8wv5-Input"
-                    data-value=""
-                  >
-                    <input
-                      aria-autocomplete="list"
-                      aria-describedby="react-select-timezone-input-placeholder"
-                      aria-expanded="false"
-                      aria-haspopup="true"
-                      autocapitalize="none"
-                      autocomplete="off"
-                      autocorrect="off"
-                      class="Select__input"
-                      id="timezone-input"
-                      role="combobox"
-                      spellcheck="false"
-                      style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                      tabindex="0"
-                      type="text"
-                      value=""
-                    />
-                  </div>
-                </div>
-                <div
-                  class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                >
-                  <span
-                    class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                  />
-                  <div
-                    aria-hidden="true"
-                    class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="css-tj5bde-Svg"
-                      focusable="false"
-                      height="20"
-                      viewBox="0 0 20 20"
-                      width="20"
-                    >
-                      <path
-                        d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section>
-        </section>
-      </div>
-      <div
-        class="toolsRegion"
-      >
-        <div
-          class="fixed top-[60px]"
-        >
-          <div
-            data-testid="close-preferences"
-          >
-            <div
-              aria-label="Close"
-              class="closeButton"
-              role="button"
-            >
-              <i
-                class="Icon icon material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="close"
-                >
-                  close
-                </span>
-              </i>
-            </div>
-            <div
-              aria-hidden="true"
-              class="esc"
-            >
-              ESC
-            </div>
-          </div>
-        </div>
-      </div>
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
diff --git a/src/behaviours/preferences/__snapshots__/navigation-using-tray.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-using-tray.test.ts.snap
index 5be47d1925..27266c61eb 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-using-tray.test.ts.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-using-tray.test.ts.snap
@@ -4,71 +4,206 @@ exports[`show-about-using-tray renders 1`] = `
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
         >
           <div
-            data-testid="app-update-not-available"
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
           >
-            No new updates available
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
     </div>
     <div
       class="Notifications flex column align-flex-end"
@@ -81,591 +216,643 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
-      >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
-        >
-          <span
-            class="icon"
-            data-icon-name="home"
-          >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
-          >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
-          >
-            arrow_forward
-          </span>
-        </i>
-      </div>
-      <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="topBar"
       >
         <div
-          class="item"
+          class="items"
         >
-          <div
-            data-testid="app-update-not-available"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            No new updates available
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="application-preferences-page"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  class="header"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="application"
+              >
+                <h2
+                  data-testid="application-header"
+                >
+                  Application
+                </h2>
+                <section
+                  id="appearance"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="extensionRegistryUrl"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="other"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Automatically start Lens on login
+                    <input
+                      role="switch"
+                      type="checkbox"
+                    />
+                  </label>
+                </section>
+                <hr />
+                <section
+                  id="update-channel"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
+                        >
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="locale"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
         </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
-      />
-    </div>
-    <div
-      class="SettingLayout showNavigation Preferences"
-      data-testid="application-preferences-page"
-    >
-      <nav
-        class="sidebarRegion"
+        class="StatusBar"
       >
         <div
-          class="sidebar"
+          class="leftSide"
+          data-testid="status-bar-left"
         >
           <div
-            class="Tabs flex column"
+            class="item"
           >
             <div
-              class="header"
+              data-testid="app-update-not-available"
             >
-              Preferences
-            </div>
-            <div
-              class="Tab flex gaps align-center active"
-              data-testid="tab-link-for-application"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                App
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-proxy"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Proxy
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-kubernetes"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Kubernetes
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-editor"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Editor
-              </div>
-            </div>
-            <div
-              class="Tab flex gaps align-center"
-              data-testid="tab-link-for-terminal"
-              role="tab"
-              tabindex="0"
-            >
-              <div
-                class="label"
-              >
-                Terminal
-              </div>
+              No new updates available
             </div>
           </div>
         </div>
-      </nav>
-      <div
-        class="contentRegion"
-        id="ScrollSpyRoot"
-      >
         <div
-          class="content"
-        >
-          <section
-            id="application"
-          >
-            <h2
-              data-testid="application-header"
-            >
-              Application
-            </h2>
-            <section
-              id="appearance"
-            >
-              <div
-                class="SubTitle"
-              >
-                Theme
-                 
-              </div>
-              <div
-                class="Select theme-lens css-b62m3t-container"
-              >
-                <span
-                  class="css-1f43avz-a11yText-A11yText"
-                  id="react-select-theme-input-live-region"
-                />
-                <span
-                  aria-atomic="false"
-                  aria-live="polite"
-                  aria-relevant="additions text"
-                  class="css-1f43avz-a11yText-A11yText"
-                />
-                <div
-                  class="Select__control css-1s2u09g-control"
-                >
-                  <div
-                    class="Select__value-container css-319lph-ValueContainer"
-                  >
-                    <div
-                      class="Select__placeholder css-14el2xx-placeholder"
-                      id="react-select-theme-input-placeholder"
-                    >
-                      Select...
-                    </div>
-                    <div
-                      class="Select__input-container css-6j8wv5-Input"
-                      data-value=""
-                    >
-                      <input
-                        aria-autocomplete="list"
-                        aria-describedby="react-select-theme-input-placeholder"
-                        aria-expanded="false"
-                        aria-haspopup="true"
-                        autocapitalize="none"
-                        autocomplete="off"
-                        autocorrect="off"
-                        class="Select__input"
-                        id="theme-input"
-                        role="combobox"
-                        spellcheck="false"
-                        style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                        tabindex="0"
-                        type="text"
-                        value=""
-                      />
-                    </div>
-                  </div>
-                  <div
-                    class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                  >
-                    <span
-                      class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                    />
-                    <div
-                      aria-hidden="true"
-                      class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="css-tj5bde-Svg"
-                        focusable="false"
-                        height="20"
-                        viewBox="0 0 20 20"
-                        width="20"
-                      >
-                        <path
-                          d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                        />
-                      </svg>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="extensionRegistryUrl"
-            >
-              <div
-                class="SubTitle"
-              >
-                Extension Install Registry
-                 
-              </div>
-              <div
-                class="Select theme-lens css-b62m3t-container"
-              >
-                <span
-                  class="css-1f43avz-a11yText-A11yText"
-                  id="react-select-extension-install-registry-input-live-region"
-                />
-                <span
-                  aria-atomic="false"
-                  aria-live="polite"
-                  aria-relevant="additions text"
-                  class="css-1f43avz-a11yText-A11yText"
-                />
-                <div
-                  class="Select__control css-1s2u09g-control"
-                >
-                  <div
-                    class="Select__value-container css-319lph-ValueContainer"
-                  >
-                    <div
-                      class="Select__placeholder css-14el2xx-placeholder"
-                      id="react-select-extension-install-registry-input-placeholder"
-                    >
-                      Select...
-                    </div>
-                    <div
-                      class="Select__input-container css-6j8wv5-Input"
-                      data-value=""
-                    >
-                      <input
-                        aria-autocomplete="list"
-                        aria-describedby="react-select-extension-install-registry-input-placeholder"
-                        aria-expanded="false"
-                        aria-haspopup="true"
-                        autocapitalize="none"
-                        autocomplete="off"
-                        autocorrect="off"
-                        class="Select__input"
-                        id="extension-install-registry-input"
-                        role="combobox"
-                        spellcheck="false"
-                        style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                        tabindex="0"
-                        type="text"
-                        value=""
-                      />
-                    </div>
-                  </div>
-                  <div
-                    class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                  >
-                    <span
-                      class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                    />
-                    <div
-                      aria-hidden="true"
-                      class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="css-tj5bde-Svg"
-                        focusable="false"
-                        height="20"
-                        viewBox="0 0 20 20"
-                        width="20"
-                      >
-                        <path
-                          d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                        />
-                      </svg>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <p
-                class="mt-4 mb-5 leading-relaxed"
-              >
-                This setting is to change the registry URL for installing extensions by name. 
-                If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
-                <b>
-                  .npmrc
-                </b>
-                 file or in the input below.
-              </p>
-              <div
-                class="Input theme round black disabled invalid"
-              >
-                <label
-                  class="input-area flex gaps align-center"
-                  id=""
-                >
-                  <input
-                    class="input box grow"
-                    disabled=""
-                    placeholder="Custom Extension Registry URL..."
-                    spellcheck="false"
-                    value="some-custom-url"
-                  />
-                </label>
-                <div
-                  class="input-info flex gaps"
-                />
-              </div>
-            </section>
-            <hr />
-            <section
-              id="other"
-            >
-              <div
-                class="SubTitle"
-              >
-                Start-up
-                 
-              </div>
-              <label
-                class="Switch"
-                data-testid="switch"
-              >
-                Automatically start Lens on login
-                <input
-                  role="switch"
-                  type="checkbox"
-                />
-              </label>
-            </section>
-            <hr />
-            <section
-              id="update-channel"
-            >
-              <div
-                class="SubTitle"
-              >
-                Update Channel
-                 
-              </div>
-              <div
-                class="Select theme-lens css-b62m3t-container"
-              >
-                <span
-                  class="css-1f43avz-a11yText-A11yText"
-                  id="react-select-update-channel-input-live-region"
-                />
-                <span
-                  aria-atomic="false"
-                  aria-live="polite"
-                  aria-relevant="additions text"
-                  class="css-1f43avz-a11yText-A11yText"
-                />
-                <div
-                  class="Select__control css-1s2u09g-control"
-                >
-                  <div
-                    class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
-                  >
-                    <div
-                      class="Select__single-value css-qc6sy-singleValue"
-                    >
-                      Stable
-                    </div>
-                    <div
-                      class="Select__input-container css-6j8wv5-Input"
-                      data-value=""
-                    >
-                      <input
-                        aria-autocomplete="list"
-                        aria-expanded="false"
-                        aria-haspopup="true"
-                        autocapitalize="none"
-                        autocomplete="off"
-                        autocorrect="off"
-                        class="Select__input"
-                        id="update-channel-input"
-                        role="combobox"
-                        spellcheck="false"
-                        style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                        tabindex="0"
-                        type="text"
-                        value=""
-                      />
-                    </div>
-                  </div>
-                  <div
-                    class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                  >
-                    <span
-                      class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                    />
-                    <div
-                      aria-hidden="true"
-                      class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="css-tj5bde-Svg"
-                        focusable="false"
-                        height="20"
-                        viewBox="0 0 20 20"
-                        width="20"
-                      >
-                        <path
-                          d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                        />
-                      </svg>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </section>
-            <hr />
-            <section
-              id="locale"
-            >
-              <div
-                class="SubTitle"
-              >
-                Locale Timezone
-                 
-              </div>
-              <div
-                class="Select theme-lens css-b62m3t-container"
-              >
-                <span
-                  class="css-1f43avz-a11yText-A11yText"
-                  id="react-select-timezone-input-live-region"
-                />
-                <span
-                  aria-atomic="false"
-                  aria-live="polite"
-                  aria-relevant="additions text"
-                  class="css-1f43avz-a11yText-A11yText"
-                />
-                <div
-                  class="Select__control css-1s2u09g-control"
-                >
-                  <div
-                    class="Select__value-container css-319lph-ValueContainer"
-                  >
-                    <div
-                      class="Select__placeholder css-14el2xx-placeholder"
-                      id="react-select-timezone-input-placeholder"
-                    >
-                      Select...
-                    </div>
-                    <div
-                      class="Select__input-container css-6j8wv5-Input"
-                      data-value=""
-                    >
-                      <input
-                        aria-autocomplete="list"
-                        aria-describedby="react-select-timezone-input-placeholder"
-                        aria-expanded="false"
-                        aria-haspopup="true"
-                        autocapitalize="none"
-                        autocomplete="off"
-                        autocorrect="off"
-                        class="Select__input"
-                        id="timezone-input"
-                        role="combobox"
-                        spellcheck="false"
-                        style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
-                        tabindex="0"
-                        type="text"
-                        value=""
-                      />
-                    </div>
-                  </div>
-                  <div
-                    class="Select__indicators css-1hb7zxy-IndicatorsContainer"
-                  >
-                    <span
-                      class="Select__indicator-separator css-1okebmr-indicatorSeparator"
-                    />
-                    <div
-                      aria-hidden="true"
-                      class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
-                    >
-                      <svg
-                        aria-hidden="true"
-                        class="css-tj5bde-Svg"
-                        focusable="false"
-                        height="20"
-                        viewBox="0 0 20 20"
-                        width="20"
-                      >
-                        <path
-                          d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
-                        />
-                      </svg>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </section>
-          </section>
-        </div>
-        <div
-          class="toolsRegion"
-        >
-          <div
-            class="fixed top-[60px]"
-          >
-            <div
-              data-testid="close-preferences"
-            >
-              <div
-                aria-label="Close"
-                class="closeButton"
-                role="button"
-              >
-                <i
-                  class="Icon icon material focusable"
-                >
-                  <span
-                    class="icon"
-                    data-icon-name="close"
-                  >
-                    close
-                  </span>
-                </i>
-              </div>
-              <div
-                aria-hidden="true"
-                class="esc"
-              >
-                ESC
-              </div>
-            </div>
-          </div>
-        </div>
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
       </div>
     </div>
     <div
diff --git a/src/behaviours/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap b/src/behaviours/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap
index b2a11896e6..7af650fc6c 100644
--- a/src/behaviours/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap
+++ b/src/behaviours/status-bar/__snapshots__/status-bar-items-originating-from-extensions.test.tsx.snap
@@ -4,115 +4,250 @@ exports[`status-bar-items-originating-from-extensions when application starts wh
 <body>
   <div>
     <div
-      class="topBar"
+      class="ClusterManager"
     >
       <div
-        class="items"
+        class="topBar"
       >
-        <i
-          class="Icon material interactive focusable"
-          data-testid="home-button"
-          tabindex="0"
+        <div
+          class="items"
         >
-          <span
-            class="icon"
-            data-icon-name="home"
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
           >
-            home
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-back"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_back"
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
           >
-            arrow_back
-          </span>
-        </i>
-        <i
-          class="Icon material interactive disabled focusable"
-          data-testid="history-forward"
-        >
-          <span
-            class="icon"
-            data-icon-name="arrow_forward"
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
           >
-            arrow_forward
-          </span>
-        </i>
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
       </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="flex justify-center Welcome align-center"
+          data-testid="welcome-page"
+        >
+          <div
+            data-testid="welcome-banner-container"
+            style="width: 320px;"
+          >
+            <i
+              class="Icon logo svg focusable"
+            >
+              <span
+                class="icon"
+              />
+            </i>
+            <div
+              class="flex justify-center"
+            >
+              <div
+                data-testid="welcome-text-container"
+                style="width: 320px;"
+              >
+                <h2>
+                  Welcome to OpenLens 5!
+                </h2>
+                <p>
+                  To get you started we have auto-detected your clusters in your
+                   
+                  kubeconfig file and added them to the catalog, your centralized
+                   
+                  view for managing all your cloud-native resources.
+                  <br />
+                  <br />
+                  If you have any questions or feedback, please join our 
+                  <a
+                    class="link"
+                    href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                    rel="noreferrer"
+                    target="_blank"
+                  >
+                    Lens Community slack channel
+                  </a>
+                  .
+                </p>
+                <ul
+                  class="block"
+                  data-testid="welcome-menu-container"
+                  style="width: 320px;"
+                >
+                  <li
+                    class="flex grid-12"
+                  >
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="view_list"
+                      >
+                        view_list
+                      </span>
+                    </i>
+                    <a
+                      class="box col-10"
+                    >
+                      Browse Clusters in Catalog
+                    </a>
+                    <i
+                      class="Icon box col-1 material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="navigate_next"
+                      >
+                        navigate_next
+                      </span>
+                    </i>
+                  </li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
       <div
-        class="items"
-      />
-    </div>
-    <div
-      class="StatusBar"
-    >
-      <div
-        class="leftSide"
-        data-testid="status-bar-left"
+        class="HotbarMenu flex column"
       >
         <div
-          class="item"
-        >
-          <div
-            data-testid="app-update-not-available"
-          >
-            No new updates available
-          </div>
-        </div>
+          class="HotbarItems flex column gaps"
+        />
         <div
-          class="item"
+          class="HotbarSelector"
         >
-          <div
-            data-testid="some-testId"
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
           >
-            left1
-          </div>
-        </div>
-        <div
-          class="item"
-        >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
           <div
-            data-testid="some-testId"
+            class="HotbarIndex"
           >
-            left2
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
           </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
         </div>
       </div>
       <div
-        class="rightSide"
-        data-testid="status-bar-right"
+        class="StatusBar"
       >
         <div
-          class="item"
+          class="leftSide"
+          data-testid="status-bar-left"
         >
           <div
-            data-testid="some-testId"
+            class="item"
           >
-            right3
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+          <div
+            class="item"
+          >
+            <div
+              data-testid="some-testId"
+            >
+              left1
+            </div>
+          </div>
+          <div
+            class="item"
+          >
+            <div
+              data-testid="some-testId"
+            >
+              left2
+            </div>
           </div>
         </div>
         <div
-          class="item"
+          class="rightSide"
+          data-testid="status-bar-right"
         >
-          <span
-            data-testid="some-testId"
+          <div
+            class="item"
           >
-            right2
-          </span>
-        </div>
-        <div
-          class="item"
-        >
-          <span
-            data-testid="some-testId"
+            <div
+              data-testid="some-testId"
+            >
+              right3
+            </div>
+          </div>
+          <div
+            class="item"
           >
-            right1
-          </span>
+            <span
+              data-testid="some-testId"
+            >
+              right2
+            </span>
+          </div>
+          <div
+            class="item"
+          >
+            <span
+              data-testid="some-testId"
+            >
+              right1
+            </span>
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/behaviours/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/behaviours/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
index 5f76677010..d7575b76a7 100644
--- a/src/behaviours/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/behaviours/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -3,71 +3,206 @@
 exports[`welcome - navigation using application menu renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
+      >
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
+      </div>
+      <div
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="flex justify-center Welcome align-center"
+        data-testid="welcome-page"
       >
         <div
-          data-testid="app-update-not-available"
+          data-testid="welcome-banner-container"
+          style="width: 320px;"
         >
-          No new updates available
+          <i
+            class="Icon logo svg focusable"
+          >
+            <span
+              class="icon"
+            />
+          </i>
+          <div
+            class="flex justify-center"
+          >
+            <div
+              data-testid="welcome-text-container"
+              style="width: 320px;"
+            >
+              <h2>
+                Welcome to OpenLens 5!
+              </h2>
+              <p>
+                To get you started we have auto-detected your clusters in your
+                 
+                kubeconfig file and added them to the catalog, your centralized
+                 
+                view for managing all your cloud-native resources.
+                <br />
+                <br />
+                If you have any questions or feedback, please join our 
+                <a
+                  class="link"
+                  href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                  rel="noreferrer"
+                  target="_blank"
+                >
+                  Lens Community slack channel
+                </a>
+                .
+              </p>
+              <ul
+                class="block"
+                data-testid="welcome-menu-container"
+                style="width: 320px;"
+              >
+                <li
+                  class="flex grid-12"
+                >
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="view_list"
+                    >
+                      view_list
+                    </span>
+                  </i>
+                  <a
+                    class="box col-10"
+                  >
+                    Browse Clusters in Catalog
+                  </a>
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="navigate_next"
+                    >
+                      navigate_next
+                    </span>
+                  </i>
+                </li>
+              </ul>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
     </div>
     <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
+    </div>
   </div>
   <div
     class="Notifications flex column align-flex-end"
@@ -75,156 +210,858 @@ exports[`welcome - navigation using application menu renders 1`] = `
 </div>
 `;
 
-exports[`welcome - navigation using application menu when navigating to welcome using application menu renders 1`] = `
+exports[`welcome - navigation using application menu when navigated somewhere else renders 1`] = `
+<body>
+  <div>
+    <div
+      class="ClusterManager"
+    >
+      <div
+        class="topBar"
+      >
+        <div
+          class="items"
+        >
+          <i
+            class="Icon material interactive focusable"
+            data-testid="home-button"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="home"
+            >
+              home
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-back"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_back"
+            >
+              arrow_back
+            </span>
+          </i>
+          <i
+            class="Icon material interactive disabled focusable"
+            data-testid="history-forward"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_forward"
+            >
+              arrow_forward
+            </span>
+          </i>
+        </div>
+        <div
+          class="items"
+        />
+      </div>
+      <main>
+        <div
+          id="lens-views"
+        />
+        <div
+          class="SettingLayout showNavigation Preferences"
+          data-testid="application-preferences-page"
+        >
+          <nav
+            class="sidebarRegion"
+          >
+            <div
+              class="sidebar"
+            >
+              <div
+                class="Tabs flex column"
+              >
+                <div
+                  class="header"
+                >
+                  Preferences
+                </div>
+                <div
+                  class="Tab flex gaps align-center active"
+                  data-testid="tab-link-for-application"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    App
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-proxy"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Proxy
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-kubernetes"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Kubernetes
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-editor"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Editor
+                  </div>
+                </div>
+                <div
+                  class="Tab flex gaps align-center"
+                  data-testid="tab-link-for-terminal"
+                  role="tab"
+                  tabindex="0"
+                >
+                  <div
+                    class="label"
+                  >
+                    Terminal
+                  </div>
+                </div>
+              </div>
+            </div>
+          </nav>
+          <div
+            class="contentRegion"
+            id="ScrollSpyRoot"
+          >
+            <div
+              class="content"
+            >
+              <section
+                id="application"
+              >
+                <h2
+                  data-testid="application-header"
+                >
+                  Application
+                </h2>
+                <section
+                  id="appearance"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Theme
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-theme-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-theme-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-theme-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="theme-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="extensionRegistryUrl"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Extension Install Registry
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-extension-install-registry-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-extension-install-registry-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-extension-install-registry-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="extension-install-registry-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <p
+                    class="mt-4 mb-5 leading-relaxed"
+                  >
+                    This setting is to change the registry URL for installing extensions by name. 
+                    If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your 
+                    <b>
+                      .npmrc
+                    </b>
+                     file or in the input below.
+                  </p>
+                  <div
+                    class="Input theme round black disabled invalid"
+                  >
+                    <label
+                      class="input-area flex gaps align-center"
+                      id=""
+                    >
+                      <input
+                        class="input box grow"
+                        disabled=""
+                        placeholder="Custom Extension Registry URL..."
+                        spellcheck="false"
+                        value="some-custom-url"
+                      />
+                    </label>
+                    <div
+                      class="input-info flex gaps"
+                    />
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="other"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Start-up
+                     
+                  </div>
+                  <label
+                    class="Switch"
+                    data-testid="switch"
+                  >
+                    Automatically start Lens on login
+                    <input
+                      role="switch"
+                      type="checkbox"
+                    />
+                  </label>
+                </section>
+                <hr />
+                <section
+                  id="update-channel"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Update Channel
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-update-channel-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container Select__value-container--has-value css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__single-value css-qc6sy-singleValue"
+                        >
+                          Stable
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="update-channel-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+                <hr />
+                <section
+                  id="locale"
+                >
+                  <div
+                    class="SubTitle"
+                  >
+                    Locale Timezone
+                     
+                  </div>
+                  <div
+                    class="Select theme-lens css-b62m3t-container"
+                  >
+                    <span
+                      class="css-1f43avz-a11yText-A11yText"
+                      id="react-select-timezone-input-live-region"
+                    />
+                    <span
+                      aria-atomic="false"
+                      aria-live="polite"
+                      aria-relevant="additions text"
+                      class="css-1f43avz-a11yText-A11yText"
+                    />
+                    <div
+                      class="Select__control css-1s2u09g-control"
+                    >
+                      <div
+                        class="Select__value-container css-319lph-ValueContainer"
+                      >
+                        <div
+                          class="Select__placeholder css-14el2xx-placeholder"
+                          id="react-select-timezone-input-placeholder"
+                        >
+                          Select...
+                        </div>
+                        <div
+                          class="Select__input-container css-6j8wv5-Input"
+                          data-value=""
+                        >
+                          <input
+                            aria-autocomplete="list"
+                            aria-describedby="react-select-timezone-input-placeholder"
+                            aria-expanded="false"
+                            aria-haspopup="true"
+                            autocapitalize="none"
+                            autocomplete="off"
+                            autocorrect="off"
+                            class="Select__input"
+                            id="timezone-input"
+                            role="combobox"
+                            spellcheck="false"
+                            style="opacity: 1; width: 100%; grid-area: 1 / 2; min-width: 2px; border: 0px; margin: 0px; outline: 0; padding: 0px;"
+                            tabindex="0"
+                            type="text"
+                            value=""
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="Select__indicators css-1hb7zxy-IndicatorsContainer"
+                      >
+                        <span
+                          class="Select__indicator-separator css-1okebmr-indicatorSeparator"
+                        />
+                        <div
+                          aria-hidden="true"
+                          class="Select__indicator Select__dropdown-indicator css-tlfecz-indicatorContainer"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="css-tj5bde-Svg"
+                            focusable="false"
+                            height="20"
+                            viewBox="0 0 20 20"
+                            width="20"
+                          >
+                            <path
+                              d="M4.516 7.548c0.436-0.446 1.043-0.481 1.576 0l3.908 3.747 3.908-3.747c0.533-0.481 1.141-0.446 1.574 0 0.436 0.445 0.408 1.197 0 1.615-0.406 0.418-4.695 4.502-4.695 4.502-0.217 0.223-0.502 0.335-0.787 0.335s-0.57-0.112-0.789-0.335c0 0-4.287-4.084-4.695-4.502s-0.436-1.17 0-1.615z"
+                            />
+                          </svg>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </section>
+              </section>
+            </div>
+            <div
+              class="toolsRegion"
+            >
+              <div
+                class="fixed top-[60px]"
+              >
+                <div
+                  data-testid="close-preferences"
+                >
+                  <div
+                    aria-label="Close"
+                    class="closeButton"
+                    role="button"
+                  >
+                    <i
+                      class="Icon icon material focusable"
+                    >
+                      <span
+                        class="icon"
+                        data-icon-name="close"
+                      >
+                        close
+                      </span>
+                    </i>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    class="esc"
+                  >
+                    ESC
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </main>
+      <div
+        class="HotbarMenu flex column"
+      >
+        <div
+          class="HotbarItems flex column gaps"
+        />
+        <div
+          class="HotbarSelector"
+        >
+          <i
+            class="Icon Icon previous material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_left"
+            >
+              arrow_left
+            </span>
+          </i>
+          <div
+            class="HotbarIndex"
+          >
+            <div
+              class="badge Badge small clickable"
+              id="hotbarIndex"
+            >
+              0
+            </div>
+          </div>
+          <i
+            class="Icon material interactive focusable"
+            tabindex="0"
+          >
+            <span
+              class="icon"
+              data-icon-name="arrow_right"
+            >
+              arrow_right
+            </span>
+          </i>
+        </div>
+      </div>
+      <div
+        class="StatusBar"
+      >
+        <div
+          class="leftSide"
+          data-testid="status-bar-left"
+        >
+          <div
+            class="item"
+          >
+            <div
+              data-testid="app-update-not-available"
+            >
+              No new updates available
+            </div>
+          </div>
+        </div>
+        <div
+          class="rightSide"
+          data-testid="status-bar-right"
+        />
+      </div>
+    </div>
+    <div
+      class="Notifications flex column align-flex-end"
+    />
+  </div>
+</body>
+`;
+
+exports[`welcome - navigation using application menu when navigated somewhere else when navigated to welcome using application menu renders 1`] = `
 <div>
   <div
-    class="topBar"
+    class="ClusterManager"
   >
     <div
-      class="items"
-    >
-      <i
-        class="Icon material interactive focusable"
-        data-testid="home-button"
-        tabindex="0"
-      >
-        <span
-          class="icon"
-          data-icon-name="home"
-        >
-          home
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-back"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_back"
-        >
-          arrow_back
-        </span>
-      </i>
-      <i
-        class="Icon material interactive disabled focusable"
-        data-testid="history-forward"
-      >
-        <span
-          class="icon"
-          data-icon-name="arrow_forward"
-        >
-          arrow_forward
-        </span>
-      </i>
-    </div>
-    <div
-      class="items"
-    />
-  </div>
-  <div
-    class="StatusBar"
-  >
-    <div
-      class="leftSide"
-      data-testid="status-bar-left"
+      class="topBar"
     >
       <div
-        class="item"
+        class="items"
       >
-        <div
-          data-testid="app-update-not-available"
+        <i
+          class="Icon material interactive focusable"
+          data-testid="home-button"
+          tabindex="0"
         >
-          No new updates available
-        </div>
+          <span
+            class="icon"
+            data-icon-name="home"
+          >
+            home
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-back"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_back"
+          >
+            arrow_back
+          </span>
+        </i>
+        <i
+          class="Icon material interactive disabled focusable"
+          data-testid="history-forward"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_forward"
+          >
+            arrow_forward
+          </span>
+        </i>
       </div>
-    </div>
-    <div
-      class="rightSide"
-      data-testid="status-bar-right"
-    />
-  </div>
-  <div
-    class="flex justify-center Welcome align-center"
-    data-testid="welcome-page"
-  >
-    <div
-      data-testid="welcome-banner-container"
-      style="width: 320px;"
-    >
-      <i
-        class="Icon logo svg focusable"
-      >
-        <span
-          class="icon"
-        />
-      </i>
       <div
-        class="flex justify-center"
+        class="items"
+      />
+    </div>
+    <main>
+      <div
+        id="lens-views"
+      />
+      <div
+        class="flex justify-center Welcome align-center"
+        data-testid="welcome-page"
       >
         <div
-          data-testid="welcome-text-container"
+          data-testid="welcome-banner-container"
           style="width: 320px;"
         >
-          <h2>
-            Welcome to OpenLens 5!
-          </h2>
-          <p>
-            To get you started we have auto-detected your clusters in your
-             
-            kubeconfig file and added them to the catalog, your centralized
-             
-            view for managing all your cloud-native resources.
-            <br />
-            <br />
-            If you have any questions or feedback, please join our 
-            <a
-              class="link"
-              href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
-              rel="noreferrer"
-              target="_blank"
-            >
-              Lens Community slack channel
-            </a>
-            .
-          </p>
-          <ul
-            class="block"
-            data-testid="welcome-menu-container"
-            style="width: 320px;"
+          <i
+            class="Icon logo svg focusable"
           >
-            <li
-              class="flex grid-12"
+            <span
+              class="icon"
+            />
+          </i>
+          <div
+            class="flex justify-center"
+          >
+            <div
+              data-testid="welcome-text-container"
+              style="width: 320px;"
             >
-              <i
-                class="Icon box col-1 material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="view_list"
+              <h2>
+                Welcome to OpenLens 5!
+              </h2>
+              <p>
+                To get you started we have auto-detected your clusters in your
+                 
+                kubeconfig file and added them to the catalog, your centralized
+                 
+                view for managing all your cloud-native resources.
+                <br />
+                <br />
+                If you have any questions or feedback, please join our 
+                <a
+                  class="link"
+                  href="https://join.slack.com/t/k8slens/shared_invite/zt-wcl8jq3k-68R5Wcmk1o95MLBE5igUDQ"
+                  rel="noreferrer"
+                  target="_blank"
                 >
-                  view_list
-                </span>
-              </i>
-              <a
-                class="box col-10"
+                  Lens Community slack channel
+                </a>
+                .
+              </p>
+              <ul
+                class="block"
+                data-testid="welcome-menu-container"
+                style="width: 320px;"
               >
-                Browse Clusters in Catalog
-              </a>
-              <i
-                class="Icon box col-1 material focusable"
-              >
-                <span
-                  class="icon"
-                  data-icon-name="navigate_next"
+                <li
+                  class="flex grid-12"
                 >
-                  navigate_next
-                </span>
-              </i>
-            </li>
-          </ul>
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="view_list"
+                    >
+                      view_list
+                    </span>
+                  </i>
+                  <a
+                    class="box col-10"
+                  >
+                    Browse Clusters in Catalog
+                  </a>
+                  <i
+                    class="Icon box col-1 material focusable"
+                  >
+                    <span
+                      class="icon"
+                      data-icon-name="navigate_next"
+                    >
+                      navigate_next
+                    </span>
+                  </i>
+                </li>
+              </ul>
+            </div>
+          </div>
         </div>
       </div>
+    </main>
+    <div
+      class="HotbarMenu flex column"
+    >
+      <div
+        class="HotbarItems flex column gaps"
+      />
+      <div
+        class="HotbarSelector"
+      >
+        <i
+          class="Icon Icon previous material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_left"
+          >
+            arrow_left
+          </span>
+        </i>
+        <div
+          class="HotbarIndex"
+        >
+          <div
+            class="badge Badge small clickable"
+            id="hotbarIndex"
+          >
+            0
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="arrow_right"
+          >
+            arrow_right
+          </span>
+        </i>
+      </div>
+    </div>
+    <div
+      class="StatusBar"
+    >
+      <div
+        class="leftSide"
+        data-testid="status-bar-left"
+      >
+        <div
+          class="item"
+        >
+          <div
+            data-testid="app-update-not-available"
+          >
+            No new updates available
+          </div>
+        </div>
+      </div>
+      <div
+        class="rightSide"
+        data-testid="status-bar-right"
+      />
     </div>
   </div>
   <div
diff --git a/src/behaviours/welcome/navigation-using-application-menu.test.ts b/src/behaviours/welcome/navigation-using-application-menu.test.ts
index 805e99efb4..1be9aa1d3a 100644
--- a/src/behaviours/welcome/navigation-using-application-menu.test.ts
+++ b/src/behaviours/welcome/navigation-using-application-menu.test.ts
@@ -21,25 +21,41 @@ describe("welcome - navigation using application menu", () => {
     expect(rendered.container).toMatchSnapshot();
   });
 
-  it("does not show welcome page yet", () => {
-    const actual = rendered.queryByTestId("welcome-page");
+  it("shows welcome page being front page", () => {
+    const actual = rendered.getByTestId("welcome-page");
 
-    expect(actual).toBeNull();
+    expect(actual).not.toBeNull();
   });
 
-  describe("when navigating to welcome using application menu", () => {
+  describe("when navigated somewhere else", () => {
     beforeEach(() => {
-      applicationBuilder.applicationMenu.click("help.welcome");
+      applicationBuilder.applicationMenu.click("root.preferences");
     });
 
     it("renders", () => {
-      expect(rendered.container).toMatchSnapshot();
+      expect(rendered.baseElement).toMatchSnapshot();
     });
 
-    it("shows welcome page", () => {
-      const actual = rendered.getByTestId("welcome-page");
+    it("does not show welcome page", () => {
+      const actual = rendered.queryByTestId("welcome-page");
 
-      expect(actual).not.toBeNull();
+      expect(actual).toBeNull();
+    });
+
+    describe("when navigated to welcome using application menu", () => {
+      beforeEach(() => {
+        applicationBuilder.applicationMenu.click("help.welcome");
+      });
+
+      it("renders", () => {
+        expect(rendered.container).toMatchSnapshot();
+      });
+
+      it("shows welcome page", () => {
+        const actual = rendered.getByTestId("welcome-page");
+
+        expect(actual).not.toBeNull();
+      });
     });
   });
 });
diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts
index c09142d83d..e6e59328ce 100644
--- a/src/main/getDiForUnitTesting.ts
+++ b/src/main/getDiForUnitTesting.ts
@@ -4,7 +4,7 @@
  */
 
 import glob from "glob";
-import { kebabCase, memoize, noop } from "lodash/fp";
+import { kebabCase, memoize, noop, chunk } from "lodash/fp";
 import type { DiContainer, Injectable } from "@ogre-tools/injectable";
 import { createContainer } from "@ogre-tools/injectable";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
@@ -99,6 +99,7 @@ import updateHelmReleaseInjectable from "./helm/helm-service/update-helm-release
 import waitUntilBundledExtensionsAreLoadedInjectable from "./start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable";
 import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
 import electronInjectable from "./utils/resolve-system-proxy/electron.injectable";
+import type { HotbarStore } from "../common/hotbars/store";
 
 export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) {
   const {
@@ -111,15 +112,13 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
 
   setLegacyGlobalDiForExtensionApi(di, Environments.main);
 
-  for (const filePath of getInjectableFilePaths()) {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const injectableInstance = require(filePath).default;
+  const filePaths = getInjectableFilePaths();
 
-    di.register({
-      ...injectableInstance,
-      aliases: [injectableInstance, ...(injectableInstance.aliases || [])],
-    });
-  }
+  const injectables = filePaths.map(filePath => require(filePath).default);
+
+  chunk(100)(injectables).forEach(chunkInjectables => {
+    di.register(...chunkInjectables);
+  });
 
   di.preventSideEffects();
 
@@ -127,7 +126,13 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
     di.override(electronInjectable, () => ({}));
     di.override(waitUntilBundledExtensionsAreLoadedInjectable, () => async () => {});
     di.override(getRandomIdInjectable, () => () => "some-irrelevant-random-id");
-    di.override(hotbarStoreInjectable, () => ({ load: () => {} }));
+
+    di.override(hotbarStoreInjectable, () => ({
+      load: () => {},
+      getActive: () => ({ name: "some-hotbar", items: [] }),
+      getDisplayIndex: () => "0",
+    }) as unknown as HotbarStore);
+
     di.override(userStoreInjectable, () => ({ startMainReactions: () => {}, extensionRegistryUrl: { customUrl: "some-custom-url" }}) as UserStore);
     di.override(extensionsStoreInjectable, () => ({ isEnabled: (opts) => (void opts, false) }) as ExtensionsStore);
     di.override(clusterStoreInjectable, () => ({ provideInitialFromMain: () => {}, getById: (id) => (void id, {}) as Cluster }) as ClusterStore);
diff --git a/src/renderer/components/+workloads-cronjobs/cron-job-trigger-dialog-cluster-frame-child-component.injectable.ts b/src/renderer/components/+workloads-cronjobs/cron-job-trigger-dialog-cluster-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..0ab5c66241
--- /dev/null
+++ b/src/renderer/components/+workloads-cronjobs/cron-job-trigger-dialog-cluster-frame-child-component.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { CronJobTriggerDialog } from "./cronjob-trigger-dialog";
+import { clusterFrameChildComponentInjectionToken } from "../../frames/cluster-frame/cluster-frame-child-component-injection-token";
+
+const cronJobTriggerDialogClusterFrameChildComponentInjectable = getInjectable({
+  id: "cron-job-trigger-dialog-cluster-frame-child-component",
+
+  instantiate: () => ({
+    id: "cron-job-trigger-dialog",
+    shouldRender: computed(() => true),
+    Component: CronJobTriggerDialog,
+  }),
+
+  injectionToken: clusterFrameChildComponentInjectionToken,
+
+  causesSideEffects: true,
+});
+
+export default cronJobTriggerDialogClusterFrameChildComponentInjectable;
diff --git a/src/renderer/components/+workloads-deployments/scale/deployment-scale-dialog-cluster-frame-child-component.injectable.ts b/src/renderer/components/+workloads-deployments/scale/deployment-scale-dialog-cluster-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..712b5d4321
--- /dev/null
+++ b/src/renderer/components/+workloads-deployments/scale/deployment-scale-dialog-cluster-frame-child-component.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { DeploymentScaleDialog } from "./dialog";
+import { clusterFrameChildComponentInjectionToken } from "../../../frames/cluster-frame/cluster-frame-child-component-injection-token";
+
+const deploymentScaleDialogClusterFrameChildComponentInjectable = getInjectable({
+  id: "deployment-scale-dialog-cluster-frame-child-component",
+
+  instantiate: () => ({
+    id: "deployment-scale-dialog",
+    shouldRender: computed(() => true),
+    Component: DeploymentScaleDialog,
+  }),
+
+  injectionToken: clusterFrameChildComponentInjectionToken,
+
+  causesSideEffects: true,
+});
+
+export default deploymentScaleDialogClusterFrameChildComponentInjectable;
diff --git a/src/renderer/components/+workloads-replicasets/scale-dialog/replicaset-scale-dialog-cluster-frame-child-component.injectable.ts b/src/renderer/components/+workloads-replicasets/scale-dialog/replicaset-scale-dialog-cluster-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..0dd5790944
--- /dev/null
+++ b/src/renderer/components/+workloads-replicasets/scale-dialog/replicaset-scale-dialog-cluster-frame-child-component.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { clusterFrameChildComponentInjectionToken } from "../../../frames/cluster-frame/cluster-frame-child-component-injection-token";
+import { ReplicaSetScaleDialog } from "./dialog";
+
+const replicasetScaleDialogClusterFrameChildComponentInjectable = getInjectable({
+  id: "replicaset-scale-dialog-cluster-frame-child-component",
+
+  instantiate: () => ({
+    id: "replicaset-scale-dialog",
+    shouldRender: computed(() => true),
+    Component: ReplicaSetScaleDialog,
+  }),
+
+  injectionToken: clusterFrameChildComponentInjectionToken,
+
+  causesSideEffects: true,
+});
+
+export default replicasetScaleDialogClusterFrameChildComponentInjectable;
diff --git a/src/renderer/components/+workloads-statefulsets/scale/statefulset-scale-dialog-cluster-frame-child-component.injectable.ts b/src/renderer/components/+workloads-statefulsets/scale/statefulset-scale-dialog-cluster-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..ee23dde011
--- /dev/null
+++ b/src/renderer/components/+workloads-statefulsets/scale/statefulset-scale-dialog-cluster-frame-child-component.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { StatefulSetScaleDialog } from "./dialog";
+import { clusterFrameChildComponentInjectionToken } from "../../../frames/cluster-frame/cluster-frame-child-component-injection-token";
+
+const statefulsetScaleDialogClusterFrameChildComponentInjectable = getInjectable({
+  id: "statefulset-scale-dialog-cluster-frame-child-component",
+
+  instantiate: () => ({
+    id: "statefulset-scale-dialog",
+    shouldRender: computed(() => true),
+    Component: StatefulSetScaleDialog,
+  }),
+
+  injectionToken: clusterFrameChildComponentInjectionToken,
+
+  causesSideEffects: true,
+});
+
+export default statefulsetScaleDialogClusterFrameChildComponentInjectable;
diff --git a/src/renderer/components/cluster-manager/cluster-manager-root-frame-child-component.injectable.tsx b/src/renderer/components/cluster-manager/cluster-manager-root-frame-child-component.injectable.tsx
new file mode 100644
index 0000000000..9db066e1ad
--- /dev/null
+++ b/src/renderer/components/cluster-manager/cluster-manager-root-frame-child-component.injectable.tsx
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { getInjectable } from "@ogre-tools/injectable";
+import { rootFrameChildComponentInjectionToken } from "../../frames/root-frame/root-frame-child-component-injection-token";
+import { ClusterManager } from "./cluster-manager";
+import { computed } from "mobx";
+import { ErrorBoundary } from "../error-boundary";
+
+const clusterManagerRootFrameChildComponentInjectable = getInjectable({
+  id: "cluster-manager-root-frame-child-component",
+
+  instantiate: () => ({
+    id: "cluster-manager",
+
+    shouldRender: computed(() => true),
+
+    Component: () => (
+      <ErrorBoundary>
+        <ClusterManager />
+      </ErrorBoundary>
+    ),
+  }),
+
+  injectionToken: rootFrameChildComponentInjectionToken,
+});
+
+export default clusterManagerRootFrameChildComponentInjectable;
diff --git a/src/renderer/components/command-palette/command-container-cluster-frame-child-component.injectable.ts b/src/renderer/components/command-palette/command-container-cluster-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..09b1ce6c53
--- /dev/null
+++ b/src/renderer/components/command-palette/command-container-cluster-frame-child-component.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { CommandContainer } from "./command-container";
+import { clusterFrameChildComponentInjectionToken } from "../../frames/cluster-frame/cluster-frame-child-component-injection-token";
+
+const commandContainerClusterFrameChildComponentInjectable = getInjectable({
+  id: "command-container-cluster-frame-child-component",
+
+  instantiate: () => ({
+    id: "command-container",
+    shouldRender: computed(() => true),
+    Component: CommandContainer,
+  }),
+
+  causesSideEffects: true,
+
+  injectionToken: clusterFrameChildComponentInjectionToken,
+});
+
+export default commandContainerClusterFrameChildComponentInjectable;
diff --git a/src/renderer/components/command-palette/command-container-root-frame-child-component.injectable.ts b/src/renderer/components/command-palette/command-container-root-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..f6c5105cc3
--- /dev/null
+++ b/src/renderer/components/command-palette/command-container-root-frame-child-component.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { rootFrameChildComponentInjectionToken } from "../../frames/root-frame/root-frame-child-component-injection-token";
+import { computed } from "mobx";
+import { CommandContainer } from "./command-container";
+
+const commandContainerRootFrameChildComponentInjectable = getInjectable({
+  id: "command-container-root-frame-child-component",
+
+  instantiate: () => ({
+    id: "command-container",
+    shouldRender: computed(() => true),
+    Component: CommandContainer,
+  }),
+
+  causesSideEffects: true,
+
+  injectionToken: rootFrameChildComponentInjectionToken,
+});
+
+export default commandContainerRootFrameChildComponentInjectable;
diff --git a/src/renderer/components/confirm-dialog/confirm-dialog-cluster-frame-child-component.injectable.ts b/src/renderer/components/confirm-dialog/confirm-dialog-cluster-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..196d18b27f
--- /dev/null
+++ b/src/renderer/components/confirm-dialog/confirm-dialog-cluster-frame-child-component.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { ConfirmDialog } from "./confirm-dialog";
+import { clusterFrameChildComponentInjectionToken } from "../../frames/cluster-frame/cluster-frame-child-component-injection-token";
+
+const confirmDialogClusterFrameChildComponentInjectable = getInjectable({
+  id: "confirm-dialog-cluster-frame-child-component",
+
+  instantiate: () => ({
+    id: "confirm-dialog",
+    shouldRender: computed(() => true),
+    Component: ConfirmDialog,
+  }),
+
+  injectionToken: clusterFrameChildComponentInjectionToken,
+});
+
+export default confirmDialogClusterFrameChildComponentInjectable;
diff --git a/src/renderer/components/confirm-dialog/confirm-dialog-root-frame-child-component.injectable.ts b/src/renderer/components/confirm-dialog/confirm-dialog-root-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..0132040818
--- /dev/null
+++ b/src/renderer/components/confirm-dialog/confirm-dialog-root-frame-child-component.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { rootFrameChildComponentInjectionToken } from "../../frames/root-frame/root-frame-child-component-injection-token";
+import { computed } from "mobx";
+import { ConfirmDialog } from "./confirm-dialog";
+
+const confirmDialogRootFrameChildComponentInjectable = getInjectable({
+  id: "confirm-dialog-root-frame-child-component",
+
+  instantiate: () => ({
+    id: "confirm-dialog",
+    shouldRender: computed(() => true),
+    Component: ConfirmDialog,
+  }),
+
+  injectionToken: rootFrameChildComponentInjectionToken,
+});
+
+export default confirmDialogRootFrameChildComponentInjectable;
diff --git a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx b/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx
index 09bf3a0700..8978e00b5b 100644
--- a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx
+++ b/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx
@@ -7,9 +7,7 @@ import { KubeConfig } from "@kubernetes/client-node";
 import { fireEvent } from "@testing-library/react";
 import type { RenderResult } from "@testing-library/react";
 import mockFs from "mock-fs";
-import React from "react";
 import * as selectEvent from "react-select-event";
-import { DeleteClusterDialog } from "../view";
 import type { CreateCluster } from "../../../../common/cluster/create-cluster-injection-token";
 import { createClusterInjectionToken } from "../../../../common/cluster/create-cluster-injection-token";
 import createContextHandlerInjectable from "../../../../main/context-handler/create-context-handler.injectable";
@@ -19,12 +17,6 @@ import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-cre
 import createKubeconfigManagerInjectable from "../../../../main/kubeconfig-manager/create-kubeconfig-manager.injectable";
 import type { ApplicationBuilder } from "../../test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../test-utils/get-application-builder";
-import { frontEndRouteInjectionToken } from "../../../../common/front-end-routing/front-end-route-injection-token";
-import { getInjectable } from "@ogre-tools/injectable";
-import { computed } from "mobx";
-import { routeSpecificComponentInjectionToken } from "../../../routes/route-specific-component-injection-token";
-import { navigateToRouteInjectionToken } from "../../../../common/front-end-routing/navigate-to-route-injection-token";
-import hotbarStoreInjectable from "../../../../common/hotbars/store.injectable";
 import normalizedPlatformInjectable from "../../../../common/vars/normalized-platform.injectable";
 import kubectlBinaryNameInjectable from "../../../../main/kubectl/binary-name.injectable";
 import kubectlDownloadingNormalizedArchInjectable from "../../../../main/kubectl/normalized-arch.injectable";
@@ -111,22 +103,9 @@ describe("<DeleteClusterDialog />", () => {
       mainDi.override(kubectlBinaryNameInjectable, () => "kubectl");
       mainDi.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");
       mainDi.override(normalizedPlatformInjectable, () => "darwin");
-
-      rendererDi.override(hotbarStoreInjectable, () => ({}));
       rendererDi.override(storesAndApisCanBeCreatedInjectable, () => true);
     });
 
-    const { rendererDi } = applicationBuilder.dis;
-
-    rendererDi.register(testRouteInjectable, testRouteComponentInjectable);
-
-    applicationBuilder.beforeRender(({ rendererDi }) => {
-      const navigateToRoute = rendererDi.inject(navigateToRouteInjectionToken);
-      const testRoute = rendererDi.inject(testRouteInjectable);
-
-      navigateToRoute(testRoute);
-    });
-
     mockFs();
 
     applicationBuilder.beforeRender(({ rendererDi }) => {
@@ -321,26 +300,3 @@ describe("<DeleteClusterDialog />", () => {
     });
   });
 });
-
-const testRouteInjectable = getInjectable({
-  id: "some-test-route",
-
-  instantiate: () => ({
-    path: "/some-test-path",
-    clusterFrame: false,
-    isEnabled: computed(() => true),
-  }),
-
-  injectionToken: frontEndRouteInjectionToken,
-});
-
-const testRouteComponentInjectable = getInjectable({
-  id: "some-test-component",
-
-  instantiate: (di) => ({
-    route: di.inject(testRouteInjectable),
-    Component: () => <DeleteClusterDialog />,
-  }),
-
-  injectionToken: routeSpecificComponentInjectionToken,
-});
diff --git a/src/renderer/components/delete-cluster-dialog/delete-cluster-dialog-cluster-frame-child-component.injectable.ts b/src/renderer/components/delete-cluster-dialog/delete-cluster-dialog-cluster-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..ed91967d39
--- /dev/null
+++ b/src/renderer/components/delete-cluster-dialog/delete-cluster-dialog-cluster-frame-child-component.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { DeleteClusterDialog } from "./view";
+import { clusterFrameChildComponentInjectionToken } from "../../frames/cluster-frame/cluster-frame-child-component-injection-token";
+
+const deleteClusterDialogClusterFrameChildComponentInjectable = getInjectable({
+  id: "delete-cluster-dialog-cluster-frame-child-component",
+
+  instantiate: () => ({
+    id: "delete-cluster-dialog",
+    shouldRender: computed(() => true),
+    Component: DeleteClusterDialog,
+  }),
+
+  injectionToken: clusterFrameChildComponentInjectionToken,
+
+  causesSideEffects: true,
+});
+
+export default deleteClusterDialogClusterFrameChildComponentInjectable;
diff --git a/src/renderer/components/dock/dock-tab.tsx b/src/renderer/components/dock/dock-tab.tsx
index 1e6dc64077..c988f1a696 100644
--- a/src/renderer/components/dock/dock-tab.tsx
+++ b/src/renderer/components/dock/dock-tab.tsx
@@ -14,10 +14,10 @@ import { Tab } from "../tabs";
 import { Icon } from "../icon";
 import { Menu, MenuItem } from "../menu";
 import { observable } from "mobx";
-import { isMac } from "../../../common/vars";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import dockStoreInjectable from "./dock/store.injectable";
 import { Tooltip, TooltipPosition } from "../tooltip";
+import isMacInjectable from "../../../common/vars/is-mac.injectable";
 
 export interface DockTabProps extends TabProps<DockTabModel> {
   moreActions?: React.ReactNode;
@@ -25,6 +25,7 @@ export interface DockTabProps extends TabProps<DockTabModel> {
 
 interface Dependencies {
   dockStore: DockStore;
+  isMac: boolean;
 }
 
 @observer
@@ -73,7 +74,7 @@ class NonInjectedDockTab extends React.Component<DockTabProps & Dependencies> {
   }
 
   render() {
-    const { className, moreActions, dockStore, active, ...tabProps } = this.props;
+    const { className, moreActions, dockStore, active, isMac, ...tabProps } = this.props;
 
     if (!tabProps.value) {
       return;
@@ -100,7 +101,7 @@ class NonInjectedDockTab extends React.Component<DockTabProps & Dependencies> {
                   <Icon
                     small
                     material="close"
-                    tooltip={`Close ${isMac ? "⌘+W" : "Ctrl+W"}`}
+                    tooltip={`Close ${this.props.isMac ? "⌘+W" : "Ctrl+W"}`}
                     onClick={close}
                   />
                 </div>
@@ -124,6 +125,7 @@ class NonInjectedDockTab extends React.Component<DockTabProps & Dependencies> {
 export const DockTab = withInjectables<Dependencies, DockTabProps>(NonInjectedDockTab, {
   getProps: (di, props) => ({
     dockStore: di.inject(dockStoreInjectable),
+    isMac: di.inject(isMacInjectable),
     ...props,
   }),
 });
diff --git a/src/renderer/components/hotbar/hotbar-menu.tsx b/src/renderer/components/hotbar/hotbar-menu.tsx
index 9e3b9e5488..05e11bf659 100644
--- a/src/renderer/components/hotbar/hotbar-menu.tsx
+++ b/src/renderer/components/hotbar/hotbar-menu.tsx
@@ -184,7 +184,9 @@ class NonInjectedHotbarMenu extends React.Component<Dependencies & HotbarMenuPro
     return (
       <div className={cssNames("HotbarMenu flex column", { draggingOver: this.draggingOver }, className)}>
         <div className="HotbarItems flex column gaps">
-          <DragDropContext onDragStart={() => this.onDragStart()} onDragEnd={(result) => this.onDragEnd(result)}>
+          <DragDropContext
+            onDragStart={() => this.onDragStart()}
+            onDragEnd={(result) => this.onDragEnd(result)}>
             {this.renderGrid()}
           </DragDropContext>
         </div>
diff --git a/src/renderer/components/kube-object-details/kube-object-details-cluster-frame-child-component.injectable.ts b/src/renderer/components/kube-object-details/kube-object-details-cluster-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..4799ff3099
--- /dev/null
+++ b/src/renderer/components/kube-object-details/kube-object-details-cluster-frame-child-component.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { KubeObjectDetails } from "./kube-object-details";
+import { clusterFrameChildComponentInjectionToken } from "../../frames/cluster-frame/cluster-frame-child-component-injection-token";
+
+const kubeObjectDetailsClusterFrameChildComponentInjectable = getInjectable({
+  id: "kube-object-details-cluster-frame-child-component",
+
+  instantiate: () => ({
+    id: "kube-object-details",
+    shouldRender: computed(() => true),
+    Component: KubeObjectDetails,
+  }),
+
+  injectionToken: clusterFrameChildComponentInjectionToken,
+
+  causesSideEffects: true,
+});
+
+export default kubeObjectDetailsClusterFrameChildComponentInjectable;
diff --git a/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog-cluster-frame-child-component.injectable.ts b/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog-cluster-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..796e13a063
--- /dev/null
+++ b/src/renderer/components/kubeconfig-dialog/kubeconfig-dialog-cluster-frame-child-component.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { clusterFrameChildComponentInjectionToken } from "../../frames/cluster-frame/cluster-frame-child-component-injection-token";
+import { KubeConfigDialog } from "./kubeconfig-dialog";
+
+const kubeconfigDialogClusterFrameChildComponentInjectable = getInjectable({
+  id: "kubeconfig-dialog-cluster-frame-child-component",
+
+  instantiate: () => ({
+    id: "kubeconfig-dialog",
+    shouldRender: computed(() => true),
+    Component: KubeConfigDialog,
+  }),
+
+  injectionToken: clusterFrameChildComponentInjectionToken,
+
+  causesSideEffects: true,
+});
+
+export default kubeconfigDialogClusterFrameChildComponentInjectable;
diff --git a/src/renderer/components/notifications/notifications-cluster-frame-child-component.injectable.ts b/src/renderer/components/notifications/notifications-cluster-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..acd2e72b9e
--- /dev/null
+++ b/src/renderer/components/notifications/notifications-cluster-frame-child-component.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { Notifications } from "./notifications";
+import { clusterFrameChildComponentInjectionToken } from "../../frames/cluster-frame/cluster-frame-child-component-injection-token";
+
+const notificationsClusterFrameChildComponentInjectable = getInjectable({
+  id: "notifications-cluster-frame-child-component",
+
+  instantiate: () => ({
+    id: "notifications",
+    shouldRender: computed(() => true),
+    Component: Notifications,
+  }),
+
+  injectionToken: clusterFrameChildComponentInjectionToken,
+});
+
+export default notificationsClusterFrameChildComponentInjectable;
diff --git a/src/renderer/components/notifications/notifications-root-frame-child-component.injectable.ts b/src/renderer/components/notifications/notifications-root-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..eec5a1962a
--- /dev/null
+++ b/src/renderer/components/notifications/notifications-root-frame-child-component.injectable.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { rootFrameChildComponentInjectionToken } from "../../frames/root-frame/root-frame-child-component-injection-token";
+import { computed } from "mobx";
+import { Notifications } from "./notifications";
+
+const notificationsRootFrameChildComponentInjectable = getInjectable({
+  id: "notifications-root-frame-child-component",
+
+  instantiate: () => ({
+    id: "notifications",
+    shouldRender: computed(() => true),
+    Component: Notifications,
+  }),
+
+  injectionToken: rootFrameChildComponentInjectionToken,
+});
+
+export default notificationsRootFrameChildComponentInjectable;
diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx
index 25101ae634..80a6627f50 100644
--- a/src/renderer/components/test-utils/get-application-builder.tsx
+++ b/src/renderer/components/test-utils/get-application-builder.tsx
@@ -7,21 +7,17 @@ import rendererExtensionsInjectable from "../../../extensions/renderer-extension
 import currentlyInClusterFrameInjectable from "../../routes/currently-in-cluster-frame.injectable";
 import type { IObservableArray, ObservableSet } from "mobx";
 import { computed, observable, runInAction } from "mobx";
-import { renderFor } from "./renderFor";
 import React from "react";
 import { Router } from "react-router";
-import { Observer } from "mobx-react";
 import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
 import allowedResourcesInjectable from "../../cluster-frame-context/allowed-resources.injectable";
 import type { RenderResult } from "@testing-library/react";
 import { getByText, fireEvent } from "@testing-library/react";
 import type { KubeResource } from "../../../common/rbac";
-import { Sidebar } from "../layout/sidebar";
 import type { DiContainer } from "@ogre-tools/injectable";
 import clusterStoreInjectable from "../../../common/cluster-store/cluster-store.injectable";
 import type { ClusterStore } from "../../../common/cluster-store/cluster-store";
 import mainExtensionsInjectable from "../../../extensions/main-extensions.injectable";
-import currentRouteComponentInjectable from "../../routes/current-route-component.injectable";
 import { pipeline } from "@ogre-tools/fp";
 import { flatMap, compact, join, get, filter, map, matches, last } from "lodash/fp";
 import preferenceNavigationItemsInjectable from "../+preferences/preferences-navigation/preference-navigation-items.injectable";
@@ -44,8 +40,6 @@ import historyInjectable from "../../navigation/history.injectable";
 import type { MinimalTrayMenuItem } from "../../../main/tray/electron-tray/electron-tray.injectable";
 import electronTrayInjectable from "../../../main/tray/electron-tray/electron-tray.injectable";
 import applicationWindowInjectable from "../../../main/start-main-application/lens-window/application-window/application-window.injectable";
-import { Notifications } from "../notifications/notifications";
-import broadcastThatRootFrameIsRenderedInjectable from "../../frames/root-frame/broadcast-that-root-frame-is-rendered.injectable";
 import { getDiForUnitTesting as getRendererDi } from "../../getDiForUnitTesting";
 import { getDiForUnitTesting as getMainDi } from "../../../main/getDiForUnitTesting";
 import { overrideChannels } from "../../../test-utils/channel-fakes/override-channels";
@@ -53,7 +47,6 @@ import trayIconPathsInjectable from "../../../main/tray/tray-icon-path.injectabl
 import assert from "assert";
 import { openMenu } from "react-select-event";
 import userEvent from "@testing-library/user-event";
-import { StatusBar } from "../status-bar/status-bar";
 import lensProxyPortInjectable from "../../../main/lens-proxy/lens-proxy-port.injectable";
 import type { Route } from "../../../common/front-end-routing/front-end-route-injection-token";
 import type { NavigateToRouteOptions } from "../../../common/front-end-routing/navigate-to-route-injection-token";
@@ -62,7 +55,10 @@ import type { LensMainExtension } from "../../../extensions/lens-main-extension"
 import type { LensExtension } from "../../../extensions/lens-extension";
 
 import extensionInjectable from "../../../extensions/extension-loader/extension/extension.injectable";
-import { TopBar } from "../layout/top-bar/top-bar";
+import { renderFor } from "./renderFor";
+import { RootFrame } from "../../frames/root-frame/root-frame";
+import { ClusterFrame } from "../../frames/cluster-frame/cluster-frame";
+import hostedClusterIdInjectable from "../../cluster-frame-context/hosted-cluster-id.injectable";
 
 type Callback = (dis: DiContainers) => void | Promise<void>;
 
@@ -125,10 +121,7 @@ interface DiContainers {
 }
 
 interface Environment {
-  renderSidebar: () => React.ReactNode;
-  renderTopBar: () => React.ReactNode;
-  renderStatusBar: () => React.ReactNode;
-  beforeRender: () => void;
+  RootComponent: React.ElementType;
   onAllowKubeResource: () => void;
 }
 
@@ -166,17 +159,7 @@ export const getApplicationBuilder = () => {
 
   const environments = {
     application: {
-      renderSidebar: () => null,
-
-      renderTopBar: () => <TopBar />,
-
-      renderStatusBar: () => <StatusBar />,
-
-      beforeRender: () => {
-        const nofifyThatRootFrameIsRendered = rendererDi.inject(broadcastThatRootFrameIsRenderedInjectable);
-
-        nofifyThatRootFrameIsRendered();
-      },
+      RootComponent: RootFrame,
 
       onAllowKubeResource: () => {
         throw new Error(
@@ -186,10 +169,7 @@ export const getApplicationBuilder = () => {
     } as Environment,
 
     clusterFrame: {
-      renderSidebar: () => <Sidebar />,
-      renderStatusBar: () => null,
-      renderTopBar: () => null,
-      beforeRender: () => {},
+      RootComponent: ClusterFrame,
       onAllowKubeResource: () => {},
     } as Environment,
   };
@@ -401,6 +381,7 @@ export const getApplicationBuilder = () => {
 
       const namespaceStoreStub = {
         contextNamespaces: [],
+        items: [],
       } as unknown as NamespaceStore;
 
       const clusterFrameContextFake = new ClusterFrameContext(
@@ -413,6 +394,7 @@ export const getApplicationBuilder = () => {
 
       rendererDi.override(namespaceStoreInjectable, () => namespaceStoreStub);
       rendererDi.override(hostedClusterInjectable, () => clusterStub);
+      rendererDi.override(hostedClusterIdInjectable, () => "irrelevant-hosted-cluster-id");
       rendererDi.override(clusterFrameContextInjectable, () => clusterFrameContextFake);
 
       // Todo: get rid of global state.
@@ -474,35 +456,17 @@ export const getApplicationBuilder = () => {
 
       await startFrame();
 
-      const render = renderFor(rendererDi);
-      const history = rendererDi.inject(historyInjectable);
-      const currentRouteComponent = rendererDi.inject(currentRouteComponentInjectable);
-
       for (const callback of beforeRenderCallbacks) {
         await callback(dis);
       }
 
-      environment.beforeRender();
+      const history = rendererDi.inject(historyInjectable);
+
+      const render = renderFor(rendererDi);
 
       rendered = render(
         <Router history={history}>
-          {environment.renderSidebar()}
-          {environment.renderTopBar()}
-          {environment.renderStatusBar()}
-
-          <Observer>
-            {() => {
-              const Component = currentRouteComponent.get();
-
-              if (!Component) {
-                return null;
-              }
-
-              return <Component />;
-            }}
-          </Observer>
-
-          <Notifications />
+          <environment.RootComponent />
         </Router>,
       );
 
diff --git a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
index f4ddc5a0b7..6be63e21d3 100644
--- a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
+++ b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
@@ -2,6 +2,9 @@
 
 exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissions given no matching component given current url is starting url renders 1`] = `
 <div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
   <div
     class="mainLayout"
     style="--sidebar-width: 200px;"
@@ -467,14 +470,14 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissions renders 1`] = `
 <div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
   <div
     class="mainLayout"
     style="--sidebar-width: 200px;"
@@ -947,14 +950,14 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
 
 exports[`<ClusterFrame /> given cluster without list nodes, but with namespaces permissions renders 1`] = `
 <div>
+  <div
+    class="Notifications flex column align-flex-end"
+  />
   <div
     class="mainLayout"
     style="--sidebar-width: 200px;"
@@ -1483,8 +1486,5 @@ exports[`<ClusterFrame /> given cluster without list nodes, but with namespaces
       </div>
     </div>
   </div>
-  <div
-    class="Notifications flex column align-flex-end"
-  />
 </div>
 `;
diff --git a/src/renderer/frames/cluster-frame/cluster-frame-child-component-injection-token.ts b/src/renderer/frames/cluster-frame/cluster-frame-child-component-injection-token.ts
new file mode 100644
index 0000000000..c4cbdfab23
--- /dev/null
+++ b/src/renderer/frames/cluster-frame/cluster-frame-child-component-injection-token.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type { IComputedValue } from "mobx";
+
+export interface ClusterFrameChildComponent {
+  id: string;
+  Component: React.ElementType;
+  shouldRender: IComputedValue<boolean>;
+}
+
+export const clusterFrameChildComponentInjectionToken = getInjectionToken<ClusterFrameChildComponent>({
+  id: "cluster-frame-child-component",
+});
diff --git a/src/renderer/frames/cluster-frame/cluster-frame-layout-child-component.injectable.tsx b/src/renderer/frames/cluster-frame/cluster-frame-layout-child-component.injectable.tsx
new file mode 100644
index 0000000000..3f1f5c4a03
--- /dev/null
+++ b/src/renderer/frames/cluster-frame/cluster-frame-layout-child-component.injectable.tsx
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import React from "react";
+import { getInjectable } from "@ogre-tools/injectable";
+import { clusterFrameChildComponentInjectionToken } from "./cluster-frame-child-component-injection-token";
+import { MainLayout } from "../../components/layout/main-layout";
+import { Sidebar } from "../../components/layout/sidebar";
+import { Dock } from "../../components/dock";
+import styles from "./cluster-frame.module.css";
+import { computed } from "mobx";
+import currentRouteComponentInjectable from "../../routes/current-route-component.injectable";
+import { Redirect } from "react-router";
+import startUrlInjectable from "./start-url.injectable";
+import currentPathInjectable from "../../routes/current-path.injectable";
+import { observer } from "mobx-react";
+
+const clusterFrameLayoutChildComponentInjectable = getInjectable({
+  id: "cluster-frame-layout-child-component",
+
+  instantiate: (di) => {
+    const currentRouteComponent = di.inject(currentRouteComponentInjectable);
+    const startUrl = di.inject(startUrlInjectable);
+    const currentPath = di.inject(currentPathInjectable);
+
+    return {
+      id: "cluster-frame-layout",
+
+      shouldRender: computed(() => true),
+
+      Component: observer(() => {
+        const Component = currentRouteComponent.get();
+        const starting = startUrl.get();
+        const current = currentPath.get();
+
+        return (
+          <MainLayout sidebar={<Sidebar />} footer={<Dock />}>
+            {Component ? (
+              <Component />
+            ) : // NOTE: this check is to prevent an infinite loop
+              starting !== current ? (
+                <Redirect to={startUrl.get()} />
+              ) : (
+                <div className={styles.centering}>
+                  <div className="error">
+                    An error has occured. No route can be found matching the
+                    current route, which is also the starting route.
+                  </div>
+                </div>
+              )}
+          </MainLayout>
+        );
+      }),
+    };
+  },
+
+  injectionToken: clusterFrameChildComponentInjectionToken,
+});
+
+export default clusterFrameLayoutChildComponentInjectable;
diff --git a/src/renderer/frames/cluster-frame/cluster-frame.tsx b/src/renderer/frames/cluster-frame/cluster-frame.tsx
index 6dc014d3be..d1ce64683f 100755
--- a/src/renderer/frames/cluster-frame/cluster-frame.tsx
+++ b/src/renderer/frames/cluster-frame/cluster-frame.tsx
@@ -2,52 +2,30 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import styles from "./cluster-frame.module.css";
 import React, { useEffect } from "react";
-import type { IComputedValue } from "mobx";
-import { observer } from "mobx-react";
-import { Redirect } from "react-router";
-import { ConfirmDialog } from "../../components/confirm-dialog";
-import { DeploymentScaleDialog } from "../../components/+workloads-deployments/scale/dialog";
-import { CronJobTriggerDialog } from "../../components/+workloads-cronjobs/cronjob-trigger-dialog";
-import { StatefulSetScaleDialog } from "../../components/+workloads-statefulsets/scale/dialog";
-import { ReplicaSetScaleDialog } from "../../components/+workloads-replicasets/scale-dialog/dialog";
-import { CommandContainer } from "../../components/command-palette/command-container";
+import { Observer, observer } from "mobx-react";
 import { ErrorBoundary } from "../../components/error-boundary";
-import { MainLayout } from "../../components/layout/main-layout";
-import { Notifications } from "../../components/notifications";
-import { KubeObjectDetails } from "../../components/kube-object-details";
-import { KubeConfigDialog } from "../../components/kubeconfig-dialog";
-import { Sidebar } from "../../components/layout/sidebar";
-import { Dock } from "../../components/dock";
-import { PortForwardDialog } from "../../port-forward";
-import { DeleteClusterDialog } from "../../components/delete-cluster-dialog";
 import type { NamespaceStore } from "../../components/+namespaces/store";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import namespaceStoreInjectable  from "../../components/+namespaces/store.injectable";
 import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api";
 import { disposer } from "../../utils";
-import currentRouteComponentInjectable from "../../routes/current-route-component.injectable";
-import startUrlInjectable from "./start-url.injectable";
 import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
-import currentPathInjectable from "../../routes/current-path.injectable";
+import type { ClusterFrameChildComponent } from "./cluster-frame-child-component-injection-token";
+import { clusterFrameChildComponentInjectionToken } from "./cluster-frame-child-component-injection-token";
 import watchHistoryStateInjectable from "../../remote-helpers/watch-history-state.injectable";
 
 interface Dependencies {
   namespaceStore: NamespaceStore;
-  currentRouteComponent: IComputedValue<React.ElementType<{}> | undefined>;
-  startUrl: IComputedValue<string>;
   subscribeStores: SubscribeStores;
-  currentPath: IComputedValue<string>;
+  childComponents: ClusterFrameChildComponent[];
   watchHistoryState: () => () => void;
 }
 
 export const NonInjectedClusterFrame = observer(({
   namespaceStore,
-  currentRouteComponent,
-  startUrl,
   subscribeStores,
-  currentPath,
+  childComponents,
   watchHistoryState,
 }: Dependencies) => {
   useEffect(() => disposer(
@@ -57,43 +35,14 @@ export const NonInjectedClusterFrame = observer(({
     watchHistoryState(),
   ), []);
 
-  const Component = currentRouteComponent.get();
-  const starting = startUrl.get();
-  const current = currentPath.get();
-
   return (
     <ErrorBoundary>
-      <MainLayout
-        sidebar={<Sidebar />}
-        footer={<Dock />}
-      >
-        {
-          Component
-            ? <Component />
-            // NOTE: this check is to prevent an infinite loop
-            : starting !== current
-              ? <Redirect to={startUrl.get()} />
-              : (
-                <div className={styles.centering}>
-                  <div className="error">
-                    An error has occured. No route can be found matching the current route, which is also the starting route.
-                  </div>
-                </div>
-              )
-        }
-      </MainLayout>
-
-      <Notifications />
-      <ConfirmDialog />
-      <KubeObjectDetails />
-      <KubeConfigDialog />
-      <DeploymentScaleDialog />
-      <StatefulSetScaleDialog />
-      <ReplicaSetScaleDialog />
-      <CronJobTriggerDialog />
-      <PortForwardDialog />
-      <DeleteClusterDialog />
-      <CommandContainer />
+      {childComponents
+        .map((child) => (
+          <Observer key={child.id}>
+            {() => (child.shouldRender.get() ? <child.Component /> : null) }
+          </Observer>
+        ))}
     </ErrorBoundary>
   );
 });
@@ -102,9 +51,7 @@ export const ClusterFrame = withInjectables<Dependencies>(NonInjectedClusterFram
   getProps: di => ({
     namespaceStore: di.inject(namespaceStoreInjectable),
     subscribeStores: di.inject(subscribeStoresInjectable),
-    startUrl: di.inject(startUrlInjectable),
-    currentRouteComponent: di.inject(currentRouteComponentInjectable),
-    currentPath: di.inject(currentPathInjectable),
+    childComponents: di.injectMany(clusterFrameChildComponentInjectionToken),
     watchHistoryState: di.inject(watchHistoryStateInjectable),
   }),
 });
diff --git a/src/renderer/frames/root-frame/root-frame-child-component-injection-token.ts b/src/renderer/frames/root-frame/root-frame-child-component-injection-token.ts
new file mode 100644
index 0000000000..5f9aca7c38
--- /dev/null
+++ b/src/renderer/frames/root-frame/root-frame-child-component-injection-token.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type { IComputedValue } from "mobx";
+
+export interface RootFrameChildComponent {
+  id: string;
+  Component: React.ElementType;
+  shouldRender: IComputedValue<boolean>;
+}
+
+export const rootFrameChildComponentInjectionToken = getInjectionToken<RootFrameChildComponent>({
+  id: "root-frame-child-component",
+});
diff --git a/src/renderer/frames/root-frame/root-frame.tsx b/src/renderer/frames/root-frame/root-frame.tsx
index 6cb4d016c5..21d3600ea8 100644
--- a/src/renderer/frames/root-frame/root-frame.tsx
+++ b/src/renderer/frames/root-frame/root-frame.tsx
@@ -3,25 +3,18 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { injectSystemCAs } from "../../../common/system-ca";
 import React from "react";
-import { observer } from "mobx-react";
-import { ClusterManager } from "../../components/cluster-manager";
-import { ErrorBoundary } from "../../components/error-boundary";
-import { Notifications } from "../../components/notifications";
-import { ConfirmDialog } from "../../components/confirm-dialog";
-import { CommandContainer } from "../../components/command-palette/command-container";
+import { Observer } from "mobx-react";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import broadcastThatRootFrameIsRenderedInjectable from "./broadcast-that-root-frame-is-rendered.injectable";
-
-// Todo: remove import-time side-effect.
-injectSystemCAs();
+import type { RootFrameChildComponent } from "./root-frame-child-component-injection-token";
+import { rootFrameChildComponentInjectionToken } from "./root-frame-child-component-injection-token";
 
 interface Dependencies {
   broadcastThatRootFrameIsRendered: () => void;
+  childComponents: RootFrameChildComponent[];
 }
 
-@observer
 class NonInjectedRootFrame extends React.Component<Dependencies> {
   static displayName = "RootFrame";
 
@@ -32,12 +25,12 @@ class NonInjectedRootFrame extends React.Component<Dependencies> {
   render() {
     return (
       <>
-        <ErrorBoundary>
-          <ClusterManager />
-        </ErrorBoundary>
-        <Notifications />
-        <ConfirmDialog />
-        <CommandContainer />
+        {this.props.childComponents
+          .map((child) => (
+            <Observer key={child.id}>
+              {() => (child.shouldRender.get() ? <child.Component /> : null) }
+            </Observer>
+          ))}
       </>
     );
   }
@@ -49,6 +42,7 @@ export const RootFrame = withInjectables<Dependencies>(
   {
     getProps: (di, props) => ({
       broadcastThatRootFrameIsRendered: di.inject(broadcastThatRootFrameIsRenderedInjectable),
+      childComponents: di.injectMany(rootFrameChildComponentInjectionToken),
       ...props,
     }),
   },
diff --git a/src/renderer/frames/root-frame/setup-system-ca.injectable.ts b/src/renderer/frames/root-frame/setup-system-ca.injectable.ts
new file mode 100644
index 0000000000..ca913a4371
--- /dev/null
+++ b/src/renderer/frames/root-frame/setup-system-ca.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { injectSystemCAs } from "../../../common/system-ca";
+import { getInjectable } from "@ogre-tools/injectable";
+import { beforeFrameStartsInjectionToken } from "../../before-frame-starts/before-frame-starts-injection-token";
+
+const setupSystemCaInjectable = getInjectable({
+  id: "setup-system-ca",
+
+  instantiate: () => ({
+    run: async () => {
+      await injectSystemCAs();
+    },
+  }),
+
+  causesSideEffects: true,
+
+  injectionToken: beforeFrameStartsInjectionToken,
+});
+
+export default setupSystemCaInjectable;
diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx
index 8851629cd5..f70f8938cb 100644
--- a/src/renderer/getDiForUnitTesting.tsx
+++ b/src/renderer/getDiForUnitTesting.tsx
@@ -4,10 +4,8 @@
  */
 
 import glob from "glob";
-import { memoize, noop } from "lodash/fp";
-import type {
-  DiContainer,
-  Injectable } from "@ogre-tools/injectable";
+import { memoize, noop, chunk } from "lodash/fp";
+import type { DiContainer, Injectable } from "@ogre-tools/injectable";
 import {
   createContainer,
 } from "@ogre-tools/injectable";
@@ -41,7 +39,7 @@ import apiManagerInjectable from "../common/k8s-api/api-manager/manager.injectab
 import ipcRendererInjectable from "./utils/channel/ipc-renderer.injectable";
 import type { IpcRenderer } from "electron";
 import setupOnApiErrorListenersInjectable from "./api/setup-on-api-errors.injectable";
-import { observable } from "mobx";
+import { observable, computed } from "mobx";
 import defaultShellInjectable from "./components/+preferences/default-shell.injectable";
 import appVersionInjectable from "../common/get-configuration-file-model/app-version/app-version.injectable";
 import provideInitialValuesForSyncBoxesInjectable from "./utils/sync-box/provide-initial-values-for-sync-boxes.injectable";
@@ -59,6 +57,18 @@ import goForwardInjectable from "./components/layout/top-bar/go-forward.injectab
 import closeWindowInjectable from "./components/layout/top-bar/close-window.injectable";
 import maximizeWindowInjectable from "./components/layout/top-bar/maximize-window.injectable";
 import toggleMaximizeWindowInjectable from "./components/layout/top-bar/toggle-maximize-window.injectable";
+import commandContainerRootFrameChildComponentInjectable from "./components/command-palette/command-container-root-frame-child-component.injectable";
+import type { HotbarStore } from "../common/hotbars/store";
+import commandContainerClusterFrameChildComponentInjectable from "./components/command-palette/command-container-cluster-frame-child-component.injectable";
+import cronJobTriggerDialogClusterFrameChildComponentInjectable from "./components/+workloads-cronjobs/cron-job-trigger-dialog-cluster-frame-child-component.injectable";
+import deploymentScaleDialogClusterFrameChildComponentInjectable from "./components/+workloads-deployments/scale/deployment-scale-dialog-cluster-frame-child-component.injectable";
+import replicasetScaleDialogClusterFrameChildComponentInjectable from "./components/+workloads-replicasets/scale-dialog/replicaset-scale-dialog-cluster-frame-child-component.injectable";
+import statefulsetScaleDialogClusterFrameChildComponentInjectable from "./components/+workloads-statefulsets/scale/statefulset-scale-dialog-cluster-frame-child-component.injectable";
+import deleteClusterDialogClusterFrameChildComponentInjectable from "./components/delete-cluster-dialog/delete-cluster-dialog-cluster-frame-child-component.injectable";
+import kubeObjectDetailsClusterFrameChildComponentInjectable from "./components/kube-object-details/kube-object-details-cluster-frame-child-component.injectable";
+import kubeconfigDialogClusterFrameChildComponentInjectable from "./components/kubeconfig-dialog/kubeconfig-dialog-cluster-frame-child-component.injectable";
+import portForwardDialogClusterFrameChildComponentInjectable from "./port-forward/port-forward-dialog-cluster-frame-child-component.injectable";
+import setupSystemCaInjectable from "./frames/root-frame/setup-system-ca.injectable";
 
 export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {}) => {
   const {
@@ -71,14 +81,13 @@ export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {})
 
   setLegacyGlobalDiForExtensionApi(di, Environments.renderer);
 
-  for (const filePath of getInjectableFilePaths()) {
-    const injectableInstance = require(filePath).default;
+  const filePaths = getInjectableFilePaths();
 
-    di.register({
-      ...injectableInstance,
-      aliases: [injectableInstance, ...(injectableInstance.aliases || [])],
-    });
-  }
+  const injectables = filePaths.map(filePath => require(filePath).default);
+
+  chunk(100)(injectables).forEach(chunkInjectables => {
+    di.register(...chunkInjectables);
+  });
 
   di.preventSideEffects();
 
@@ -103,8 +112,35 @@ export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {})
 
     di.override(lensResourcesDirInjectable, () => "/irrelevant");
 
-    di.override(watchHistoryStateInjectable, () => () => () => {});
+    // TODO: Remove side-effects and shared global state
+    di.override(commandContainerRootFrameChildComponentInjectable, () => ({
+      Component: () => null,
+      id: "command-container",
+      shouldRender: computed(() => false),
+    }));
 
+    // TODO: Remove side-effects and shared global state
+    const clusterFrameChildComponentInjectables: Injectable<any, any, any>[] = [
+      commandContainerClusterFrameChildComponentInjectable,
+      cronJobTriggerDialogClusterFrameChildComponentInjectable,
+      deploymentScaleDialogClusterFrameChildComponentInjectable,
+      replicasetScaleDialogClusterFrameChildComponentInjectable,
+      statefulsetScaleDialogClusterFrameChildComponentInjectable,
+      deleteClusterDialogClusterFrameChildComponentInjectable,
+      kubeObjectDetailsClusterFrameChildComponentInjectable,
+      kubeconfigDialogClusterFrameChildComponentInjectable,
+      portForwardDialogClusterFrameChildComponentInjectable,
+    ];
+
+    clusterFrameChildComponentInjectables.forEach((injectable) => {
+      di.override(injectable, () => ({
+        Component: () => null,
+        id: injectable.id,
+        shouldRender: computed(() => false),
+      }));
+    });
+
+    di.override(watchHistoryStateInjectable, () => () => () => {});
     di.override(openAppContextMenuInjectable, () => () => {});
     di.override(goBackInjectable, () => () => {});
     di.override(goForwardInjectable, () => () => {});
@@ -126,13 +162,17 @@ export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {})
     // eslint-disable-next-line unused-imports/no-unused-vars-ts
     di.override(extensionsStoreInjectable, () => ({ isEnabled: ({ id, isBundled }) => false }) as ExtensionsStore);
 
-    di.override(hotbarStoreInjectable, () => ({}));
+    di.override(hotbarStoreInjectable, () => ({
+      getActive: () => ({ name: "some-hotbar", items: [] }),
+      getDisplayIndex: () => "0",
+    }) as unknown as HotbarStore);
 
     di.override(fileSystemProvisionerStoreInjectable, () => ({}) as FileSystemProvisionerStore);
 
     // eslint-disable-next-line unused-imports/no-unused-vars-ts
     di.override(clusterStoreInjectable, () => ({ getById: (id): Cluster => ({}) as Cluster }) as ClusterStore);
 
+    di.override(setupSystemCaInjectable, () => ({ run: () => {} }));
     di.override(setupOnApiErrorListenersInjectable, () => ({ run: () => {} }));
     di.override(provideInitialValuesForSyncBoxesInjectable, () => ({ run: () => {} }));
 
diff --git a/src/renderer/port-forward/port-forward-dialog-cluster-frame-child-component.injectable.ts b/src/renderer/port-forward/port-forward-dialog-cluster-frame-child-component.injectable.ts
new file mode 100644
index 0000000000..01b1ae0f7e
--- /dev/null
+++ b/src/renderer/port-forward/port-forward-dialog-cluster-frame-child-component.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { computed } from "mobx";
+import { PortForwardDialog } from "./port-forward-dialog";
+import { clusterFrameChildComponentInjectionToken } from "../frames/cluster-frame/cluster-frame-child-component-injection-token";
+
+const portForwardDialogClusterFrameChildComponentInjectable = getInjectable({
+  id: "port-forward-dialog-cluster-frame-child-component",
+
+  instantiate: () => ({
+    id: "port-forward-dialog",
+    shouldRender: computed(() => true),
+    Component: PortForwardDialog,
+  }),
+
+  injectionToken: clusterFrameChildComponentInjectionToken,
+
+  causesSideEffects: true,
+});
+
+export default portForwardDialogClusterFrameChildComponentInjectable;
diff --git a/yarn.lock b/yarn.lock
index e999304f0e..77eca7b5a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1211,46 +1211,46 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@ogre-tools/fp@9.0.0", "@ogre-tools/fp@^9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-9.0.0.tgz#926cd4f13b52961156161feeeafddf22a0ad39c0"
-  integrity sha512-kMUgzhdjHuph0UWteOfyXNGBavZJX23NOA5su6fx9NdTzWhl9yB5Uf6Q//nOvL9COftjZDwnAgIaDU4MPdjyqA==
+"@ogre-tools/fp@9.0.1", "@ogre-tools/fp@^9.0.1":
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/@ogre-tools/fp/-/fp-9.0.1.tgz#22c23bd209f6f56bf66a5ff4514930334a3a4782"
+  integrity sha512-7kORUcvR9DZz5/2qDSSKExGeisXzfmOafP+Z6l8C+WQXEmEQm7CmFMyBEyMkei0eNFzNghlKYgRFpsvBdU3KAg==
   dependencies:
     lodash "^4.17.21"
 
-"@ogre-tools/injectable-extension-for-auto-registration@9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-auto-registration/-/injectable-extension-for-auto-registration-9.0.0.tgz#69463737ef4f7777db4703964b8a72a5fb82d6b3"
-  integrity sha512-+3I9Z0GfA04zZoj7Nw5WhJLDFLJgr5xv8Kp1zPDuT9/OvE9EA6hzAqakMDLbvn1zZOJjkJCGk44x6UjSQJp/9w==
+"@ogre-tools/injectable-extension-for-auto-registration@9.0.1":
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-auto-registration/-/injectable-extension-for-auto-registration-9.0.1.tgz#e00dff5bd833068faa58d8fa514b218515c55775"
+  integrity sha512-reyhW2wWPrNnGXo88QKWUsLyhjF195i0/iXfdAoR8/4lRxWmzka58bc8r6jFvTBBJ6eXaGidhUa5DqZe+Oia2Q==
   dependencies:
-    "@ogre-tools/fp" "^9.0.0"
-    "@ogre-tools/injectable" "^9.0.0"
+    "@ogre-tools/fp" "^9.0.1"
+    "@ogre-tools/injectable" "^9.0.1"
     lodash "^4.17.21"
 
-"@ogre-tools/injectable-extension-for-mobx@9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-mobx/-/injectable-extension-for-mobx-9.0.0.tgz#ed14df39b266e521272977821d3e05bcbd647577"
-  integrity sha512-9Hrtr7AdibcD+Fqn2qNsjiOUakAACO55TB1IqNsOJMMuqQHVB5SFZTHBzdVRqqqY2MwQvWYvd4xfy+beItD/xw==
+"@ogre-tools/injectable-extension-for-mobx@9.0.1":
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-extension-for-mobx/-/injectable-extension-for-mobx-9.0.1.tgz#3d9e6e119b7db5a4e4309e89ba6b301635c8da90"
+  integrity sha512-wNHIG73NTGfmRb0b2nNhJD9ek4RcyBp/189KfrXhTt6/5KwMEuOeJjAbh8xwbhpYJnWFcMzWKLTqePozc+Ntww==
   dependencies:
-    "@ogre-tools/fp" "^9.0.0"
-    "@ogre-tools/injectable" "^9.0.0"
+    "@ogre-tools/fp" "^9.0.1"
+    "@ogre-tools/injectable" "^9.0.1"
     lodash "^4.17.21"
 
-"@ogre-tools/injectable-react@9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-9.0.0.tgz#c5c510e893a5c1d7994d8709f70606967cabdec2"
-  integrity sha512-vGQrwkcWibRUWFPbu392riBYY4dXK051FxwyMsDYNRqmvaLo8HuumwjzS1DWS7db/P9Li+Kc+Ms670xIZepcpA==
+"@ogre-tools/injectable-react@9.0.1":
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable-react/-/injectable-react-9.0.1.tgz#d72a155b914873f1a5e35ee167aa14dd7c0e7454"
+  integrity sha512-GjkhhONy4hamw5Mx79ZxhL3Pbgnfnf1mrkixDkqlXFzhdPBHDtCYIZu9Y6NjSRLgEwXTrAPYv9lDqREnRbUwLA==
   dependencies:
-    "@ogre-tools/fp" "^9.0.0"
-    "@ogre-tools/injectable" "^9.0.0"
+    "@ogre-tools/fp" "^9.0.1"
+    "@ogre-tools/injectable" "^9.0.1"
     lodash "^4.17.21"
 
-"@ogre-tools/injectable@9.0.0", "@ogre-tools/injectable@^9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-9.0.0.tgz#0819bc7b5fbae0a467f3250b10b4adb003268067"
-  integrity sha512-z9X86Q9AEkkilLu9V33j/aXv/IUoG944AdfN6WX2zZgJqRNjESN9spoOMqdKqib6JmEjCRxpMvaMwHLQSh14fg==
+"@ogre-tools/injectable@9.0.1", "@ogre-tools/injectable@^9.0.1":
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/@ogre-tools/injectable/-/injectable-9.0.1.tgz#611a2dd8468bfe3610f005178837d76071a44a70"
+  integrity sha512-orcERUOeUEP2oBAcr9rKYbik+r/xJEIb5uedPMMqPzPJnNwZ9JA/1rDEJcx1/I9aHgjUQpeFANjYI4eYDcwEYQ==
   dependencies:
-    "@ogre-tools/fp" "^9.0.0"
+    "@ogre-tools/fp" "^9.0.1"
     lodash "^4.17.21"
 
 "@panva/asn1.js@^1.0.0":