diff --git a/extensions/support-page/renderer.tsx b/extensions/support-page/renderer.tsx
index 87142c79da..b76ef0601c 100644
--- a/extensions/support-page/renderer.tsx
+++ b/extensions/support-page/renderer.tsx
@@ -19,10 +19,10 @@ export default class SupportPageRendererExtension extends LensRendererExtension
     {
       item: (
         <div
-          className="flex align-center gaps hover-highlight"
+          className="SupportPageIcon flex align-center"
           onClick={() => Navigation.navigate(supportPageURL())}
         >
-          <Component.Icon material="help" smallest />
+          <Component.Icon interactive material="help" smallest />
         </div>
       )
     }
diff --git a/extensions/support-page/src/support.scss b/extensions/support-page/src/support.scss
index efc14f2827..1876061fdd 100644
--- a/extensions/support-page/src/support.scss
+++ b/extensions/support-page/src/support.scss
@@ -10,4 +10,10 @@
       margin-left: 2px;
     }
   }
+}
+
+.SupportPageIcon {
+  color: white;
+  font-size: var(--font-size-small);
+  padding-right: calc(var(--padding) / 2);
 }
\ No newline at end of file
diff --git a/src/renderer/components/cluster-manager/bottom-bar.scss b/src/renderer/components/cluster-manager/bottom-bar.scss
index 833e7b9bfc..0a73bbacbb 100644
--- a/src/renderer/components/cluster-manager/bottom-bar.scss
+++ b/src/renderer/components/cluster-manager/bottom-bar.scss
@@ -2,27 +2,19 @@
   $spacing: $padding / 2;
   --flex-gap: #{$spacing};
 
-  font-size: $font-size-small;
-  background-color: #3d90ce;
+  background-color: var(--blue);
   padding: 0 2px;
-  color: white;
   height: 22px;
 
   #current-workspace {
+    font-size: var(--font-size-small);
+    color: white;
     padding: $padding / 4 $padding / 2;
     cursor: pointer;
-  }
 
-  .hover-highlight {
     &:hover {
       background-color: #ffffff33;
       cursor: pointer;
     }
   }
-
-  .extensions {
-    > * {
-      padding: $padding / 4 $padding / 2;
-    }
-  }
 }
diff --git a/src/renderer/components/cluster-manager/bottom-bar.tsx b/src/renderer/components/cluster-manager/bottom-bar.tsx
index fe7876f397..7302469a2a 100644
--- a/src/renderer/components/cluster-manager/bottom-bar.tsx
+++ b/src/renderer/components/cluster-manager/bottom-bar.tsx
@@ -13,7 +13,7 @@ export class BottomBar extends React.Component {
     const { currentWorkspace } = workspaceStore;
     return (
       <div className="BottomBar flex gaps">
-        <div id="current-workspace" className="flex gaps align-center hover-highlight">
+        <div id="current-workspace" className="flex gaps align-center">
           <Icon smallest material="layers"/>
           <span className="workspace-name">{currentWorkspace.name}</span>
         </div>
diff --git a/src/renderer/components/cluster-manager/cluster-manager.scss b/src/renderer/components/cluster-manager/cluster-manager.scss
index d0f147ad4e..f1a1f75ed8 100644
--- a/src/renderer/components/cluster-manager/cluster-manager.scss
+++ b/src/renderer/components/cluster-manager/cluster-manager.scss
@@ -9,20 +9,6 @@
     grid-area: main;
     position: relative;
     display: flex;
-
-    > * {
-      position: absolute;
-      left: 0;
-      top: 0;
-      right: 0;
-      bottom: 0;
-      display: flex;
-      background-color: $mainBackground;
-
-      > * {
-        flex: 1;
-      }
-    }
   }
 
   .ClustersMenu {
@@ -32,4 +18,18 @@
   .BottomBar {
     grid-area: bottom-bar;
   }
+
+  #lens-views {
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    display: flex;
+    background-color: $mainBackground;
+
+    iframe {
+      flex: 1;
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/renderer/components/cluster-manager/cluster-view.scss b/src/renderer/components/cluster-manager/cluster-view.scss
index eb971eaa19..e1b884370f 100644
--- a/src/renderer/components/cluster-manager/cluster-view.scss
+++ b/src/renderer/components/cluster-manager/cluster-view.scss
@@ -1,4 +1,6 @@
 .ClusterView {
+  flex: 1;
+
   &:empty {
     display: none;
   }
diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx
index be3a955558..613f8ab708 100644
--- a/src/renderer/components/cluster-manager/cluster-view.tsx
+++ b/src/renderer/components/cluster-manager/cluster-view.tsx
@@ -34,7 +34,7 @@ export class ClusterView extends React.Component<Props> {
     const { cluster } = this;
     const showStatus = cluster && (!cluster.available || !hasLoadedView(cluster.id) || !cluster.ready)
     return (
-      <div className="ClusterView">
+      <div className="ClusterView flex align-center">
         {showStatus && (
           <ClusterStatus key={cluster.id} clusterId={cluster.id} className="box center"/>
         )}
diff --git a/src/renderer/components/layout/page-layout.scss b/src/renderer/components/layout/page-layout.scss
index 0ae6f54139..b0540b9a15 100644
--- a/src/renderer/components/layout/page-layout.scss
+++ b/src/renderer/components/layout/page-layout.scss
@@ -5,6 +5,7 @@
   --min-width: 570px;
 
   position: relative;
+  width: 100%;
   height: 100%;
   display: grid !important;
   grid-template-rows: min-content 1fr;
@@ -13,6 +14,11 @@
   &.top {
     position: fixed !important; // allow to cover ClustersMenu
     z-index: 1;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    background-color: $mainBackground;
 
     // adds extra space for traffic-light top buttons (mac only)
     .is-mac & > .header {