1 files changed, 74 insertions, 11 deletions

diff --git a/ui/app/pages/settings/index.scss b/ui/app/pages/settings/index.scss
index 0e8482c63..52208dc85 100644
--- a/ui/app/pages/settings/index.scss
+++ b/ui/app/pages/settings/index.scss
@@ -9,34 +9,79 @@
   flex-flow: column nowrap;
 
   &__header {
-    padding: 25px 25px 0;
+    display: flex;
+    flex-flow: row nowrap;
+    padding: 12px 24px;
+    align-items: center;
+    border-bottom: 1px solid $alto;
+    flex: 0 0 auto;
+
+    &__title {
+      flex: 1 0 auto;
+      font-size: 24px;
+    }
+  }
+
+  &__back-button {
+    display: none;
+
+    @media screen and (max-width: 575px) {
+      display: block;
+      background-image: url('/images/caret-left-black.svg');
+      width: 18px;
+      height: 18px;
+      opacity: .5;
+      background-size: contain;
+      background-repeat: no-repeat;
+      background-position: center;
+      margin-right: 16px;
+      cursor: pointer;
+    }
   }
 
   &__close-button::after {
     content: '\00D7';
     font-size: 40px;
     color: $dusty-gray;
-    position: absolute;
-    top: 25px;
-    right: 30px;
     cursor: pointer;
   }
 
   &__content {
-    padding: 25px;
+    display: flex;
+    flex-flow: row nowrap;
     height: auto;
     overflow: auto;
+
+    &__tabs {
+      display: flex;
+      flex-direction: column;
+      flex: 1 1 auto;
+
+      @media screen and (min-width: 576px) {
+        flex: 0 0 32%;
+        max-width: 210px;
+        border-right: 1px solid $alto;
+      }
+    }
+
+    &__modules {
+      overflow-y: auto;
+      flex: 1 1 auto;
+
+      @media screen and (max-width: 575px) {
+        display: none;
+      }
+    }
+  }
+
+  &__body {
+    padding: 12px 24px;
   }
 
   &__content-row {
     display: flex;
-    flex-direction: row;
+    flex-direction: column;
     padding: 10px 0 20px;
-
-    @media screen and (max-width: 575px) {
-      flex-direction: column;
-      padding: 10px 0;
-    }
   }
 
   &__content-item {
@@ -77,4 +122,22 @@
       width: 100%;
     }
   }
+
+  &--selected {
+    .settings-page {
+      &__content {
+        &__tabs {
+          @media screen and (max-width: 575px) {
+            display: none;
+          }
+        }
+
+        &__modules {
+          @media screen and (max-width: 575px) {
+            display: block;
+          }
+        }
+      }
+    }
+  }
 }