diff --git a/packages/builder/src/components/common/Switcher.svelte b/packages/builder/src/components/common/Switcher.svelte
new file mode 100644
index 0000000000..cf23e39507
--- /dev/null
+++ b/packages/builder/src/components/common/Switcher.svelte
@@ -0,0 +1,74 @@
+<script>
+  export let tabs = []
+  export const selectTab = tabName => {
+    selected = tabName
+    selectedIndex = tabs.indexOf(selected)
+  }
+
+  let selected = tabs.length > 0 && tabs[0]
+  let selectedIndex = 0
+
+  const isSelected = tab => selected === tab
+
+  
+
+</script>
+
+<div class="root">
+
+  <div class="switcher">
+
+    {#each tabs as tab}
+      <button
+        class:selected={selected === tab}
+        on:click={() => selectTab(tab)}>
+        {tab}
+      </button>
+    {/each}
+
+  </div>
+
+  <div class="panel">
+    {#if selectedIndex === 0}
+      <slot name="0"></slot>
+    {:else if selectedIndex === 1}
+      <slot name="1"></slot>
+    {:else if selectedIndex === 2}
+      <slot name="2"></slot>
+    {:else if selectedIndex === 3}
+      <slot name="3"></slot>
+    {/if}
+  </div>
+
+</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/ComponentSelectionList.svelte b/packages/builder/src/components/userInterface/ComponentSelectionList.svelte
index 0bf848e4a8..2a46e5d6f6 100644
--- a/packages/builder/src/components/userInterface/ComponentSelectionList.svelte
+++ b/packages/builder/src/components/userInterface/ComponentSelectionList.svelte
@@ -32,7 +32,7 @@
 
   const onComponentChosen = component => {
     store.addChildComponent(component._component)
-    toggleTab()
+    toggleTab("Navigate")
   }
 </script>
 
diff --git a/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
deleted file mode 100644
index de523cd7bf..0000000000
--- a/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
+++ /dev/null
@@ -1,81 +0,0 @@
-<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
new file mode 100644
index 0000000000..8b4b8e1843
--- /dev/null
+++ b/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte
@@ -0,0 +1,126 @@
+<script>
+  import { store, backendUiStore } from "builderStore"
+  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 = () => {
+    newScreenPicker.show()
+  }
+
+  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>
+
+  <div class="nav-items-container">
+    <PagesList />
+  </div>
+</div>
+
+<div class="border-line" />
+
+<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>
+
+<NewScreen bind:this={newScreenPicker} />
+
+<style>
+
+button {
+  cursor: pointer;
+  outline: none;
+  border: none;
+  border-radius: 5px;
+  width: 20px;
+  padding-bottom: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 0;
+}
+
+.components-nav-page {
+  font-size: 13px;
+  color: var(--ink);
+  padding-left: 20px;
+  margin-top: 20px;
+  font-weight: 600;
+  opacity: 0.4;
+  letter-spacing: 1px;
+}
+
+.components-nav-header {
+  font-size: 13px;
+  color: var(--ink);
+  margin-top: 20px;
+  font-weight: 600;
+  opacity: 0.4;
+  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;
+  align-items: center;
+}
+
+.nav-group-header > span:nth-child(3) {
+  margin-left: 5px;
+  vertical-align: bottom;
+  grid-column-start: title;
+  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;
+}
+
+.components-list-container {
+  padding: 20px 0px 0 0;
+}
+
+</style>
\ No newline at end of file
diff --git a/packages/builder/src/components/userInterface/ItemTab/Tab.svelte b/packages/builder/src/components/userInterface/ItemTab/Tab.svelte
index 80f1733cc1..f811a56670 100644
--- a/packages/builder/src/components/userInterface/ItemTab/Tab.svelte
+++ b/packages/builder/src/components/userInterface/ItemTab/Tab.svelte
@@ -3,7 +3,6 @@
   const dispatch = createEventDispatcher()
 
   import Item from "./Item.svelte"
-  import { store } from "builderStore"
   export let list
 
   let category = list
diff --git a/packages/builder/src/pages/[application]/frontend/_layout.svelte b/packages/builder/src/pages/[application]/frontend/_layout.svelte
index c480a75bfa..deea52ce3e 100644
--- a/packages/builder/src/pages/[application]/frontend/_layout.svelte
+++ b/packages/builder/src/pages/[application]/frontend/_layout.svelte
@@ -2,18 +2,17 @@
   import { store, backendUiStore } from "builderStore"
   import { goto } from "@sveltech/routify"
   import { onMount } from "svelte"
-  import ComponentsHierarchy from "components/userInterface/ComponentsHierarchy.svelte"
   import ComponentsHierarchyChildren from "components/userInterface/ComponentsHierarchyChildren.svelte"
-  import PageLayout from "components/userInterface/PageLayout.svelte"
-  import PagesList from "components/userInterface/PagesList.svelte"
   import IconButton from "components/common/IconButton.svelte"
-  import NewScreen from "components/userInterface/NewScreen.svelte"
   import CurrentItemPreview from "components/userInterface/AppPreview"
   import PageView from "components/userInterface/PageView.svelte"
-  import ComponentsPaneSwitcher from "components/userInterface/ComponentsPaneSwitcher.svelte"
+  import ComponentPropertiesPanel from "components/userInterface/ComponentPropertiesPanel.svelte"
+  import ComponentSelectionList from "components/userInterface/ComponentSelectionList.svelte"
+  import Switcher from "components/common/Switcher.svelte"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { last } from "lodash/fp"
   import { AddIcon } from "components/common/Icons"
+  import FrontendNavigatePane from "components/userInterface/FrontendNavigatePane.svelte"
 
   $: instances = $store.appInstances
 
@@ -27,13 +26,10 @@
     }
   })
 
-  let newScreenPicker
+  
   let confirmDeleteDialog
   let componentToDelete = ""
 
-  const newScreen = () => {
-    newScreenPicker.show()
-  }
 
   let settingsView
   const settings = () => {
@@ -45,6 +41,8 @@
     confirmDeleteDialog.show()
   }
 
+  let leftNavSwitcher
+
   const lastPartOfName = c => (c ? last(c.split("/")) : "")
 </script>
 
@@ -52,54 +50,32 @@
 
   <div class="ui-nav">
 
-    <div class="pages-list-container">
-      <div class="nav-header">
-        <span class="navigator-title">Navigate</span>
-        <span class="components-nav-page">Pages</span>
+    <Switcher bind:this={leftNavSwitcher} tabs={["Navigate", "Add"]}>
+      <div slot="0">
+        <FrontendNavigatePane />
       </div>
-
-      <div class="nav-items-container">
-        <PagesList />
-      </div>
-    </div>
-
-    <div class="border-line" />
-
-    <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>
+      <div slot="1">
+        <ComponentSelectionList toggleTab={leftNavSwitcher.selectTab} />      </div>
+    </Switcher>
+    
 
   </div>
 
   <div class="preview-pane">
+    {#if $store.currentPageName && $store.currentPageName.length > 0}
     <CurrentItemPreview />
+    {/if}
   </div>
 
   {#if $store.currentFrontEndType === 'screen' || $store.currentFrontEndType === 'page'}
     <div class="components-pane">
-      <ComponentsPaneSwitcher />
+      <ComponentPropertiesPanel />
     </div>
   {/if}
 
 </div>
 
-<NewScreen bind:this={newScreenPicker} />
+
 
 <ConfirmDialog
   bind:this={confirmDeleteDialog}
@@ -111,19 +87,6 @@
 <slot />
 
 <style>
-  button {
-    cursor: pointer;
-    outline: none;
-    border: none;
-    border-radius: 5px;
-    width: 20px;
-    padding-bottom: 10px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 0;
-  }
-
   .root {
     display: grid;
     grid-template-columns: 275px 1fr 275px;
@@ -162,43 +125,7 @@
     background-color: var(--white);
   }
 
-  .components-nav-page {
-    font-size: 13px;
-    color: var(--ink);
-    padding-left: 20px;
-    margin-top: 20px;
-    font-weight: 600;
-    opacity: 0.4;
-    letter-spacing: 1px;
-  }
-
-  .components-nav-header {
-    font-size: 13px;
-    color: var(--ink);
-    margin-top: 20px;
-    font-weight: 600;
-    opacity: 0.4;
-    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;
-    align-items: center;
-  }
+  
 
   .nav-group-header > div:nth-child(1) {
     padding: 0rem 0.5rem 0rem 0rem;
@@ -207,12 +134,7 @@
     margin-right: 5px;
   }
 
-  .nav-group-header > span:nth-child(3) {
-    margin-left: 5px;
-    vertical-align: bottom;
-    grid-column-start: title;
-    margin-top: auto;
-  }
+
 
   .nav-group-header > div:nth-child(3) {
     vertical-align: bottom;
@@ -225,18 +147,4 @@
     color: var(--primary75);
   }
 
-  .navigator-title {
-    font-size: 18px;
-    color: var(--ink);
-    font-weight: bold;
-    padding: 0 20px 20px 20px;
-  }
-
-  .border-line {
-    border-bottom: 1px solid #d8d8d8;
-  }
-
-  .components-list-container {
-    padding: 20px 0px 0 0;
-  }
 </style>