diff --git a/src/renderer/components/+cluster-settings/cluster-settings.scss b/src/renderer/components/+cluster-settings/cluster-settings.scss
index aa7d51c369..f20699de35 100644
--- a/src/renderer/components/+cluster-settings/cluster-settings.scss
+++ b/src/renderer/components/+cluster-settings/cluster-settings.scss
@@ -1,6 +1,7 @@
 .ClusterSettings {
   .WizardLayout {
     grid-template-columns: unset;
+    grid-template-rows: 76px 1fr;
     padding: 0;
 
     .head-col {
@@ -9,15 +10,6 @@
       :nth-child(2) {
         flex: 1 0 0;
       }
-
-      a {
-        text-decoration: none;
-        color: $grey-600;
-      }
-    }
-
-    .info-col {
-      display: none;
     }
 
     .content-col {
@@ -29,25 +21,18 @@
         text-transform: none;
       }
 
-      .settings-wrapper {
-        margin: 0 auto;
-        width: 60%;
-        min-width: 570px;
-        max-width: 1000px;
+      > div {
+        margin-top: $margin * 5;
+      }
 
-        > div {
-          margin-top: $margin * 5;
-        }
+      .admin-note {
+        font-size: small;
+        opacity: 0.5;
+        margin-left: $margin;
+      }
 
-        .admin-note {
-          font-size: small;
-          opacity: 0.5;
-          margin-left: $margin;
-        }
-
-        .button-area {
-          margin-top: $margin * 2;
-        }
+      .button-area {
+        margin-top: $margin * 2;
       }
 
       .file-loader {
diff --git a/src/renderer/components/+cluster-settings/cluster-settings.tsx b/src/renderer/components/+cluster-settings/cluster-settings.tsx
index d0a6385ac5..28726de561 100644
--- a/src/renderer/components/+cluster-settings/cluster-settings.tsx
+++ b/src/renderer/components/+cluster-settings/cluster-settings.tsx
@@ -1,7 +1,6 @@
 import "./cluster-settings.scss";
 
 import React from "react";
-import { Link } from "react-router-dom";
 import { observer } from "mobx-react";
 import { Features } from "./features";
 import { Removal } from "./removal";
@@ -11,6 +10,7 @@ import { WizardLayout } from "../layout/wizard-layout";
 import { ClusterIcon } from "../cluster-icon";
 import { Icon } from "../icon";
 import { getMatchedCluster } from "../cluster-manager/cluster-view.route";
+import { navigate } from "../../navigation";
 
 @observer
 export class ClusterSettings extends React.Component {
@@ -25,20 +25,16 @@ export class ClusterSettings extends React.Component {
           showTooltip={false}
         />
         <h2>{cluster.preferences.clusterName}</h2>
-        <Link to="/">
-          <Icon material="close" big/>
-        </Link>
+        <Icon material="close" onClick={() => navigate("/")} big/>
       </>
     );
     return (
       <div className="ClusterSettings">
-        <WizardLayout header={header}>
-          <div className="settings-wrapper">
-            <Status cluster={cluster}></Status>
-            <General cluster={cluster}></General>
-            <Features cluster={cluster}></Features>
-            <Removal cluster={cluster}></Removal>
-          </div>
+        <WizardLayout header={header} centered>
+          <Status cluster={cluster}></Status>
+          <General cluster={cluster}></General>
+          <Features cluster={cluster}></Features>
+          <Removal cluster={cluster}></Removal>
         </WizardLayout>
       </div>
     );