diff --git a/packages/builder/src/components/design/AppPanel/AppPanel.svelte b/packages/builder/src/components/design/AppPanel/AppPanel.svelte
index 78b6dce457..96f5a24872 100644
--- a/packages/builder/src/components/design/AppPanel/AppPanel.svelte
+++ b/packages/builder/src/components/design/AppPanel/AppPanel.svelte
@@ -1,5 +1,4 @@
 <script>
-  import ComponentSelectionList from "./ComponentSelectionList.svelte"
   import DevicePreviewSelect from "./DevicePreviewSelect.svelte"
   import AppPreview from "./AppPreview.svelte"
   import { store } from "builderStore"
@@ -7,7 +6,6 @@
 
 <div class="app-panel">
   <div class="header">
-    <ComponentSelectionList />
     {#if $store.clientFeatures.devicePreview}
       <DevicePreviewSelect />
     {/if}
diff --git a/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte b/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte
index 04c0d93618..1dcebb4b62 100644
--- a/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte
@@ -2,12 +2,18 @@
   import { Icon, Heading } from "@budibase/bbui"
 
   export let title
-  export let showAddButton
+  export let showAddButton = false
+  export let showBackButton = false
   export let onClickAddButton
+  export let onClickBackButton
+  export let wide = false
 </script>
 
-<div class="navigation-panel">
+<div class="navigation-panel" class:wide>
   <div class="header">
+    {#if showBackButton}
+      <Icon name="ArrowLeft" hoverable on:click={onClickBackButton} />
+    {/if}
     <div class="title">
       <Heading size="XS">{title || ""}</Heading>
     </div>
@@ -29,9 +35,13 @@
     flex-direction: column;
     justify-content: flex-start;
     align-items: stretch;
+    overflow: auto;
+  }
+  .navigation-panel.wide {
+    width: 360px;
   }
   .header {
-    height: 48px;
+    flex: 0 0 48px;
     display: flex;
     flex-direction: row;
     justify-content: space-between;
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentNavigationPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentNavigationPanel.svelte
index ccaebb2dde..e54925fbae 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentNavigationPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentNavigationPanel.svelte
@@ -9,7 +9,7 @@
 <NavigationPanel
   title="Components"
   showAddButton
-  onClickAddButton={() => $goto("./new")}
+  onClickAddButton={() => $goto("../new")}
 >
   <Layout paddingX="L" paddingY="XL" gap="S">
     <Search
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/index.svelte
index 255678ab0b..2509c3d215 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/index.svelte
@@ -1,5 +1,4 @@
 <script>
-  import { store } from "builderStore"
   import AppPanel from "components/design/AppPanel/AppPanel.svelte"
   import ComponentNavigationPanel from "./_components/ComponentNavigationPanel.svelte"
   import ComponentSettingsPanel from "./_components/ComponentSettingsPanel.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/_layout.svelte
index e69de29bb2..5a8d26a452 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/_layout.svelte
@@ -0,0 +1,26 @@
+<script>
+  import { store } from "builderStore"
+  import { onDestroy } from "svelte"
+  import { syncURLToState } from "helpers/urlStateSync"
+  import { goto, params, redirect } from "@roxi/routify"
+
+  // Keep URL and state in sync for selected screen ID
+  const stopSyncing = syncURLToState({
+    keys: [
+      {
+        url: "screenId",
+        state: "selectedScreenId",
+        validate: screenId => $store.screens.some(x => x._id === screenId),
+        fallbackUrl: "../",
+      },
+    ],
+    store,
+    params,
+    goto,
+    redirect,
+  })
+
+  onDestroy(stopSyncing)
+</script>
+
+<slot />
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/index.svelte
index e69de29bb2..e7f6eca5d7 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/index.svelte
@@ -0,0 +1,15 @@
+<script>
+  import { selectedScreen } from "builderStore"
+  import { onMount } from "svelte"
+  import { redirect } from "@roxi/routify"
+
+  onMount(() => {
+    if ($selectedScreen) {
+      // Select the screen slot if a screen exists
+      $redirect(`./slot`)
+    } else {
+      // Otherwise go up so we can select a new valid screen
+      $redirect("../")
+    }
+  })
+</script>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte
index e54925fbae..170a50e44d 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/ComponentListPanel.svelte
@@ -1,21 +1,143 @@
 <script>
   import NavigationPanel from "components/design/NavigationPanel/NavigationPanel.svelte"
   import { goto } from "@roxi/routify"
-  import { Layout, Search } from "@budibase/bbui"
+  import {
+    Layout,
+    ActionGroup,
+    ActionButton,
+    Search,
+    DetailSummary,
+    Icon,
+    Body,
+  } from "@budibase/bbui"
+  import structure from "./componentStructure.json"
+  import { store } from "builderStore"
 
+  let section = "components"
   let searchString
+
+  $: enrichedStructure = enrichStructure(structure, $store.components)
+  $: filteredStructure = filterStructure(
+    enrichedStructure,
+    section,
+    searchString
+  )
+
+  const enrichStructure = (structure, definitions) => {
+    let enrichedStructure = []
+    structure.forEach(item => {
+      if (typeof item === "string") {
+        const def = definitions[`@budibase/standard-components/${item}`]
+        if (def) {
+          enrichedStructure.push({
+            ...def,
+            isCategory: false,
+          })
+        }
+      } else {
+        enrichedStructure.push({
+          ...item,
+          isCategory: true,
+          children: enrichStructure(item.children || [], definitions),
+        })
+      }
+    })
+    return enrichedStructure
+  }
+
+  const filterStructure = (structure, section, search) => {
+    if (!structure?.length) {
+      return []
+    }
+
+    if (section === "components") {
+      structure = structure.filter(category => category.name !== "Blocks")
+    } else {
+      structure = structure.filter(category => category.name === "Blocks")
+    }
+    if (search) {
+      let filteredStructure = []
+      structure.forEach(category => {
+        let matchedChildren = category.children.filter(child => {
+          return child.name.toLowerCase().includes(search.toLowerCase())
+        })
+        if (matchedChildren.length) {
+          filteredStructure.push({
+            ...category,
+            children: matchedChildren,
+          })
+        }
+      })
+      structure = filteredStructure
+    }
+    return structure
+  }
+
+  const addComponent = () => {}
 </script>
 
 <NavigationPanel
-  title="Components"
-  showAddButton
-  onClickAddButton={() => $goto("../new")}
+  title="Add component"
+  showBackButton
+  onClickBackButton={() => $goto("../slot")}
+  wide
 >
   <Layout paddingX="L" paddingY="XL" gap="S">
+    <ActionGroup compact justified>
+      <ActionButton
+        fullWidth
+        selected={section === "components"}
+        on:click={() => (section = "components")}>Components</ActionButton
+      >
+      <ActionButton
+        fullWidth
+        selected={section === "blocks"}
+        on:click={() => (section = "blocks")}>Blocks</ActionButton
+      >
+    </ActionGroup>
     <Search
       placeholder="Search"
       value={searchString}
       on:change={e => (searchString = e.detail)}
     />
   </Layout>
+  {#each filteredStructure as category}
+    <DetailSummary name={category.name} collapsible={false}>
+      <div class="component-grid">
+        {#each category.children as component}
+          <div class="component" on:click={() => addComponent(component)}>
+            <Icon name={component.icon} />
+            <Body size="XS">{component.name}</Body>
+          </div>
+        {/each}
+      </div>
+    </DetailSummary>
+  {/each}
 </NavigationPanel>
+
+<style>
+  .component-grid {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+    gap: var(--spacing-s);
+  }
+  .component {
+    background-color: var(--spectrum-global-color-gray-200);
+    border-radius: 4px;
+    height: 72px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    text-align: center;
+    padding: 0 var(--spacing-s);
+    gap: var(--spacing-s);
+    padding-top: 4px;
+    transition: background 130ms ease-out;
+    line-height: 1.2;
+  }
+  .component:hover {
+    cursor: pointer;
+    background: var(--spectrum-alias-background-color-tertiary);
+  }
+</style>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/index.svelte
index e69de29bb2..8127a6b095 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/index.svelte
@@ -0,0 +1,7 @@
+<script>
+  import ComponentListPanel from "./_components/ComponentListPanel.svelte"
+  import AppPanel from "components/design/AppPanel/AppPanel.svelte"
+</script>
+
+<ComponentListPanel />
+<AppPanel />
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/index.svelte
index 908ffbc531..554ac89d94 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/components/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/index.svelte
@@ -1 +1,19 @@
-Components
+<script>
+  import { store } from "builderStore"
+  import { onMount } from "svelte"
+  import { redirect } from "@roxi/routify"
+
+  let loaded = false
+
+  onMount(() => {
+    if ($store.screens?.length) {
+      $redirect(`./${$store.screens[0]._id}`)
+    } else {
+      loaded = true
+    }
+  })
+</script>
+
+{#if loaded}
+  You need to create a screen!
+{/if}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenNavigationPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenNavigationPanel.svelte
index 6cc3b80426..5f37f1f4a5 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenNavigationPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenNavigationPanel.svelte
@@ -43,7 +43,7 @@
 >
   <Layout paddingX="L" paddingY="XL" gap="S">
     <Search
-      placeholder="Enter a route to search"
+      placeholder="Search"
       value={searchString}
       on:change={e => (searchString = e.detail)}
     />