diff --git a/packages/bbui/src/StatusLight/StatusLight.svelte b/packages/bbui/src/StatusLight/StatusLight.svelte
index f56fee0c2a..6bd1ead558 100644
--- a/packages/bbui/src/StatusLight/StatusLight.svelte
+++ b/packages/bbui/src/StatusLight/StatusLight.svelte
@@ -17,10 +17,13 @@
   export let negative = false
   export let disabled = false
   export let active = false
+  export let color = null
 </script>
 
 <div
   class="spectrum-StatusLight spectrum-StatusLight--size{size}"
+  class:custom={!!color}
+  style={`--color: ${color};`}
   class:spectrum-StatusLight--celery={celery}
   class:spectrum-StatusLight--yellow={yellow}
   class:spectrum-StatusLight--fuchsia={fuchsia}
@@ -39,3 +42,13 @@
 >
   <slot />
 </div>
+
+<style>
+  .spectrum-StatusLight {
+    display: grid;
+    place-items: center;
+  }
+  .custom::before {
+    background: var(--color) !important;
+  }
+</style>
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index dd844ef5ab..909bbcf9f8 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -15,7 +15,7 @@ import {
   tables,
 } from "stores/backend"
 import { API } from "api"
-import { DesignTabs, FrontendTypes } from "constants"
+import { FrontendTypes } from "constants"
 import analytics, { Events } from "analytics"
 import {
   findComponentType,
@@ -48,8 +48,6 @@ const INITIAL_FRONTEND_STATE = {
     continueIfAction: false,
   },
   currentFrontEndType: "none",
-  selectedDesignTab: DesignTabs.SCREENS,
-  selectedScreenId: "",
   selectedLayoutId: "",
   selectedComponentId: "",
   errors: [],
@@ -61,6 +59,9 @@ const INITIAL_FRONTEND_STATE = {
   theme: "",
   customTheme: {},
   previewDevice: "desktop",
+
+  // URL params
+  selectedScreenId: null,
 }
 
 export const getFrontendStore = () => {
diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte
index 364ae50f64..3aba4c7a1b 100644
--- a/packages/builder/src/components/common/NavItem.svelte
+++ b/packages/builder/src/components/common/NavItem.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Icon } from "@budibase/bbui"
+  import { Icon, StatusLight } from "@budibase/bbui"
   import { createEventDispatcher, getContext } from "svelte"
 
   export let icon
@@ -13,6 +13,8 @@
   export let draggable = false
   export let iconText
   export let iconColor
+  export let scrollable = false
+  export let color
 
   const scrollApi = getContext("scroll")
   const dispatch = createEventDispatcher()
@@ -43,7 +45,7 @@
   class="nav-item"
   class:border
   class:selected
-  style={`padding-left: ${20 + indentLevel * 14}px`}
+  style={`padding-left: ${14 + indentLevel * 14}px`}
   {draggable}
   on:dragend
   on:dragstart
@@ -52,6 +54,7 @@
   on:click={onClick}
   ondragover="return false"
   ondragenter="return false"
+  class:scrollable
 >
   <div class="nav-item-content" bind:this={contentRef}>
     {#if withArrow}
@@ -76,6 +79,9 @@
         <slot />
       </div>
     {/if}
+    {#if color}
+      <StatusLight size="L" {color} />
+    {/if}
   </div>
 </div>
 
@@ -85,9 +91,14 @@
     color: var(--grey-7);
     transition: background-color
       var(--spectrum-global-animation-duration-100, 130ms) ease-in-out;
-    padding: 0 var(--spacing-m) 0 var(--spacing-xl);
+    padding: 0 var(--spacing-m) 0 var(--spacing-l);
     height: 32px;
     display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+  }
+  .nav-item.scrollable {
     flex-direction: column;
     justify-content: center;
     align-items: flex-start;
@@ -136,10 +147,13 @@
     font-weight: 600;
     font-size: var(--spectrum-global-dimension-font-size-75);
     white-space: nowrap;
-    max-width: 160px;
     overflow: hidden;
     text-overflow: ellipsis;
+    flex: 1 1 auto;
+  }
+  .scrollable .text {
     flex: 0 0 auto;
+    max-width: 160px;
   }
 
   .actions {
diff --git a/packages/builder/src/components/design/AppPanel/AppPanel.svelte b/packages/builder/src/components/design/AppPanel/AppPanel.svelte
new file mode 100644
index 0000000000..6d5e70b5a1
--- /dev/null
+++ b/packages/builder/src/components/design/AppPanel/AppPanel.svelte
@@ -0,0 +1,57 @@
+<script>
+  import ComponentSelectionList from "./ComponentSelectionList.svelte"
+  import DevicePreviewSelect from "./DevicePreviewSelect.svelte"
+  import ThemeEditor from "./ThemeEditor.svelte"
+  import AppThemeSelect from "./AppThemeSelect.svelte"
+  import AppPreview from "./AppPreview.svelte"
+  import { store } from "builderStore"
+</script>
+
+<div class="app-panel">
+  <div class="header">
+    <ComponentSelectionList />
+    {#if $store.clientFeatures.devicePreview}
+      <DevicePreviewSelect />
+    {/if}
+    {#if $store.clientFeatures.customThemes}
+      <ThemeEditor />
+    {:else if $store.clientFeatures.spectrumThemes}
+      <AppThemeSelect />
+    {/if}
+  </div>
+  <div class="content">
+    {#key $store.version}
+      <AppPreview />
+    {/key}
+  </div>
+</div>
+
+<style>
+  .app-panel {
+    flex: 1 1 auto;
+    overflow-y: auto;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: stretch;
+    gap: var(--spacing-m);
+    padding: var(--spacing-l) 24px;
+  }
+  .header {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: flex-start;
+    gap: 1rem;
+    margin-left: -6px;
+  }
+  .header > :global(*) {
+    flex: 0 0 auto;
+  }
+  .header > :global(*:first-child) {
+    flex: 1 1 auto;
+  }
+  .content {
+    flex: 1 1 auto;
+  }
+</style>
diff --git a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/components/design/AppPanel/AppPreview.svelte
similarity index 96%
rename from packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
rename to packages/builder/src/components/design/AppPanel/AppPreview.svelte
index 28bc50d15a..5eda3ce080 100644
--- a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
+++ b/packages/builder/src/components/design/AppPanel/AppPreview.svelte
@@ -1,7 +1,7 @@
 <script>
   import { get } from "svelte/store"
   import { onMount, onDestroy } from "svelte"
-  import { store, currentAsset } from "builderStore"
+  import { store, currentAsset, allScreens } from "builderStore"
   import iframeTemplate from "./iframeTemplate"
   import { Screen } from "builderStore/store/screenTemplates/utils/Screen"
   import { FrontendTypes } from "constants"
@@ -49,13 +49,8 @@
 
   // Extract data to pass to the iframe
   $: {
-    if ($store.currentFrontEndType === FrontendTypes.LAYOUT) {
-      layout = $currentAsset
-      screen = screenPlaceholder
-    } else {
-      screen = $currentAsset
-      layout = $store.layouts.find(layout => layout._id === screen?.layoutId)
-    }
+    screen = $allScreens.find(x => x._id === $store.selectedScreenId)
+    layout = $store.layouts.find(layout => layout._id === screen?.layoutId)
   }
   $: selectedComponentId = $store.selectedComponentId ?? ""
   $: previewData = {
@@ -68,7 +63,7 @@
     customTheme: $store.customTheme,
     previewDevice: $store.previewDevice,
     messagePassing: $store.clientFeatures.messagePassing,
-    isBudibaseEvent: true
+    isBudibaseEvent: true,
   }
   $: json = JSON.stringify(previewData)
 
diff --git a/packages/builder/src/components/design/AppPreview/AppThemeSelect.svelte b/packages/builder/src/components/design/AppPanel/AppThemeSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/AppPreview/AppThemeSelect.svelte
rename to packages/builder/src/components/design/AppPanel/AppThemeSelect.svelte
diff --git a/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte b/packages/builder/src/components/design/AppPanel/ComponentSelectionList.svelte
similarity index 100%
rename from packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte
rename to packages/builder/src/components/design/AppPanel/ComponentSelectionList.svelte
diff --git a/packages/builder/src/components/design/AppPreview/DevicePreviewSelect.svelte b/packages/builder/src/components/design/AppPanel/DevicePreviewSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/AppPreview/DevicePreviewSelect.svelte
rename to packages/builder/src/components/design/AppPanel/DevicePreviewSelect.svelte
diff --git a/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte b/packages/builder/src/components/design/AppPanel/ThemeEditor.svelte
similarity index 98%
rename from packages/builder/src/components/design/AppPreview/ThemeEditor.svelte
rename to packages/builder/src/components/design/AppPanel/ThemeEditor.svelte
index e10ac4f0cd..933c9b27a7 100644
--- a/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte
+++ b/packages/builder/src/components/design/AppPanel/ThemeEditor.svelte
@@ -141,9 +141,6 @@
 </Modal>
 
 <style>
-  .container {
-    padding-right: 8px;
-  }
   .setting {
     display: flex;
     flex-direction: row;
diff --git a/packages/builder/src/components/design/AppPreview/componentStructure.json b/packages/builder/src/components/design/AppPanel/componentStructure.json
similarity index 100%
rename from packages/builder/src/components/design/AppPreview/componentStructure.json
rename to packages/builder/src/components/design/AppPanel/componentStructure.json
diff --git a/packages/builder/src/components/design/AppPreview/iframeTemplate.js b/packages/builder/src/components/design/AppPanel/iframeTemplate.js
similarity index 100%
rename from packages/builder/src/components/design/AppPreview/iframeTemplate.js
rename to packages/builder/src/components/design/AppPanel/iframeTemplate.js
diff --git a/packages/builder/src/components/design/AppPreview/index.js b/packages/builder/src/components/design/AppPreview/index.js
deleted file mode 100644
index 61030700ec..0000000000
--- a/packages/builder/src/components/design/AppPreview/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./CurrentItemPreview.svelte"
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
index 3d6984cf14..30520a6212 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
@@ -7,9 +7,7 @@
   } from "builderStore"
   import instantiateStore from "./dragDropStore"
   import ComponentTree from "./ComponentTree.svelte"
-  import NavItem from "components/common/NavItem.svelte"
   import PathDropdownMenu from "./PathDropdownMenu.svelte"
-  import ScreenDropdownMenu from "./ScreenDropdownMenu.svelte"
   import { get } from "svelte/store"
 
   const ROUTE_NAME_MAP = {
@@ -32,7 +30,6 @@
 
   $: selectedScreen = $currentAsset
   $: allScreens = getAllScreens(route)
-  $: filteredScreens = getFilteredScreens(allScreens, $screenSearchString)
   $: hasSearchMatch = $screenSearchString && filteredScreens.length > 0
   $: noSearchMatch = $screenSearchString && !filteredScreens.length
   $: routeSelected =
@@ -43,22 +40,6 @@
     store.actions.screens.select(screenId)
   }
 
-  const getAllScreens = route => {
-    let screens = []
-    Object.entries(route.subpaths).forEach(([route, subpath]) => {
-      Object.entries(subpath.screens).forEach(([role, id]) => {
-        screens.push({ id, route, role })
-      })
-    })
-    return screens
-  }
-
-  const getFilteredScreens = (screens, searchString) => {
-    return screens.filter(
-      screen => !searchString || screen.route.includes(searchString)
-    )
-  }
-
   const toggleManuallyOpened = () => {
     if (get(screenSearchString)) {
       return
@@ -79,28 +60,5 @@
     <PathDropdownMenu screens={allScreens} {path} />
   </NavItem>
 
-  {#if routeOpened}
-    {#each filteredScreens as screen (screen.id)}
-      <NavItem
-        icon="WebPage"
-        indentLevel={indent || 1}
-        selected={$store.selectedScreenId === screen.id &&
-          $store.currentView === "detail"}
-        opened={$store.selectedScreenId === screen.id}
-        text={ROUTE_NAME_MAP[screen.route]?.[screen.role] || screen.route}
-        withArrow={route.subpaths}
-        on:click={() => changeScreen(screen.id)}
-      >
-        <ScreenDropdownMenu screenId={screen.id} />
-      </NavItem>
-      {#if selectedScreen?._id === screen.id}
-        <ComponentTree
-          level={1}
-          components={selectedScreen.props._children}
-          currentComponent={$selectedComponent}
-          {dragDropStore}
-        />
-      {/if}
-    {/each}
-  {/if}
+  {#if routeOpened}{/if}
 {/if}
diff --git a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
index 0611d4fc71..9b63cbaa40 100644
--- a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
@@ -131,21 +131,7 @@
   <Tabs {selected} on:select={navigate}>
     <Tab title="Screens">
       <div class="tab-content-padding">
-        <BBUILayout noPadding gap="XS">
-          <Select
-            on:change={updateAccessRole}
-            value={$selectedAccessRole}
-            label="Filter by Access"
-            getOptionLabel={role => role.name}
-            getOptionValue={role => role._id}
-            options={$roles}
-          />
-          <Search
-            placeholder="Enter a route to search"
-            label="Search Screens"
-            bind:value={$screenSearchString}
-          />
-        </BBUILayout>
+        <BBUILayout noPadding gap="XS" />
         <div class="nav-items-container" bind:this={scrollRef}>
           <ComponentNavigationTree />
         </div>
diff --git a/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte b/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte
new file mode 100644
index 0000000000..ceca3452ad
--- /dev/null
+++ b/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte
@@ -0,0 +1,70 @@
+<script>
+  import { Icon, Heading } from "@budibase/bbui"
+
+  export let title
+  export let showAddButton
+  export let onClickAddButton
+</script>
+
+<div class="navigation-panel">
+  <div class="header">
+    <div class="title">
+      <Heading size="XS">{title || ""}</Heading>
+    </div>
+    {#if showAddButton}
+      <div class="add-button">
+        <Icon name="Add" on:click={onClickAddButton} />
+      </div>
+    {/if}
+  </div>
+  <slot />
+</div>
+
+<style>
+  .navigation-panel {
+    width: 260px;
+    background: var(--background);
+    border-right: var(--border-light);
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: stretch;
+  }
+  .header {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    padding: var(--spacing-m) var(--spacing-l);
+    border-bottom: var(--border-light);
+    gap: var(--spacing-l);
+  }
+  .title {
+    flex: 1 1 auto;
+    width: 0;
+  }
+  .title :global(h1) {
+    overflow: hidden;
+    font-weight: 600;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .add-button {
+    flex: 0 0 32px;
+    height: 32px;
+    display: grid;
+    place-items: center;
+    border-radius: 4px;
+    position: relative;
+    cursor: pointer;
+    background: var(--spectrum-semantic-cta-color-background-default);
+    transition: background var(--spectrum-global-animation-duration-100, 130ms)
+      ease-out;
+  }
+  .add-button:hover {
+    background: var(--spectrum-semantic-cta-color-background-hover);
+  }
+  .add-button :global(svg) {
+    fill: white;
+  }
+</style>
diff --git a/packages/builder/src/constants/index.js b/packages/builder/src/constants/index.js
index 0316a77550..d4b7116c01 100644
--- a/packages/builder/src/constants/index.js
+++ b/packages/builder/src/constants/index.js
@@ -1,13 +1,14 @@
+import { Roles } from "./backend"
+
 export const TableNames = {
   USERS: "ta_users",
 }
 
-export const DesignTabs = {
-  SCREENS: "screens",
-  COMPONENTS: "components",
-  THEME: "theme",
-  NAVIGATION: "navigation",
-  LAYOUTS: "layouts",
+export const RoleColours = {
+  [Roles.ADMIN]: "var(--spectrum-global-color-static-seafoam-400)",
+  [Roles.POWER]: "var(--spectrum-global-color-static-purple-400)",
+  [Roles.BASIC]: "var(--spectrum-global-color-static-magenta-400)",
+  [Roles.PUBLIC]: "var(--spectrum-global-color-static-yellow-400)",
 }
 
 export const FrontendTypes = {
diff --git a/packages/builder/src/helpers/urlStateSync.js b/packages/builder/src/helpers/urlStateSync.js
index 22ef98ded7..7b33caf042 100644
--- a/packages/builder/src/helpers/urlStateSync.js
+++ b/packages/builder/src/helpers/urlStateSync.js
@@ -55,7 +55,7 @@ export const syncURLToState = options => {
   // Updates the URL with new state values
   const mapStateToUrl = state => {
     // Determine new URL while checking for changes
-    let url = "."
+    let url = ".."
     let needsUpdate = false
     for (let key of keys) {
       const urlValue = cachedParams?.[key.url]
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte
similarity index 55%
rename from packages/builder/src/pages/builder/app/[application]/design/_layout.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte
index 0ea4e8456d..5a93854033 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte
@@ -1,23 +1,15 @@
 <script>
   import { IconSideNav, IconSideNavItem } from "@budibase/bbui"
-  import { params, goto } from "@roxi/routify"
-  import { DesignTabs } from "constants"
+  import { params, goto, isActive } from "@roxi/routify"
   import { store } from "builderStore"
   import { syncURLToState } from "helpers/urlStateSync"
   import { onDestroy } from "svelte"
 
-  const updateTab = tab => {
-    store.update(state => {
-      state.selectedDesignTab = tab
-      return state
-    })
-  }
-
   const unsync = syncURLToState({
     keys: [
       {
-        url: "tab",
-        state: "selectedDesignTab",
+        url: "screenId",
+        state: "selectedScreenId",
       },
     ],
     store,
@@ -30,37 +22,37 @@
 
 <!-- routify:options index=1 -->
 <div class="design">
-  <div class="side-nav">
+  <div class="icon-nav">
     <IconSideNav>
       <IconSideNavItem
         icon="WebPage"
         tooltip="Screens"
-        active={$store.selectedDesignTab === DesignTabs.SCREENS}
-        on:click={() => updateTab(DesignTabs.SCREENS)}
+        active={$isActive("./screens")}
+        on:click={() => $goto("./screens")}
       />
       <IconSideNavItem
         icon="ViewList"
         tooltip="Components"
-        active={$store.selectedDesignTab === DesignTabs.COMPONENTS}
-        on:click={() => updateTab(DesignTabs.COMPONENTS)}
+        active={$isActive("./components")}
+        on:click={() => $goto("./components")}
       />
       <IconSideNavItem
         icon="Brush"
         tooltip="Theme"
-        active={$store.selectedDesignTab === DesignTabs.THEME}
-        on:click={() => updateTab(DesignTabs.THEME)}
+        active={$isActive("./theme")}
+        on:click={() => $goto("./theme")}
       />
       <IconSideNavItem
         icon="Link"
         tooltip="Navigation"
-        active={$store.selectedDesignTab === DesignTabs.NAVIGATION}
-        on:click={() => updateTab(DesignTabs.NAVIGATION)}
+        active={$isActive("./navigation")}
+        on:click={() => $goto("./navigation")}
       />
       <IconSideNavItem
         icon="Experience"
         tooltip="Layouts"
-        active={$store.selectedDesignTab === DesignTabs.LAYOUTS}
-        on:click={() => updateTab(DesignTabs.LAYOUTS)}
+        active={$isActive("./layouts")}
+        on:click={() => $goto("./layouts")}
       />
     </IconSideNav>
   </div>
@@ -77,12 +69,14 @@
     grid-template-columns: auto 1fr;
     align-items: stretch;
   }
-  .side-nav {
+  .icon-nav {
     background: var(--background);
     border-right: var(--border-light);
   }
   .content {
     display: flex;
-    flex-direction: column;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: stretch;
   }
 </style>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/index.svelte
new file mode 100644
index 0000000000..908ffbc531
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/index.svelte
@@ -0,0 +1 @@
+Components
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte
new file mode 100644
index 0000000000..d70922c14a
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte
@@ -0,0 +1,5 @@
+<script>
+  import { redirect } from "@roxi/routify"
+
+  $redirect(`./screens`)
+</script>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte
new file mode 100644
index 0000000000..b0615c5c1f
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/index.svelte
@@ -0,0 +1 @@
+Layouts
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte
new file mode 100644
index 0000000000..06b36d1aae
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/index.svelte
@@ -0,0 +1 @@
+Navigation
diff --git a/packages/builder/src/components/design/NavigationPanel/ScreenDetailsModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDetailsModal.svelte
similarity index 100%
rename from packages/builder/src/components/design/NavigationPanel/ScreenDetailsModal.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDetailsModal.svelte
diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte
similarity index 97%
rename from packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte
index 76bb48a26c..b4b612d655 100644
--- a/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenDropdownMenu.svelte
@@ -10,7 +10,7 @@
     Helpers,
     notifications,
   } from "@budibase/bbui"
-  import ScreenDetailsModal from "../ScreenDetailsModal.svelte"
+  import ScreenDetailsModal from "./ScreenDetailsModal.svelte"
   import sanitizeUrl from "builderStore/store/screenTemplates/utils/sanitizeUrl"
   import analytics, { Events } from "analytics"
   import { makeComponentUnique } from "builderStore/componentUtils"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_layout.svelte
new file mode 100644
index 0000000000..4fa864ce7a
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_layout.svelte
@@ -0,0 +1 @@
+<slot />
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/[asset]/_fallback.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/[asset]/_fallback.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/[asset]/_fallback.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/[asset]/_fallback.svelte
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/_layout.svelte
similarity index 86%
rename from packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/_layout.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/_layout.svelte
index 44240c61f1..e79ae0287c 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/_layout.svelte
@@ -156,24 +156,7 @@
   </div>
 
   <div class="preview-pane">
-    {#if $currentAsset}
-      <div class="preview-header">
-        <ComponentSelectionList />
-        {#if $store.clientFeatures.devicePreview}
-          <DevicePreviewSelect />
-        {/if}
-        {#if $store.clientFeatures.customThemes}
-          <ThemeEditor />
-        {:else if $store.clientFeatures.spectrumThemes}
-          <AppThemeSelect />
-        {/if}
-      </div>
-      <div class="preview-content">
-        {#key $store.version}
-          <CurrentItemPreview />
-        {/key}
-      </div>
-    {:else}
+    {#if $currentAsset}{:else}
       <div class="centered">
         <div class="main">
           <Layout gap="S" justifyItems="center">
@@ -247,34 +230,6 @@
     border-right: var(--border-light);
   }
 
-  .preview-pane {
-    grid-column: 2;
-    overflow-y: auto;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-    align-items: stretch;
-    gap: var(--spacing-m);
-    padding: var(--spacing-xl) 40px;
-  }
-  .preview-header {
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: flex-start;
-    gap: 1rem;
-  }
-  .preview-header > :global(*) {
-    flex: 0 0 auto;
-  }
-  .preview-header > :global(*:first-child) {
-    flex: 1 1 auto;
-  }
-
-  .preview-content {
-    flex: 1 1 auto;
-  }
-
   .components-pane {
     grid-column: 3;
     background-color: var(--background);
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/index.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/design/[tab]/[assetType]/index.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_old/[assetType]/index.svelte
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte
new file mode 100644
index 0000000000..abd49b91e1
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/index.svelte
@@ -0,0 +1,69 @@
+<script>
+  import { Search, Layout, Select } from "@budibase/bbui"
+  import NavigationPanel from "components/design/NavigationPanel/NavigationPanel.svelte"
+  import { roles } from "stores/backend"
+  import { store, allScreens } from "builderStore"
+  import NavItem from "components/common/NavItem.svelte"
+  import ScreenDropdownMenu from "./_components/ScreenDropdownMenu.svelte"
+  import AppPanel from "components/design/AppPanel/AppPanel.svelte"
+  import { RoleColours } from "constants"
+
+  let searchString
+  let accessRole
+
+  $: filteredScreens = getFilteredScreens($allScreens, searchString)
+
+  const getFilteredScreens = (screens, searchString) => {
+    return screens
+      .filter(
+        screen => !searchString || screen.routing.route.includes(searchString)
+      )
+      .slice()
+      .sort((a, b) => {
+        return a.routing.route < b.routing.route ? -1 : 1
+      })
+  }
+
+  const getRoleColor = roleId => {
+    return RoleColours[roleId] || "pink"
+  }
+</script>
+
+<NavigationPanel title="Screens" showAddButton onClickAddButton>
+  <Layout paddingX="L" paddingY="XL" gap="S">
+    <Search
+      placeholder="Enter a route to search"
+      value={searchString}
+      on:change={e => (searchString = e.detail)}
+    />
+    <Select
+      bind:value={accessRole}
+      placeholder="All screens"
+      getOptionLabel={role => role.name}
+      getOptionValue={role => role._id}
+      options={$roles}
+    />
+  </Layout>
+  {#each filteredScreens as screen (screen._id)}
+    <NavItem
+      icon={screen.routing.route === "/" ? "Home" : "WebPage"}
+      indentLevel={0}
+      selected={$store.selectedScreenId === screen._id}
+      text={screen.routing.route}
+      on:click={() => ($store.selectedScreenId = screen._id)}
+      color={getRoleColor(screen.routing.roleId)}
+    >
+      <ScreenDropdownMenu screenId={screen._id} />
+    </NavItem>
+    <!--{#if selectedScreen?._id === screen.id}-->
+    <!--  <ComponentTree-->
+    <!--    level={1}-->
+    <!--    components={selectedScreen.props._children}-->
+    <!--    currentComponent={$selectedComponent}-->
+    <!--    {dragDropStore}-->
+    <!--  />-->
+    <!--{/if}-->
+  {/each}
+</NavigationPanel>
+
+<AppPanel />
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte
new file mode 100644
index 0000000000..57d4104f25
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/index.svelte
@@ -0,0 +1 @@
+Theme
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[tab]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[tab]/_layout.svelte
deleted file mode 100644
index d41fc0ee34..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/design/[tab]/_layout.svelte
+++ /dev/null
@@ -1,2 +0,0 @@
-<!-- routify:options index=1 -->
-<slot />
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[tab]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[tab]/index.svelte
deleted file mode 100644
index 4c72ebe7a2..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/design/[tab]/index.svelte
+++ /dev/null
@@ -1,6 +0,0 @@
-<script>
-  import { goto } from "@roxi/routify"
-  import { FrontendTypes } from "constants"
-
-  $goto(`./${FrontendTypes.SCREEN}`)
-</script>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/index.svelte
index 5002f4d1b7..ff5cb19fdc 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/index.svelte
@@ -1,6 +1,19 @@
 <script>
-  import { goto } from "@roxi/routify"
-  import { DesignTabs } from "constants"
+  import { allScreens } from "builderStore"
+  import { onMount } from "svelte"
+  import { redirect } from "@roxi/routify"
 
-  $goto(`./${DesignTabs.SCREENS}`)
+  let loaded = false
+
+  onMount(() => {
+    if ($allScreens?.length) {
+      $redirect(`./${$allScreens[0]._id}`)
+    } else {
+      loaded = true
+    }
+  })
 </script>
+
+{#if loaded}
+  You need to create a screen!
+{/if}
diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 6bd0313c75..5be344496c 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -276,7 +276,7 @@
 
   .preview #app-root {
     border: 1px solid var(--spectrum-global-color-gray-300);
-    border-radius: 4px;
+    border-radius: 2px;
   }
 
   /* Print styles */