diff --git a/packages/builder/package.json b/packages/builder/package.json
index 91ee86ce05..f6109b0c05 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -50,7 +50,7 @@
     ]
   },
   "dependencies": {
-    "@budibase/bbui": "^1.10.1",
+    "@budibase/bbui": "^1.10.2",
     "@budibase/client": "^0.0.32",
     "@nx-js/compiler-util": "^2.0.0",
     "codemirror": "^5.51.0",
diff --git a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
index 69ab73e16c..b9f761cec7 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
@@ -8,6 +8,7 @@
   import { EVENT_TYPE_MEMBER_NAME } from "components/common/eventHandlers"
   import { store, workflowStore } from "builderStore"
   import { ArrowDownIcon } from "components/common/Icons/"
+  import { createEventDispatcher } from 'svelte'
 
   export let parameter
 
@@ -25,6 +26,7 @@
   {/if}
   {#if parameter.name === 'workflow'}
     <Select on:change bind:value={parameter.value}>
+      <option value=""></option>
       {#each $workflowStore.workflows.filter(wf => wf.live) as workflow}
         <option value={workflow._id}>{workflow.name}</option>
       {/each}
diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
index 7315e09736..e2c4044fb6 100644
--- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js
+++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
@@ -38,19 +38,19 @@ export default {
                 label: "Type",
                 control: OptionSelect,
                 options: [
-                  { label: "article" },
-                  { label: "aside" },
-                  { label: "details" },
-                  { label: "div" },
-                  { label: "figure" },
-                  { label: "figcaption" },
-                  { label: "footer" },
-                  { label: "header" },
-                  { label: "main" },
-                  { label: "mark" },
-                  { label: "nav" },
-                  { label: "paragraph" },
-                  { label: "summary" },
+                  "article",
+                  "aside",
+                  "details",
+                  "div",
+                  "figure",
+                  "figcaption",
+                  "footer",
+                  "header",
+                  "main",
+                  "mark",
+                  "nav",
+                  "paragraph",
+                  "summary",
                 ],
               },
             ],
diff --git a/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte b/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte
index cde181a961..aed1ee4538 100644
--- a/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte
+++ b/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte
@@ -12,10 +12,14 @@
     {
       name: "Admin",
       key: "ADMIN",
+      canExecute: true,
+      editable: false,
     },
     {
       name: "Power User",
       key: "POWER_USER",
+      canExecute: true,
+      editable: false,
     },
   ]
 
@@ -123,16 +127,22 @@
           <div class="config-item">
             <label class="uk-form-label">User Access</label>
             <div class="access-levels">
-              {#each ACCESS_LEVELS as { name, key }}
+              {#each ACCESS_LEVELS as level}
                 <span class="access-level">
-                  <label>{name}</label>
-                  <input class="uk-checkbox" type="checkbox" />
+                  <label>{level.name}</label>
+                  <input class="uk-checkbox" type="checkbox" disabled={!level.editable} bind:checked={level.canExecute}/>
                 </span>
               {/each}
             </div>
           </div>
         </div>
         <div class="buttons">
+          <button
+            data-cy="save-workflow-setup"
+            class="workflow-button hoverable"
+            on:click={saveWorkflow}>
+            Save Workflow
+          </button>
           <button class="delete-workflow-button" on:click={deleteWorkflow}>
             Delete Workflow
           </button>
diff --git a/packages/builder/src/pages/[application]/_reset.svelte b/packages/builder/src/pages/[application]/_reset.svelte
index 33117a4f9d..a0c6897e54 100644
--- a/packages/builder/src/pages/[application]/_reset.svelte
+++ b/packages/builder/src/pages/[application]/_reset.svelte
@@ -1,6 +1,6 @@
 <script>
   import Modal from "svelte-simple-modal"
-  import { store } from "builderStore"
+  import { store, workflowStore } from "builderStore"
   import { get } from "builderStore/api"
 
   import { fade } from "svelte/transition"
@@ -20,6 +20,7 @@
 
     if (res.ok) {
       await store.setPackage(pkg)
+      workflowStore.actions.fetch()
       return pkg
     } else {
       throw new Error(pkg)
diff --git a/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json b/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
index 1ae407774e..392496988f 100644
--- a/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
+++ b/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json
@@ -5,7 +5,20 @@
 	"componentLibraries": ["@budibase/standard-components", "@budibase/materialdesign-components"],
 	"props" : {
 		"_component": "@budibase/standard-components/container",
-		"_children": [],
+		"_children": [
+      {
+        "_id": "7fcf11e4-6f5b-4085-8e0d-9f3d44c98967",
+        "_component": "##builtin/screenslot",
+        "_styles": {
+          "normal": {},
+          "hover": {},
+          "active": {},
+          "selected": {}
+        },
+        "_code": "",
+        "_children": []
+      }
+    ],
 		"_id": 0,
 		"type": "div",
 		"_styles": {