diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 5d3371ee7d..bcbd2741b2 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -5,7 +5,7 @@
   import { Button, Input, Select, Label } from "@budibase/bbui"
   import { automationStore } from "builderStore"
   import WebhookDisplay from "../Shared/WebhookDisplay.svelte"
-  import BindableInput from "components/userInterface/BindableInput.svelte"
+  import BindableInput from "./BindableInput.svelte"
 
   export let block
   export let webhookModal
diff --git a/packages/builder/src/components/userInterface/BindableInput.svelte b/packages/builder/src/components/automation/SetupPanel/BindableInput.svelte
similarity index 91%
rename from packages/builder/src/components/userInterface/BindableInput.svelte
rename to packages/builder/src/components/automation/SetupPanel/BindableInput.svelte
index 76624abd06..f5b7434267 100644
--- a/packages/builder/src/components/userInterface/BindableInput.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/BindableInput.svelte
@@ -1,5 +1,5 @@
 <script>
-  import GenericBindingPopover from "./GenericBindingPopover.svelte"
+  import GenericBindingPopover from "../../userInterface/PropertiesPanel/GenericBindingPopover.svelte"
   import { Input, Icon } from "@budibase/bbui"
 
   export let bindings = []
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index 117f00d1a3..7153833148 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -1,7 +1,7 @@
 <script>
   import { backendUiStore } from "builderStore"
-  import { Input, Select, Label } from "@budibase/bbui"
-  import BindableInput from "../../userInterface/BindableInput.svelte"
+  import { Select } from "@budibase/bbui"
+  import BindableInput from "./BindableInput.svelte"
 
   export let value
   export let bindings
diff --git a/packages/builder/src/components/userInterface/ComponentSelectionList.svelte b/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/ComponentSelectionList.svelte
rename to packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte
diff --git a/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte
rename to packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
diff --git a/packages/builder/src/components/userInterface/componentStructure.json b/packages/builder/src/components/design/AppPreview/componentStructure.json
similarity index 81%
rename from packages/builder/src/components/userInterface/componentStructure.json
rename to packages/builder/src/components/design/AppPreview/componentStructure.json
index db136f885a..f6c7a7ab2d 100644
--- a/packages/builder/src/components/userInterface/componentStructure.json
+++ b/packages/builder/src/components/design/AppPreview/componentStructure.json
@@ -7,5 +7,6 @@
     ]
   },
   "grid",
-  "screenslot"
+  "screenslot",
+  "button"
 ]
\ No newline at end of file
diff --git a/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.html b/packages/builder/src/components/design/AppPreview/iframeTemplate.html
similarity index 100%
rename from packages/builder/src/components/userInterface/AppPreview/iframeTemplate.html
rename to packages/builder/src/components/design/AppPreview/iframeTemplate.html
diff --git a/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js b/packages/builder/src/components/design/AppPreview/iframeTemplate.js
similarity index 100%
rename from packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js
rename to packages/builder/src/components/design/AppPreview/iframeTemplate.js
diff --git a/packages/builder/src/components/userInterface/AppPreview/index.js b/packages/builder/src/components/design/AppPreview/index.js
similarity index 100%
rename from packages/builder/src/components/userInterface/AppPreview/index.js
rename to packages/builder/src/components/design/AppPreview/index.js
diff --git a/packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
rename to packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte
diff --git a/packages/builder/src/components/userInterface/ComponentNavigationTree/ComponentTree.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentTree.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/ComponentNavigationTree/ComponentTree.svelte
rename to packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ComponentTree.svelte
diff --git a/packages/builder/src/components/userInterface/ComponentNavigationTree/LayoutDropdownMenu.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/LayoutDropdownMenu.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/ComponentNavigationTree/LayoutDropdownMenu.svelte
rename to packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/LayoutDropdownMenu.svelte
diff --git a/packages/builder/src/components/userInterface/ComponentNavigationTree/PathTree.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/ComponentNavigationTree/PathTree.svelte
rename to packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/PathTree.svelte
diff --git a/packages/builder/src/components/userInterface/ComponentNavigationTree/ScreenDropdownMenu.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/ComponentNavigationTree/ScreenDropdownMenu.svelte
rename to packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/ScreenDropdownMenu.svelte
diff --git a/packages/builder/src/components/userInterface/ComponentNavigationTree/dragDropStore.js b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/dragDropStore.js
similarity index 100%
rename from packages/builder/src/components/userInterface/ComponentNavigationTree/dragDropStore.js
rename to packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/dragDropStore.js
diff --git a/packages/builder/src/components/userInterface/ComponentNavigationTree/index.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/index.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/ComponentNavigationTree/index.svelte
rename to packages/builder/src/components/design/NavigationPanel/ComponentNavigationTree/index.svelte
diff --git a/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
similarity index 90%
rename from packages/builder/src/components/userInterface/FrontendNavigatePane.svelte
rename to packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
index 698476dcd8..b2761535fa 100644
--- a/packages/builder/src/components/userInterface/FrontendNavigatePane.svelte
+++ b/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
@@ -9,10 +9,10 @@
     selectedAccessRole,
   } from "builderStore"
   import { FrontendTypes } from "constants"
-  import ComponentNavigationTree from "components/userInterface/ComponentNavigationTree/index.svelte"
-  import Layout from "components/userInterface/Layout.svelte"
-  import NewScreenModal from "components/userInterface/NewScreenModal.svelte"
-  import NewLayoutModal from "components/userInterface/NewLayoutModal.svelte"
+  import ComponentNavigationTree from "components/userInterface/NavigationPanel/ComponentNavigationTree/index.svelte"
+  import Layout from "components/userInterface/NavigationPanel/Layout.svelte"
+  import NewScreenModal from "components/userInterface/NavigationPanel/NewScreenModal.svelte"
+  import NewLayoutModal from "components/userInterface/NavigationPanel/NewLayoutModal.svelte"
   import { Modal, Switcher, Select } from "@budibase/bbui"
 
   const tabs = [
diff --git a/packages/builder/src/components/userInterface/Layout.svelte b/packages/builder/src/components/design/NavigationPanel/Layout.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/Layout.svelte
rename to packages/builder/src/components/design/NavigationPanel/Layout.svelte
diff --git a/packages/builder/src/components/userInterface/NewLayoutModal.svelte b/packages/builder/src/components/design/NavigationPanel/NewLayoutModal.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/NewLayoutModal.svelte
rename to packages/builder/src/components/design/NavigationPanel/NewLayoutModal.svelte
diff --git a/packages/builder/src/components/userInterface/NewScreenModal.svelte b/packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/NewScreenModal.svelte
rename to packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
diff --git a/packages/builder/src/components/userInterface/BindingDropdown.svelte b/packages/builder/src/components/design/PropertiesPanel/BindingDropdown.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/BindingDropdown.svelte
rename to packages/builder/src/components/design/PropertiesPanel/BindingDropdown.svelte
diff --git a/packages/builder/src/components/userInterface/CategoryTab.svelte b/packages/builder/src/components/design/PropertiesPanel/CategoryTab.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/CategoryTab.svelte
rename to packages/builder/src/components/design/PropertiesPanel/CategoryTab.svelte
diff --git a/packages/builder/src/components/userInterface/DesignView.svelte b/packages/builder/src/components/design/PropertiesPanel/DesignView.svelte
similarity index 97%
rename from packages/builder/src/components/userInterface/DesignView.svelte
rename to packages/builder/src/components/design/PropertiesPanel/DesignView.svelte
index 5be4a421ba..b2712f09cf 100644
--- a/packages/builder/src/components/userInterface/DesignView.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/DesignView.svelte
@@ -1,6 +1,6 @@
 <script>
   import { TextArea, DetailSummary, Button } from "@budibase/bbui"
-  import PropertyGroup from "./PropertyGroup.svelte"
+  import PropertyGroup from "./PropertyPanelControls/PropertyGroup.svelte"
   import FlatButtonGroup from "./PropertyPanelControls/FlatButtonGroup"
   import { allStyles } from "./componentStyles"
 
diff --git a/packages/builder/src/components/userInterface/GenericBindingPopover.svelte b/packages/builder/src/components/design/PropertiesPanel/GenericBindingPopover.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/GenericBindingPopover.svelte
rename to packages/builder/src/components/design/PropertiesPanel/GenericBindingPopover.svelte
diff --git a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertiesPanel.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertiesPanel.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/Checkbox.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/Checkbox.svelte
new file mode 100644
index 0000000000..5eaf81cdbc
--- /dev/null
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/Checkbox.svelte
@@ -0,0 +1,7 @@
+<script>
+  import Checkbox from "components/common/Checkbox.svelte"
+
+  export let value
+</script>
+
+<Checkbox checked={value} on:change />
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte
new file mode 100644
index 0000000000..63ce8da6c4
--- /dev/null
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte
@@ -0,0 +1,7 @@
+<script>
+  import Colorpicker from "@budibase/colorpicker"
+
+  export let value
+</script>
+
+<Colorpicker value={value || '#000'} on:change />
diff --git a/packages/builder/src/components/userInterface/DetailScreenSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DetailScreenSelect.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/DetailScreenSelect.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/DetailScreenSelect.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/EventEditorModal.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditorModal.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/EventEditorModal.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditorModal.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/EventPropertyControl.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventPropertyControl.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/EventPropertyControl.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventPropertyControl.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/CreateRow.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/CreateRow.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/CreateRow.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/CreateRow.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/DeleteRow.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/DeleteRow.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/DeleteRow.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/NavigateTo.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/NavigateTo.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/NavigateTo.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/NavigateTo.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/SaveFields.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveFields.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/SaveFields.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveFields.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/SaveRow.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/SaveRow.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveRow.svelte
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/TriggerAutomation.svelte
similarity index 80%
rename from packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/TriggerAutomation.svelte
index 3e46f813fd..3addd55ea0 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/TriggerAutomation.svelte
@@ -41,53 +41,53 @@
     newOrExisting = "existing"
     parameters.newAutomationName = ""
   }
-
 </script>
 
 <div class="root">
-
   <div class="radio-container" on:click={setNew}>
-    <input 
-      type="radio" 
-      value="new" 
+    <input
+      type="radio"
+      value="new"
       bind:group={newOrExisting}
-      disabled={!hasAutomations}> 
-      
-    <Label disabled={!hasAutomations}>Create a new automation </Label>
+      disabled={!hasAutomations} />
 
+    <Label disabled={!hasAutomations}>Create a new automation</Label>
   </div>
 
   <div class="radio-container" on:click={setExisting}>
-
-    <input 
-      type="radio" 
-      value="existing" 
+    <input
+      type="radio"
+      value="existing"
       bind:group={newOrExisting}
-      disabled={!hasAutomations}> 
-      
-    <Label disabled={!hasAutomations}>Use an existing automation </Label>
+      disabled={!hasAutomations} />
 
+    <Label disabled={!hasAutomations}>Use an existing automation</Label>
   </div>
 
   <Label size="m" color="dark">Automation</Label>
 
-  {#if newOrExisting=== "existing"}
-    <Select secondary bind:value={parameters.automationId} placeholder="Choose automation">
+  {#if newOrExisting === 'existing'}
+    <Select
+      secondary
+      bind:value={parameters.automationId}
+      placeholder="Choose automation">
       <option value="" />
       {#each automations as automation}
         <option value={automation._id}>{automation.name}</option>
       {/each}
     </Select>
   {:else}
-    <Input secondary bind:value={parameters.newAutomationName} placeholder="Enter automation name" />
+    <Input
+      secondary
+      bind:value={parameters.newAutomationName}
+      placeholder="Enter automation name" />
   {/if}
 
   <SaveFields
     parameterFields={parameters.fields}
-    schemaFields={newOrExisting === "existing" && selectedAutomation && selectedAutomation.schema}
+    schemaFields={newOrExisting === 'existing' && selectedAutomation && selectedAutomation.schema}
     fieldLabel="Field"
     on:fieldschanged={onFieldsChanged} />
-
 </div>
 
 <style>
@@ -127,5 +127,4 @@
   .radio-container > input:focus {
     outline: none;
   }
-
 </style>
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/UpdateRow.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/UpdateRow.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/UpdateRow.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/UpdateRow.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/index.js b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/actions/index.js
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/index.js b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/index.js
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/EventsEditor/index.js
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/index.js
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/FlatButtonGroup/FlatButton.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/FlatButton.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/FlatButtonGroup/FlatButton.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/FlatButton.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/FlatButtonGroup/FlatButtonGroup.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/FlatButtonGroup.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/FlatButtonGroup/FlatButtonGroup.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/FlatButtonGroup.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/FlatButtonGroup/index.js b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/index.js
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/FlatButtonGroup/index.js
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/index.js
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/IconSelect/IconSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/IconSelect.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/IconSelect/IconSelect.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/IconSelect.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/IconSelect/icons.js b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/icons.js
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/IconSelect/icons.js
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/icons.js
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/IconSelect/index.js b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/index.js
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/IconSelect/index.js
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/index.js
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/Input.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/Input.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/Input.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/Input.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/LayoutSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/LayoutSelect.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/LayoutSelect.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/LayoutSelect.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/MultiOptionSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiOptionSelect.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/MultiOptionSelect.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiOptionSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiTableViewFieldSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiTableViewFieldSelect.svelte
new file mode 100644
index 0000000000..7d2f17a02b
--- /dev/null
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiTableViewFieldSelect.svelte
@@ -0,0 +1,5 @@
+<script>
+  import TableViewFieldSelect from "./TableViewFieldSelect.svelte"
+</script>
+
+<TableViewFieldSelect {...$$props} multiselect />
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/OptionSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionSelect.svelte
similarity index 98%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/OptionSelect.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionSelect.svelte
index 4b27b7ba17..3ee839fbd0 100644
--- a/packages/builder/src/components/userInterface/PropertyPanelControls/OptionSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionSelect.svelte
@@ -1,7 +1,7 @@
 <script>
   import { onMount } from "svelte"
   import Portal from "svelte-portal"
-  import { buildStyle } from "../../../helpers.js"
+  import { buildStyle } from "../../../../helpers.js"
 
   export let options = []
   export let value = ""
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/PropertyControl.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
similarity index 97%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/PropertyControl.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
index 3c1620c590..518f2fdb06 100644
--- a/packages/builder/src/components/userInterface/PropertyPanelControls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
@@ -8,7 +8,7 @@
     runtimeToReadableBinding,
   } from "builderStore/replaceBindings"
   import { DropdownMenu } from "@budibase/bbui"
-  import BindingDropdown from "components/userInterface/BindingDropdown.svelte"
+  import BindingDropdown from "components/userInterface/PropertiesPanel/BindingDropdown.svelte"
 
   export let label = ""
   export let bindable = true
diff --git a/packages/builder/src/components/userInterface/PropertyGroup.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyGroup.svelte
similarity index 72%
rename from packages/builder/src/components/userInterface/PropertyGroup.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyGroup.svelte
index 548e13399b..315dc9be9e 100644
--- a/packages/builder/src/components/userInterface/PropertyGroup.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyGroup.svelte
@@ -1,5 +1,5 @@
 <script>
-  import PropertyControl from "./PropertyPanelControls/PropertyControl.svelte"
+  import PropertyControl from "./PropertyControl.svelte"
   import { DetailSummary } from "@budibase/bbui"
 
   export let name = ""
@@ -10,14 +10,6 @@
   export let open = false
 
   const hasPropChanged = (style, prop) => {
-    // TODO: replace color picker with one that works better.
-    // Currently it cannot support null values, so this is a hack which
-    // prevents the color fields from always being marked as changed
-    if (!["color", "background", "border-color"].includes(prop.key)) {
-      if (prop.initialValue !== undefined) {
-        return style[prop.key] !== prop.initialValue
-      }
-    }
     return style[prop.key] != null && style[prop.key] !== ""
   }
 
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/RoleSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/RoleSelect.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/ScreenSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ScreenSelect.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/ScreenSelect.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/ScreenSelect.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/TableSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableSelect.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/TableSelect.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableSelect.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/TableViewFieldSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewFieldSelect.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/TableViewFieldSelect.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewFieldSelect.svelte
diff --git a/packages/builder/src/components/userInterface/PropertyPanelControls/TableViewSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte
similarity index 95%
rename from packages/builder/src/components/userInterface/PropertyPanelControls/TableViewSelect.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte
index f230c30216..f7a65965e1 100644
--- a/packages/builder/src/components/userInterface/PropertyPanelControls/TableViewSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { Button, Icon, DropdownMenu, Spacer, Heading } from "@budibase/bbui"
+  import { Icon, DropdownMenu, Heading } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { store, backendUiStore, currentAsset } from "builderStore"
-  import fetchBindableProperties from "../../../builderStore/fetchBindableProperties"
+  import fetchBindableProperties from "builderStore/fetchBindableProperties"
 
   const dispatch = createEventDispatcher()
   let anchorRight, dropdownRight
diff --git a/packages/builder/src/components/userInterface/SettingsView.svelte b/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
similarity index 91%
rename from packages/builder/src/components/userInterface/SettingsView.svelte
rename to packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
index d619beb6c8..2d6c5f4d83 100644
--- a/packages/builder/src/components/userInterface/SettingsView.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
@@ -8,16 +8,16 @@
   import LayoutSelect from "./PropertyPanelControls/LayoutSelect.svelte"
   import RoleSelect from "./PropertyPanelControls/RoleSelect.svelte"
   import OptionSelect from "./PropertyPanelControls/OptionSelect.svelte"
-  import MultiTableViewFieldSelect from "./MultiTableViewFieldSelect.svelte"
-  import Checkbox from "../common/Checkbox.svelte"
+  import MultiTableViewFieldSelect from "./PropertyPanelControls/MultiTableViewFieldSelect.svelte"
+  import Checkbox from "./PropertyPanelControls/Checkbox.svelte"
   import TableSelect from "components/userInterface/PropertyPanelControls/TableSelect.svelte"
   import TableViewSelect from "components/userInterface/PropertyPanelControls/TableViewSelect.svelte"
   import TableViewFieldSelect from "components/userInterface/PropertyPanelControls/TableViewFieldSelect.svelte"
   import EventsEditor from "components/userInterface/PropertyPanelControls/EventsEditor"
   import ScreenSelect from "components/userInterface/PropertyPanelControls/ScreenSelect.svelte"
-  import DetailScreenSelect from "components/userInterface/DetailScreenSelect.svelte"
+  import DetailScreenSelect from "components/userInterface/PropertyPanelControls/DetailScreenSelect.svelte"
   import IconSelect from "components/userInterface/PropertyPanelControls/IconSelect"
-  import Colorpicker from "@budibase/colorpicker"
+  import ColorPicker from "./ComponentPropertiesPanel.svelte"
 
   export let componentDefinition = {}
   export let componentInstance = {}
@@ -43,6 +43,7 @@
     detailURL: DetailScreenSelect,
     boolean: Checkbox,
     number: Input,
+    event: EventsEditor,
   }
   const getControl = type => {
     return controlMap[type]
diff --git a/packages/builder/src/components/userInterface/componentStyles.js b/packages/builder/src/components/design/PropertiesPanel/componentStyles.js
similarity index 99%
rename from packages/builder/src/components/userInterface/componentStyles.js
rename to packages/builder/src/components/design/PropertiesPanel/componentStyles.js
index a8857da370..96981a31ee 100644
--- a/packages/builder/src/components/userInterface/componentStyles.js
+++ b/packages/builder/src/components/design/PropertiesPanel/componentStyles.js
@@ -1,7 +1,7 @@
 import Input from "./PropertyPanelControls/Input.svelte"
 import OptionSelect from "./PropertyPanelControls/OptionSelect.svelte"
 import FlatButtonGroup from "./PropertyPanelControls/FlatButtonGroup"
-import Colorpicker from "@budibase/colorpicker"
+import Colorpicker from "./PropertyPanelControls/ColorPicker.svelte"
 
 export const layout = [
   {
@@ -467,7 +467,6 @@ export const typography = [
     label: "Color",
     key: "color",
     control: Colorpicker,
-    initialValue: "#000",
   },
   {
     label: "align",
@@ -511,7 +510,6 @@ export const background = [
     label: "Color",
     key: "background",
     control: Colorpicker,
-    initialValue: "#000",
   },
   {
     label: "Gradient",
@@ -634,7 +632,6 @@ export const border = [
     label: "Color",
     key: "border-color",
     control: Colorpicker,
-    initialValue: "#000",
   },
   {
     label: "Style",
diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/design/temporaryPanelStructure.js
similarity index 97%
rename from packages/builder/src/components/userInterface/temporaryPanelStructure.js
rename to packages/builder/src/components/design/temporaryPanelStructure.js
index 422d4201d3..230b0ce898 100644
--- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js
+++ b/packages/builder/src/components/design/temporaryPanelStructure.js
@@ -1,13 +1,13 @@
-import Input from "./PropertyPanelControls/Input.svelte"
-import OptionSelect from "./PropertyPanelControls/OptionSelect.svelte"
-import MultiTableViewFieldSelect from "./MultiTableViewFieldSelect.svelte"
+import Input from "./PropertiesPanel/PropertyPanelControls/Input.svelte"
+import OptionSelect from "./PropertiesPanel/PropertyPanelControls/OptionSelect.svelte"
+import MultiTableViewFieldSelect from "./PropertiesPanel/PropertyPanelControls/MultiTableViewFieldSelect.svelte"
 import Checkbox from "../common/Checkbox.svelte"
 import TableSelect from "components/userInterface/PropertyPanelControls/TableSelect.svelte"
 import TableViewSelect from "components/userInterface/PropertyPanelControls/TableViewSelect.svelte"
 import TableViewFieldSelect from "components/userInterface/PropertyPanelControls/TableViewFieldSelect.svelte"
 import Event from "components/userInterface/PropertyPanelControls/EventsEditor/EventPropertyControl.svelte"
 import ScreenSelect from "components/userInterface/PropertyPanelControls/ScreenSelect.svelte"
-import DetailScreenSelect from "components/userInterface/DetailScreenSelect.svelte"
+import DetailScreenSelect from "components/userInterface/PropertyPanelControls/DetailScreenSelect.svelte"
 import { IconSelect } from "components/userInterface/PropertyPanelControls/IconSelect"
 import Colorpicker from "@budibase/colorpicker"
 
@@ -37,28 +37,7 @@ export default {
       },
       children: [],
     },
-    {
-      _component: "@budibase/standard-components/button",
-      name: "Button",
-      description: "A basic html button that is ready for styling",
-      icon: "ri-share-box-line",
-      children: [],
-      properties: {
-        design: {
-          ...all,
-        },
-        settings: [
-          { label: "Text", key: "text", control: Input },
-          {
-            label: "Disabled",
-            key: "disabled",
-            valueKey: "checked",
-            control: Checkbox,
-          },
-          { label: "On Click", key: "onClick", control: Event },
-        ],
-      },
-    },
+
     {
       name: "Form",
       icon: "ri-file-edit-line",
diff --git a/packages/builder/src/components/userInterface/Feedback/FeedbackIframe.svelte b/packages/builder/src/components/feedback/FeedbackIframe.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/Feedback/FeedbackIframe.svelte
rename to packages/builder/src/components/feedback/FeedbackIframe.svelte
diff --git a/packages/builder/src/components/userInterface/Feedback/FeedbackNavLink.svelte b/packages/builder/src/components/feedback/FeedbackNavLink.svelte
similarity index 100%
rename from packages/builder/src/components/userInterface/Feedback/FeedbackNavLink.svelte
rename to packages/builder/src/components/feedback/FeedbackNavLink.svelte
diff --git a/packages/builder/src/components/userInterface/LayoutTemplateControls.svelte b/packages/builder/src/components/userInterface/LayoutTemplateControls.svelte
deleted file mode 100644
index 619b6a11d3..0000000000
--- a/packages/builder/src/components/userInterface/LayoutTemplateControls.svelte
+++ /dev/null
@@ -1,78 +0,0 @@
-<script>
-  export let meta = []
-  export let size = ""
-  export let values = []
-  export let propertyName
-  export let onStyleChanged = () => {}
-
-  let selectedLayoutValues = values.map(v => v)
-
-  $: onStyleChanged(selectedLayoutValues)
-
-  const PROPERTY_OPTIONS = {
-    Direction: {
-      vertical: ["column", "ri-arrow-up-down-line"],
-      horizontal: ["row", "ri-arrow-left-right-line"],
-    },
-    Align: {
-      left: ["flex-start", "ri-layout-bottom-line"],
-      center: ["center", "ri-layout-row-line"],
-      right: ["flex-end", "ri-layout-top-line"],
-      space: ["space-between", "ri-space"],
-    },
-    Justify: {
-      left: ["flex-start", "ri-layout-left-line"],
-      center: ["center", "ri-layout-column-line"],
-      right: ["flex-end", "ri-layout-right-line"],
-      space: ["space-between", "ri-space"],
-    },
-  }
-
-  $: propertyChoices = Object.entries(PROPERTY_OPTIONS[propertyName])
-</script>
-
-<div class="inputs {size}">
-  {#each meta as { placeholder }, i}
-    {#each propertyChoices as [displayName, [cssPropValue, icon]]}
-      <button
-        class:selected={cssPropValue === selectedLayoutValues[i]}
-        on:click={() => {
-          const newPropertyValue = cssPropValue === selectedLayoutValues[i] ? '' : cssPropValue
-          selectedLayoutValues[i] = newPropertyValue
-        }}>
-        <i class={icon} />
-      </button>
-    {/each}
-  {/each}
-</div>
-
-<style>
-  .selected {
-    color: var(--blue);
-    background: var(--grey-1);
-    opacity: 1;
-  }
-
-  button {
-    cursor: pointer;
-    outline: none;
-    border: none;
-    border-radius: 3px;
-
-    min-width: 1.6rem;
-    min-height: 1.6rem;
-
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    font-size: 1.2rem;
-    font-weight: 500;
-    color: var(--ink);
-  }
-
-  .inputs {
-    display: flex;
-    justify-content: space-between;
-  }
-</style>
diff --git a/packages/builder/src/components/userInterface/MultiTableViewFieldSelect.svelte b/packages/builder/src/components/userInterface/MultiTableViewFieldSelect.svelte
deleted file mode 100644
index 710ce0f811..0000000000
--- a/packages/builder/src/components/userInterface/MultiTableViewFieldSelect.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-  import TableViewFieldSelect from "./PropertyPanelControls/TableViewFieldSelect.svelte"
-</script>
-
-<TableViewFieldSelect {...$$props} multiselect />
diff --git a/packages/builder/src/pages/[application]/_reset.svelte b/packages/builder/src/pages/[application]/_reset.svelte
index a02287a89e..478980995e 100644
--- a/packages/builder/src/pages/[application]/_reset.svelte
+++ b/packages/builder/src/pages/[application]/_reset.svelte
@@ -3,7 +3,7 @@
   import { Button } from "@budibase/bbui"
   import SettingsLink from "components/settings/Link.svelte"
   import ThemeEditorDropdown from "components/settings/ThemeEditorDropdown.svelte"
-  import FeedbackNavLink from "components/userInterface/Feedback/FeedbackNavLink.svelte"
+  import FeedbackNavLink from "components/Feedback/FeedbackNavLink.svelte"
   import { get } from "builderStore/api"
   import { isActive, goto, layout } from "@sveltech/routify"
 
diff --git a/packages/builder/src/pages/[application]/deploy/index.svelte b/packages/builder/src/pages/[application]/deploy/index.svelte
index 462601ff48..c372044b24 100644
--- a/packages/builder/src/pages/[application]/deploy/index.svelte
+++ b/packages/builder/src/pages/[application]/deploy/index.svelte
@@ -7,7 +7,7 @@
   import Spinner from "components/common/Spinner.svelte"
   import DeploymentHistory from "components/deploy/DeploymentHistory.svelte"
   import analytics from "analytics"
-  import FeedbackIframe from "components/userInterface/Feedback/FeedbackIframe.svelte"
+  import FeedbackIframe from "components/Feedback/FeedbackIframe.svelte"
 
   let loading = false
   let deployments = []
diff --git a/packages/builder/src/pages/[application]/design/[assetType]/_layout.svelte b/packages/builder/src/pages/[application]/design/[assetType]/_layout.svelte
index df013f2abe..252538a4d0 100644
--- a/packages/builder/src/pages/[application]/design/[assetType]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/design/[assetType]/_layout.svelte
@@ -7,9 +7,9 @@
   } from "builderStore"
   import { onMount } from "svelte"
   import CurrentItemPreview from "components/userInterface/AppPreview"
-  import ComponentPropertiesPanel from "components/userInterface/ComponentPropertiesPanel.svelte"
-  import ComponentSelectionList from "components/userInterface/ComponentSelectionList.svelte"
-  import FrontendNavigatePane from "components/userInterface/FrontendNavigatePane.svelte"
+  import ComponentPropertiesPanel from "components/userInterface/PropertiesPanel/ComponentPropertiesPanel.svelte"
+  import ComponentSelectionList from "components/userInterface/AppPreview/ComponentSelectionList.svelte"
+  import FrontendNavigatePane from "components/userInterface/NavigationPanel/FrontendNavigatePane.svelte"
 
   $: instance = $store.appInstance
 
diff --git a/packages/standard-components/components.json b/packages/standard-components/components.json
index 8a801a9fcb..c4304235fd 100644
--- a/packages/standard-components/components.json
+++ b/packages/standard-components/components.json
@@ -21,39 +21,6 @@
 			"logoUrl": "string"
 		}
 	},
-	"button": {
-		"name": "Button",
-		"description": "an html <button />",
-		"props": {
-			"text": "string",
-			"disabled": "bool",
-			"onClick": "event"
-		},
-		"tags": [
-			"layout"
-		],
-		"presets": {
-			"primary": {
-				"contentText": "Primary Button Preset",
-				"color": "papayawhip",
-				"padding": "20px",
-				"background": "blue"
-			},
-			"secondary": {
-				"contentText": "Secondary Button Preset",
-				"color": "rebeccapurple",
-				"padding": "10px",
-				"background": "#fff",
-				"border": "1px solid red"
-			},
-			"error": {
-				"contentText": "ERROR",
-				"color": "red",
-				"padding": "10px",
-				"border": "1px solid red"
-			}
-		}
-	},
 	"login": {
 		"name": "Login Control",
 		"description": "A control that accepts email, password an also handles password resets",
diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index 67d3d9d080..3137c43c1e 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -75,5 +75,29 @@
     "name": "Screenslot",
     "description": "Contains your app screens",
     "styleable": true
+  },
+  "button": {
+    "name": "Button",
+    "description": "A basic html button that is ready for styling",
+    "icon": "ri-share-box-line",
+    "styleable": true,
+    "settings": [
+      {
+        "type": "text",
+        "label": "Text",
+        "key": "text"
+      },
+      {
+        "type": "boolean",
+        "label": "Disabled",
+        "key": "disabled",
+        "valueKey": "checked"
+      },
+      {
+        "type": "event",
+        "label": "On Click",
+        "key": "onClick"
+      }
+    ]
   }
 }
diff --git a/packages/standard-components/src/Button.svelte b/packages/standard-components/src/Button.svelte
index e2a98bb74d..5f165fa9de 100644
--- a/packages/standard-components/src/Button.svelte
+++ b/packages/standard-components/src/Button.svelte
@@ -6,7 +6,7 @@
 
   export let className = "default"
   export let disabled = false
-  export let text
+  export let text = ""
   export let onClick
 </script>
 
diff --git a/packages/standard-components/src/index.js b/packages/standard-components/src/index.js
index 487d639fb4..bf1dbceb4e 100644
--- a/packages/standard-components/src/index.js
+++ b/packages/standard-components/src/index.js
@@ -8,12 +8,12 @@ import "@spectrum-css/vars/dist/spectrum-light.css"
 export { default as container } from "./Container.svelte"
 export { default as grid } from "./grid/Component.svelte"
 export { default as screenslot } from "./ScreenSlot.svelte"
+export { default as button } from "./Button.svelte"
 
 // export { default as text } from "./Text.svelte"
 // export { default as heading } from "./Heading.svelte"
 // export { default as input } from "./Input.svelte"
 // export { default as richtext } from "./RichText.svelte"
-// export { default as button } from "./Button.svelte"
 // export { default as login } from "./Login.svelte"
 // export { default as link } from "./Link.svelte"
 // export { default as image } from "./Image.svelte"