diff --git a/packages/bbui/src/SideNavigation/Item.svelte b/packages/bbui/src/SideNavigation/Item.svelte
index 44a0d01d4d..17b83d1605 100644
--- a/packages/bbui/src/SideNavigation/Item.svelte
+++ b/packages/bbui/src/SideNavigation/Item.svelte
@@ -2,6 +2,7 @@
     import { getContext } from 'svelte'
     const multilevel = getContext('sidenav-type');
     export let href = "";
+    export let external = false;
     export let heading = ""
     export let icon = "";
     export let selected = false;
@@ -13,7 +14,7 @@
     {#if heading}
         <h2 class="spectrum-SideNav-heading" id="nav-heading-{heading}">{heading}</h2>
     {/if}
-    <a {href} class="spectrum-SideNav-itemLink" aria-current="page">
+    <a target={external ? '_blank' : '_self'} {href} class="spectrum-SideNav-itemLink" aria-current="page">
         {#if icon}
             <svg class="spectrum-Icon spectrum-Icon--sizeM spectrum-SideNav-itemIcon" focusable="false" aria-hidden="true">
                 <use xlink:href="#spectrum-icon-18-{icon}" />
diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
index 8367b0ee53..00d49a055b 100644
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@@ -1,16 +1,8 @@
 <script>
-  import { Home as Link } from "@budibase/bbui"
-  import {
-    AppsIcon,
-    HostingIcon,
-    DocumentationIcon,
-    CommunityIcon,
-    BugIcon,
-  } from "components/common/Icons"
+  import { goto } from "@roxi/routify"
+  import { Home as Link, SideNavigation as Navigation, SideNavigationItem as Item} from "@budibase/bbui"
   import BuilderSettingsButton from "components/start/BuilderSettingsButton.svelte"
   import Logo from "/assets/budibase-logo.svg"
-
-  let modal
 </script>
 
 <div class="root">
@@ -18,23 +10,23 @@
     <div class="home-logo"><img src={Logo} alt="Budibase icon" /></div>
     <div class="nav-section">
       <div class="nav-top">
-        <Link icon={AppsIcon} title="Apps" href="/" active />
-        <Link
-          icon={HostingIcon}
-          title="Hosting"
-          href="https://portal.budi.live/" />
-        <Link
-          icon={DocumentationIcon}
-          title="Documentation"
-          href="https://docs.budibase.com/" />
-        <Link
-          icon={CommunityIcon}
-          title="Community"
-          href="https://github.com/Budibase/budibase/discussions" />
-        <Link
-          icon={BugIcon}
-          title="Raise an issue"
-          href="https://github.com/Budibase/budibase/issues/new/choose" />
+        <Navigation>
+          <Item href="/builder/" icon="Apps" selected>
+            Apps
+          </Item>
+          <Item external href="https://portal.budi.live/" icon="Servers">
+            Hosting
+          </Item>
+          <Item external href="https://docs.budibase.com/" icon="Book">
+            Documentation
+          </Item>
+          <Item external href="https://github.com/Budibase/budibase/discussions" icon="PeopleGroup">
+            Community
+          </Item>
+          <Item external href="https://github.com/Budibase/budibase/issues/new/choose" icon="Bug">
+            Raise an issue
+          </Item>
+        </Navigation>
       </div>
       <div class="nav-bottom">
         <BuilderSettingsButton />