Prevent flashing and intermittent errors when navigating to admin screens as a non admin

packages/builder/src/pages/builder/portal/manage/_layout.svelte

@@ -0,0 +1,18 @@
+<script>
+  import { Page } from "@budibase/bbui"
+  import { auth } from "stores/portal"
+  import { redirect } from "@roxi/routify"
+
+  // Only admins allowed here
+  $: {
+    if (!$auth.isAdmin) {
+      $redirect("../")
+    }
+  }
+</script>
+
+{#if $auth.isAdmin}
+  <Page>
+    <slot />
+  </Page>
+{/if}

packages/builder/src/pages/builder/portal/manage/auth/_layout.svelte

@@ -1,14 +0,0 @@
-<script>
-  import { redirect } from "@roxi/routify"
-  import { Page } from "@budibase/bbui"
-  import { auth } from "../../../../../stores/portal"
-
-  // only admins allowed here
-  if (!$auth.isAdmin) {
-    $redirect("../../../portal")
-  }
-</script>
-
-<Page>
-  <slot />
-</Page>

packages/builder/src/pages/builder/portal/manage/email/_layout.svelte

@@ -1,11 +1,5 @@
 <script>
-  import { redirect } from "@roxi/routify"
+  import { email } from "stores/portal"
-  import { auth, email } from "stores/portal"
-
-  // only admins allowed here
-  if (!$auth.isAdmin) {
-    $redirect("../../../portal")
-  }
 
   email.templates.fetch()
 </script>

packages/builder/src/pages/builder/portal/manage/users/_layout.svelte

@@ -1,14 +0,0 @@
-<script>
-  import { Page } from "@budibase/bbui"
-  import { auth } from "../../../../../stores/portal"
-  import { redirect } from "@roxi/routify"
-
-  // only admins allowed here
-  if (!$auth.isAdmin) {
-    $redirect("../../../portal")
-  }
-</script>
-
-<Page>
-  <slot />
-</Page>

packages/builder/src/pages/builder/portal/settings/organisation.svelte

@@ -17,10 +17,12 @@
   import { writable } from "svelte/store"
   import { redirect } from "@roxi/routify"
 
-  // only admins allowed here
+  // Only admins allowed here
+  $: {
     if (!$auth.isAdmin) {
       $redirect("../../portal")
     }
+  }
 
   const values = writable({
     analytics: !analytics.disabled(),
@@ -70,6 +72,7 @@
   }
 </script>
 
+{#if $auth.isAdmin}
   <Layout>
     <Layout gap="XS" noPadding>
       <Heading size="M">Organisation</Heading>
@@ -132,6 +135,7 @@
       <Button disabled={loading} on:click={saveConfig} cta>Save</Button>
     </div>
   </Layout>
+{/if}
 
 <style>
   .fields {