diff --git a/packages/builder/src/budibase.css b/packages/builder/src/budibase.css
index f433b016da..0d74ed7221 100644
--- a/packages/builder/src/budibase.css
+++ b/packages/builder/src/budibase.css
@@ -57,23 +57,23 @@
 
 .budibase__nav-item {
     cursor: pointer;
-    padding: 0 7px 0 3px;
+    padding: 0 4px 0 2px;
     height: 35px;
-    margin: 5px 20px 5px 0px;
+    margin: 5px 0px 4px 0px;
     border-radius: 0 5px 5px 0;
     display: flex;
     align-items: center;
-    font-weight: 500;
-    font-size: 13px;
+    font-size: 14px;
+    transition: 0.2s;
 }
 
 .budibase__nav-item.selected {
-    color: var(--button-text);
-    background: #f1f4fc;
+    color: var(--ink);
+    background: var(--blue-light);
 }
 
 .budibase__nav-item:hover {
-    background: #fafafa;
+    background: var(--grey-light);
 }
 
 .budibase__input {
diff --git a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
index 726fb35aae..afce0576e1 100644
--- a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
+++ b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
@@ -105,6 +105,7 @@
     display: flex;
     flex-direction: column;
     overflow-x: hidden;
+    padding: 20px;
   }
 
   .title > div:nth-child(1) {
diff --git a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
index 26929fcdce..bb6d369956 100644
--- a/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
+++ b/packages/builder/src/components/userInterface/ComponentsHierarchy.svelte
@@ -1,7 +1,6 @@
 <script>
   import { params, goto } from "@sveltech/routify"
   import ComponentsHierarchyChildren from "./ComponentsHierarchyChildren.svelte"
-
   import { last, sortBy, map, trimCharsStart, trimChars, join } from "lodash/fp"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { pipe } from "components/common/core"
@@ -62,9 +61,7 @@
         {/if}
       </span>
 
-      <span class="icon">
-        <ShapeIcon />
-      </span>
+      <i class="ri-artboard-2-fill icon"></i>
 
       <span class="title">{screen.title}</span>
     </div>
@@ -92,21 +89,23 @@
 <style>
   .root {
     font-weight: 400;
-    color: #000333;
+    color: var(--ink);
   }
 
   .title {
     margin-left: 10px;
     margin-top: 2px;
-    font-size: 13px;
+    font-size: 14px;
+    font-weight: 500;
   }
 
   .icon {
     display: inline-block;
     transition: 0.2s;
+    font-size: 24px;
     width: 20px;
     margin-top: 2px;
-    color: #333;
+    color: var(--ink-light);
   }
 
   .icon:nth-of-type(2) {
diff --git a/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
new file mode 100644
index 0000000000..de523cd7bf
--- /dev/null
+++ b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
@@ -0,0 +1,81 @@
+<script>
+  import { store } from "builderStore/"
+  import ComponentPropertiesPanel from "./ComponentPropertiesPanel.svelte"
+  import ComponentSelectionList from "./ComponentSelectionList.svelte"
+
+  const PROPERTIES_TAB = "properties"
+  const COMPONENT_SELECTION_TAB = "components"
+
+  let selected = PROPERTIES_TAB
+
+  const isSelected = tab => selected === tab
+
+  const selectTab = tab => (selected = tab)
+
+  const toggleTab = () =>
+    (selected =
+      selected === PROPERTIES_TAB ? COMPONENT_SELECTION_TAB : PROPERTIES_TAB)
+</script>
+
+<div class="root">
+  {#if $store.currentFrontEndType === 'page' || $store.screens.length}
+    <div class="switcher">
+
+      <button
+        class:selected={selected === COMPONENT_SELECTION_TAB}
+        on:click={() => selectTab(COMPONENT_SELECTION_TAB)}>
+        Add
+      </button>
+
+      <button
+        class:selected={selected === PROPERTIES_TAB}
+        on:click={() => selectTab(PROPERTIES_TAB)}>
+        Edit
+      </button>
+
+    </div>
+
+    <div class="panel">
+      {#if selected === PROPERTIES_TAB}
+        <ComponentPropertiesPanel {toggleTab} />
+      {/if}
+
+      {#if selected === COMPONENT_SELECTION_TAB}
+        <ComponentSelectionList {toggleTab} />
+      {/if}
+
+    </div>
+  {/if}
+
+</div>
+
+<style>
+  .root {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    padding: 20px 20px;
+    border-left: solid 1px var(--grey);
+  }
+
+  .switcher {
+    display: flex;
+    margin: 0px 20px 20px 0px;
+  }
+
+  .switcher > button {
+    display: inline-block;
+    border: none;
+    margin: 0;
+    padding: 0;
+    cursor: pointer;
+    font-size: 18px;
+    font-weight: 700;
+    color: var(--ink-lighter);
+    margin-right: 20px;
+  }
+
+  .switcher > .selected {
+    color: var(--ink);
+  }
+</style>
diff --git a/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte b/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte
index 8b4b8e1843..565301213d 100644
--- a/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte
+++ b/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte
@@ -3,7 +3,6 @@
   import ComponentsHierarchy from "components/userInterface/ComponentsHierarchy.svelte"
   import PageLayout from "components/userInterface/PageLayout.svelte"
   import PagesList from "components/userInterface/PagesList.svelte"
-  import { AddIcon } from "components/common/Icons"
   import NewScreen from "components/userInterface/NewScreen.svelte"
   
   const newScreen = () => {
@@ -13,64 +12,44 @@
   let newScreenPicker
 </script>
 
-<div class="pages-list-container">
-  <div class="nav-header">
-    <span class="navigator-title">Navigate</span>
-    <span class="components-nav-page">Pages</span>
-  </div>
+<PagesList />
 
-  <div class="nav-items-container">
-    <PagesList />
-  </div>
-</div>
-
-<div class="border-line" />
+<button 
+  class="newscreen"
+  on:click={newScreen}>
+  Create New Screen
+</button>
 
 <PageLayout layout={$store.pages[$store.currentPageName]} />
 
-<div class="border-line" />
 
-<div class="components-list-container">
-  <div class="nav-group-header">
-    <span class="components-nav-header" style="margin-top: 0;">
-      Screens
-    </span>
-    <div>
-      <button on:click={newScreen}>
-        <AddIcon />
-      </button>
-    </div>
-  </div>
-  <div class="nav-items-container">
-    <ComponentsHierarchy screens={$store.screens} />
-  </div>
+<div class="nav-items-container">
+  <ComponentsHierarchy screens={$store.screens} />
 </div>
 
 <NewScreen bind:this={newScreenPicker} />
 
 <style>
 
-button {
+.newscreen {
   cursor: pointer;
-  outline: none;
-  border: none;
-  border-radius: 5px;
-  width: 20px;
-  padding-bottom: 10px;
+  border: 1px solid var(--grey-dark);
+  border-radius: 3px;
+  width: 100%;
+  padding: 8px 16px;
+  margin: 12px 0px;
   display: flex;
   justify-content: center;
   align-items: center;
-  padding: 0;
+  background: white;
+  color: var(--ink);
+  font-size: 14px;
+  font-weight: 500;
+  transition: all 2ms;
 }
 
-.components-nav-page {
-  font-size: 13px;
-  color: var(--ink);
-  padding-left: 20px;
-  margin-top: 20px;
-  font-weight: 600;
-  opacity: 0.4;
-  letter-spacing: 1px;
+.newscreen:hover {
+  background: var(--grey-light);
 }
 
 .components-nav-header {
@@ -82,19 +61,9 @@ button {
   letter-spacing: 1px;
 }
 
-.nav-header {
-  display: flex;
-  flex-direction: column;
-  margin-top: 20px;
-}
-
-.nav-items-container {
-  padding: 1rem 0rem 0rem 0rem;
-}
 
 .nav-group-header {
   display: flex;
-  padding: 0px 20px 0px 20px;
   font-size: 0.9rem;
   font-weight: bold;
   justify-content: space-between;
@@ -108,13 +77,6 @@ button {
   margin-top: auto;
 }
 
-  .navigator-title {
-  font-size: 18px;
-  color: var(--ink);
-  font-weight: bold;
-  padding: 0 20px 20px 20px;
-}
-
 .border-line {
   border-bottom: 1px solid #d8d8d8;
 }
diff --git a/packages/builder/src/components/userInterface/ItemTab/Item.svelte b/packages/builder/src/components/userInterface/ItemTab/Item.svelte
index d4576055c6..871501a20c 100644
--- a/packages/builder/src/components/userInterface/ItemTab/Item.svelte
+++ b/packages/builder/src/components/userInterface/ItemTab/Item.svelte
@@ -3,7 +3,7 @@
   export let item
 </script>
 
-<div class="item-item" transition:fly={{ y: 100, duration: 1000 }} on:click>
+<div class="item-item" in:fly={{ y: 100, duration: 1000 }} on:click>
   <div class="item-icon">
     <i class={item.icon} />
   </div>
diff --git a/packages/builder/src/components/userInterface/PageLayout.svelte b/packages/builder/src/components/userInterface/PageLayout.svelte
index 2a532f9624..f35a080a65 100644
--- a/packages/builder/src/components/userInterface/PageLayout.svelte
+++ b/packages/builder/src/components/userInterface/PageLayout.svelte
@@ -46,7 +46,6 @@
 </script>
 
 <div class="pagelayoutSection">
-  <div class="components-nav-page">Page Layout</div>
   <div
     class="budibase__nav-item root"
     class:selected={$store.currentComponentInfo._id === _layout.component.props._id}
@@ -56,12 +55,8 @@
       class:rotate={$store.currentPreviewItem.name !== _layout.title}>
       <ArrowDownIcon />
     </span>
-
-    <span class="icon">
-      <GridIcon />
-    </span>
-
-    <span class="title">Page Layout</span>
+  <i class="ri-layout-3-fill icon-big"></i>
+  <span class="title">Master Screen</span>
   </div>
 
   {#if $store.currentPreviewItem.name === _layout.title && _layout.component.props._children}
@@ -84,36 +79,29 @@
   onOk={() => store.deleteComponent(componentToDelete)} />
 
 <style>
-  .components-nav-page {
-    font-size: 13px;
-    color: #000333;
-    text-transform: uppercase;
-    margin-bottom: 10px;
-    padding-left: 20px;
-    font-weight: 600;
-    opacity: 0.4;
-    letter-spacing: 1px;
-  }
 
   .pagelayoutSection {
-    margin: 20px 0px 20px 0px;
+    margin: 20px 0px 0px 0px;
   }
+
   .title {
     margin-left: 10px;
-    font-size: 13px;
+    font-size: 14px;
+    font-weight: 500;
+    color: var(--ink);
   }
 
   .icon {
+    width: 24px;
     display: inline-block;
     transition: 0.2s;
     width: 20px;
-    margin-top: 2px;
-    color: #000333;
+    color: var(--ink-light);
   }
 
-  .icon:nth-of-type(2) {
-    width: 14px;
-    margin: 0 0 0 5px;
+  .icon-big {
+    font-size: 24px;
+    color: var(--ink-light);
   }
 
   :global(svg) {
diff --git a/packages/builder/src/components/userInterface/PagesList.svelte b/packages/builder/src/components/userInterface/PagesList.svelte
index 823f922bb6..1c37337a45 100644
--- a/packages/builder/src/components/userInterface/PagesList.svelte
+++ b/packages/builder/src/components/userInterface/PagesList.svelte
@@ -1,8 +1,6 @@
 <script>
   import { params, goto } from "@sveltech/routify"
   import { store } from "builderStore"
-  import getIcon from "components/common/icon"
-  import { CheckIcon } from "components/common/Icons"
 
   const getPage = (s, name) => {
     const props = s.pages[name]
@@ -30,63 +28,40 @@
 </script>
 
 <div class="root">
-  <ul>
     {#each pages as { title, id }}
-      <li>
-        <span class="icon">
-          {#if id === $params.page}
-            <CheckIcon />
-          {/if}
-        </span>
-
         <button
           class:active={id === $params.page}
           on:click={() => changePage(id)}>
           {title}
         </button>
-      </li>
     {/each}
-  </ul>
 </div>
 
 <style>
   .root {
-    padding-bottom: 10px;
-    font-size: 0.9rem;
-    color: #000333;
-    font-weight: bold;
-    position: relative;
-    padding-left: 1.8rem;
-  }
-
-  ul {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-  }
-
-  li {
-    margin: 0.5rem 0;
+    display: flex;
+    flex-direction: row;
   }
 
   button {
-    margin: 0 0 0 6px;
-    padding: 0;
-    border: none;
-    font-family: Roboto;
-    font-size: 13px;
-    outline: none;
     cursor: pointer;
-    background: rgba(0, 0, 0, 0);
+    padding: 8px 16px;
+    text-align: center;
+    background: #ffffff;
+    color: var(--ink-light);
+    border-radius: 5px;
+    font-family: Roboto;
+    font-size: 14px;
+    font-weight: 400;
+    transition: all 0.3s;
+    text-rendering: optimizeLegibility;
+    border: none !important;
+    transition: 0.2s;
   }
 
   .active {
-    font-weight: 500;
+    background: var(--ink-light);
+    color: var(--white);
   }
 
-  .icon {
-    display: inline-block;
-    width: 14px;
-    color: #000333;
-  }
 </style>
diff --git a/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte b/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte
index 8b600047d8..3fe67e6482 100644
--- a/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte
+++ b/packages/builder/src/components/userInterface/UserInterfaceRoot.svelte
@@ -120,7 +120,6 @@
     background-color: var(--white);
     height: calc(100vh - 49px);
     padding: 0;
-    overflow: scroll;
     display: flex;
     flex-direction: column;
   }
@@ -215,10 +214,6 @@
     letter-spacing: 1px;
   }
 
-  .border-line {
-    border-bottom: 1px solid #d8d8d8;
-  }
-
   .components-list-container {
     padding: 20px 0px 0 0;
   }
diff --git a/packages/builder/src/pages/[application]/frontend/_layout.svelte b/packages/builder/src/pages/[application]/frontend/_layout.svelte
index 536da887d6..1dfdb82168 100644
--- a/packages/builder/src/pages/[application]/frontend/_layout.svelte
+++ b/packages/builder/src/pages/[application]/frontend/_layout.svelte
@@ -100,7 +100,6 @@
     background-color: var(--white);
     height: calc(100vh - 49px);
     padding: 0;
-    overflow: scroll;
     display: flex;
     flex-direction: column;
   }
@@ -117,8 +116,6 @@
     background-color: var(--white);
   }
 
-  
-
   .nav-group-header > div:nth-child(1) {
     padding: 0rem 0.5rem 0rem 0rem;
     vertical-align: bottom;
@@ -126,8 +123,6 @@
     margin-right: 5px;
   }
 
-
-
   .nav-group-header > div:nth-child(3) {
     vertical-align: bottom;
     grid-column-start: button;
diff --git a/packages/builder/src/pages/_layout.svelte b/packages/builder/src/pages/_layout.svelte
index 363efcf619..001561cae9 100644
--- a/packages/builder/src/pages/_layout.svelte
+++ b/packages/builder/src/pages/_layout.svelte
@@ -119,22 +119,12 @@
 <style>
   .root {
     display: grid;
-    grid-template-columns: 275px 1fr;
+    grid-template-columns: 300px 1fr;
     height: 100%;
     width: 100%;
     background: var(--grey-light);
   }
 
-  @media only screen and (min-width: 1800px) {
-    .root {
-      display: grid;
-      grid-template-columns: 300px 1fr;
-      height: 100%;
-      width: 100%;
-      background: var(--grey-light);
-    }
-  }
-
   .main {
     grid-column: 2;
   }