diff --git a/src/common/user-store.ts b/src/common/user-store.ts
index c52469363b..7e09d8e0bd 100644
--- a/src/common/user-store.ts
+++ b/src/common/user-store.ts
@@ -5,6 +5,8 @@ import migrations from "../migrations/user-store"
 import { getAppVersion } from "./utils/app-version";
 import { tracker } from "./tracker";
 
+// fixme: detect new contexts from .kube/config since last open
+
 export interface UserStoreModel {
   lastSeenAppVersion: string;
   seenContexts: string[];
@@ -34,7 +36,7 @@ export class UserStore extends BaseStore<UserStoreModel> {
 
   @observable lastSeenAppVersion = "0.0.0"
   @observable seenContexts: string[] = [];
-  @observable newContexts: string[] = []; // todo: detect new contexts from .kube/config since last open
+  @observable newContexts: string[] = [];
 
   @observable preferences: UserPreferences = {
     allowTelemetry: true,
diff --git a/src/renderer/components/+add-cluster/add-cluster.scss b/src/renderer/components/+add-cluster/add-cluster.scss
index 7cfcd19ea9..0458997e8a 100644
--- a/src/renderer/components/+add-cluster/add-cluster.scss
+++ b/src/renderer/components/+add-cluster/add-cluster.scss
@@ -18,9 +18,9 @@
     @include hidden-scrollbar;
     padding: var(--flex-gap);
     border-left: 1px solid #353a3e;
+  }
 
-    a {
-      color: $colorInfo;
-    }
+  a {
+    color: $colorInfo;
   }
 }
\ No newline at end of file
diff --git a/src/renderer/components/+add-cluster/add-cluster.tsx b/src/renderer/components/+add-cluster/add-cluster.tsx
index 924b8a84db..1c9cb557f6 100644
--- a/src/renderer/components/+add-cluster/add-cluster.tsx
+++ b/src/renderer/components/+add-cluster/add-cluster.tsx
@@ -15,7 +15,7 @@ export class AddCluster extends React.Component {
   readonly customContext = "custom"
   readonly kubeConfigFile = path.join(process.env.HOME, '.kube', 'config');
 
-  @observable useProxySettings = false
+  @observable showSettings = false
   @observable clusterContext = ""
   @observable error = ""
   @observable proxyServerUrl = ""
@@ -47,12 +47,12 @@ export class AddCluster extends React.Component {
             options={this.clusterOptions}
             onChange={({ value }: SelectOption) => this.clusterContext = value}
           />
-          <div className="use-proxy">
-            <a onClick={() => this.useProxySettings = !this.useProxySettings}>
+          <div className="cluster-settings">
+            <a href="#" onClick={() => this.showSettings = !this.showSettings}>
               <Trans>Proxy settings</Trans>
             </a>
           </div>
-          {this.useProxySettings && (
+          {this.showSettings && (
             <div className="proxy-settings">
               <Input
                 autoFocus
diff --git a/src/renderer/components/app.scss b/src/renderer/components/app.scss
index c2f6fa59b7..e8340f2853 100755
--- a/src/renderer/components/app.scss
+++ b/src/renderer/components/app.scss
@@ -2,8 +2,6 @@
 @import "fonts";
 
 *, *:before, *:after {
-  @include set-draggable(false);
-
   box-sizing: border-box;
   padding: 0;
   margin: 0;
@@ -31,8 +29,8 @@ html {
 }
 
 html, body {
+  @include set-draggable(false);
   height: 100%;
-  overflow: hidden;
 }
 
 #app {
diff --git a/src/renderer/components/cluster-manager/clusters-menu.tsx b/src/renderer/components/cluster-manager/clusters-menu.tsx
index 5df05cd08a..f64500210f 100644
--- a/src/renderer/components/cluster-manager/clusters-menu.tsx
+++ b/src/renderer/components/cluster-manager/clusters-menu.tsx
@@ -20,6 +20,7 @@ import { landingURL } from "../+landing-page";
 import { Tooltip, TooltipContent } from "../tooltip";
 
 // fixme: allow to rearrange clusters with drag&drop
+// fixme: disconnect cluster from context-menu
 
 interface Props {
   className?: IClassName;
@@ -50,7 +51,6 @@ export class ClustersMenu extends React.Component<Props> {
       click: () => navigate(clusterSettingsURL())
     }));
 
-    // fixme: disconnect cluster
     if (cluster.initialized) {
       menu.append(new MenuItem({
         label: _i18n._(t`Disconnect`),