diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index 8cbc629291..b469eb3048 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -20,7 +20,7 @@ import {
 } from "@budibase/string-templates"
 import { TableNames } from "../constants"
 import { JSONUtils } from "@budibase/frontend-core"
-import ActionDefinitions from "components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/manifest.json"
+import ActionDefinitions from "components/design/settings/controls/ButtonActionEditor/manifest.json"
 
 // Regex to match all instances of template strings
 const CAPTURE_VAR_INSIDE_TEMPLATE = /{{([^}]+)}}/g
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 856ab5f31a..392ac64606 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -27,7 +27,7 @@
   import Editor from "components/integration/QueryEditor.svelte"
   import { debounce } from "lodash"
   import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
-  import FilterDrawer from "components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte"
+  import FilterDrawer from "components/design/settings/controls/FilterEditor/FilterDrawer.svelte"
   import { LuceneUtils } from "@budibase/frontend-core"
   import { getSchemaForTable } from "builderStore/dataBinding"
 
diff --git a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
index cf9e4b1358..633c7e1ad1 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { createEventDispatcher } from "svelte"
   import { ActionButton, Modal, ModalContent } from "@budibase/bbui"
-  import FilterDrawer from "components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte"
+  import FilterDrawer from "components/design/settings/controls/FilterEditor/FilterDrawer.svelte"
 
   export let schema
   export let filters
diff --git a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte b/packages/builder/src/components/design/_old/FrontendNavigatePane.svelte
similarity index 94%
rename from packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
rename to packages/builder/src/components/design/_old/FrontendNavigatePane.svelte
index 9d8d1cc8cc..6e319f06a0 100644
--- a/packages/builder/src/components/design/NavigationPanel/FrontendNavigatePane.svelte
+++ b/packages/builder/src/components/design/_old/FrontendNavigatePane.svelte
@@ -3,9 +3,9 @@
   import { goto, params } from "@roxi/routify"
   import { store, selectedAccessRole, screenSearchString } from "builderStore"
   import { roles } from "stores/backend"
-  import ComponentNavigationTree from "components/design/NavigationPanel/ComponentNavigationTree/index.svelte"
-  import Layout from "components/design/NavigationPanel/Layout.svelte"
-  import NewLayoutModal from "components/design/NavigationPanel/NewLayoutModal.svelte"
+  import ComponentNavigationTree from "components/design/navigation/ComponentNavigationTree/index.svelte"
+  import Layout from "components/design/navigation/Layout.svelte"
+  import NewLayoutModal from "components/design/navigation/NewLayoutModal.svelte"
   import {
     Icon,
     Modal,
diff --git a/packages/builder/src/components/design/NavigationPanel/Layout.svelte b/packages/builder/src/components/design/_old/Layout.svelte
similarity index 100%
rename from packages/builder/src/components/design/NavigationPanel/Layout.svelte
rename to packages/builder/src/components/design/_old/Layout.svelte
diff --git a/packages/builder/src/components/design/NavigationPanel/NavigationSelectionModal.svelte b/packages/builder/src/components/design/_old/NavigationSelectionModal.svelte
similarity index 100%
rename from packages/builder/src/components/design/NavigationPanel/NavigationSelectionModal.svelte
rename to packages/builder/src/components/design/_old/NavigationSelectionModal.svelte
diff --git a/packages/builder/src/components/design/NavigationPanel/NewLayoutModal.svelte b/packages/builder/src/components/design/_old/NewLayoutModal.svelte
similarity index 100%
rename from packages/builder/src/components/design/NavigationPanel/NewLayoutModal.svelte
rename to packages/builder/src/components/design/_old/NewLayoutModal.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertiesPanel.svelte b/packages/builder/src/components/design/_old/PropertiesPanel/PropertiesPanel.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertiesPanel.svelte
rename to packages/builder/src/components/design/_old/PropertiesPanel/PropertiesPanel.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/ScreenSettingsSection.svelte b/packages/builder/src/components/design/_old/PropertiesPanel/ScreenSettingsSection.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/ScreenSettingsSection.svelte
rename to packages/builder/src/components/design/_old/PropertiesPanel/ScreenSettingsSection.svelte
diff --git a/packages/builder/src/components/design/_old/[assetType]/_layout.svelte b/packages/builder/src/components/design/_old/[assetType]/_layout.svelte
index 7a90d22fde..264e245d95 100644
--- a/packages/builder/src/components/design/_old/[assetType]/_layout.svelte
+++ b/packages/builder/src/components/design/_old/[assetType]/_layout.svelte
@@ -5,7 +5,7 @@
   import CurrentItemPreview from "components/design/AppPreview"
   import PropertiesPanel from "components/design/PropertiesPanel/PropertiesPanel.svelte"
   import ComponentSelectionList from "components/design/AppPreview/ComponentSelectionList.svelte"
-  import FrontendNavigatePane from "components/design/NavigationPanel/FrontendNavigatePane.svelte"
+  import FrontendNavigatePane from "components/design/navigation/FrontendNavigatePane.svelte"
   import { goto, leftover, params } from "@roxi/routify"
   import { FrontendTypes } from "constants"
   import { findComponent, findComponentPath } from "builderStore/componentUtils"
@@ -14,7 +14,7 @@
   import ThemeEditor from "components/design/AppPreview/ThemeEditor.svelte"
   import DevicePreviewSelect from "components/design/AppPreview/DevicePreviewSelect.svelte"
   import Logo from "assets/bb-space-man.svg"
-  import ScreenWizard from "components/design/NavigationPanel/ScreenWizard.svelte"
+  import ScreenWizard from "components/design/navigation/ScreenWizard.svelte"
 
   // Cache previous values so we don't update the URL more than necessary
   let previousType
diff --git a/packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte b/packages/builder/src/components/design/navigation/NavigationPanel.svelte
similarity index 100%
rename from packages/builder/src/components/design/NavigationPanel/NavigationPanel.svelte
rename to packages/builder/src/components/design/navigation/NavigationPanel.svelte
diff --git a/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte b/packages/builder/src/components/design/settings/SettingsPanel.svelte
similarity index 84%
rename from packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte
rename to packages/builder/src/components/design/settings/SettingsPanel.svelte
index 1f20bfa542..cce3d256d2 100644
--- a/packages/builder/src/components/design/SettingsPanel/SettingsPanel.svelte
+++ b/packages/builder/src/components/design/settings/SettingsPanel.svelte
@@ -16,7 +16,9 @@
       </div>
     </div>
   {/if}
-  <slot />
+  <div class="body">
+    <slot />
+  </div>
 </div>
 
 <style>
@@ -28,7 +30,6 @@
     flex-direction: column;
     justify-content: flex-start;
     align-items: stretch;
-    overflow: auto;
   }
   .header {
     flex: 0 0 48px;
@@ -53,4 +54,13 @@
     text-overflow: ellipsis;
     white-space: nowrap;
   }
+  .body {
+    flex: 1 1 auto;
+    overflow: auto;
+    overflow-x: hidden;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: stretch;
+  }
 </style>
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js
similarity index 56%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js
rename to packages/builder/src/components/design/settings/componentSettings.js
index 23a0a312bc..b6d24ee893 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/componentSettings.js
+++ b/packages/builder/src/components/design/settings/componentSettings.js
@@ -1,24 +1,24 @@
 import { Checkbox, Select, Stepper } from "@budibase/bbui"
-import DataSourceSelect from "./DataSourceSelect.svelte"
-import S3DataSourceSelect from "./S3DataSourceSelect.svelte"
-import DataProviderSelect from "./DataProviderSelect.svelte"
-import ButtonActionEditor from "./ButtonActionEditor/ButtonActionEditor.svelte"
-import TableSelect from "./TableSelect.svelte"
-import ColorPicker from "./ColorPicker.svelte"
-import { IconSelect } from "./IconSelect"
-import FieldSelect from "./FieldSelect.svelte"
-import MultiFieldSelect from "./MultiFieldSelect.svelte"
-import SearchFieldSelect from "./SearchFieldSelect.svelte"
-import SchemaSelect from "./SchemaSelect.svelte"
-import SectionSelect from "./SectionSelect.svelte"
-import NavigationEditor from "./NavigationEditor/NavigationEditor.svelte"
-import FilterEditor from "./FilterEditor/FilterEditor.svelte"
-import URLSelect from "./URLSelect.svelte"
-import OptionsEditor from "./OptionsEditor/OptionsEditor.svelte"
-import FormFieldSelect from "./FormFieldSelect.svelte"
-import ValidationEditor from "./ValidationEditor/ValidationEditor.svelte"
+import DataSourceSelect from "./controls/DataSourceSelect.svelte"
+import S3DataSourceSelect from "./controls/S3DataSourceSelect.svelte"
+import DataProviderSelect from "./controls/DataProviderSelect.svelte"
+import ButtonActionEditor from "./controls/ButtonActionEditor/ButtonActionEditor.svelte"
+import TableSelect from "./controls/TableSelect.svelte"
+import ColorPicker from "./controls/ColorPicker.svelte"
+import { IconSelect } from "./controls/IconSelect"
+import FieldSelect from "./controls/FieldSelect.svelte"
+import MultiFieldSelect from "./controls/MultiFieldSelect.svelte"
+import SearchFieldSelect from "./controls/SearchFieldSelect.svelte"
+import SchemaSelect from "./controls/SchemaSelect.svelte"
+import SectionSelect from "./controls/SectionSelect.svelte"
+import NavigationEditor from "./controls/NavigationEditor/NavigationEditor.svelte"
+import FilterEditor from "./controls/FilterEditor/FilterEditor.svelte"
+import URLSelect from "./controls/URLSelect.svelte"
+import OptionsEditor from "./controls/OptionsEditor/OptionsEditor.svelte"
+import FormFieldSelect from "./controls/FormFieldSelect.svelte"
+import ValidationEditor from "./controls/ValidationEditor/ValidationEditor.svelte"
 import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
-import ColumnEditor from "./ColumnEditor/ColumnEditor.svelte"
+import ColumnEditor from "./controls/ColumnEditor/ColumnEditor.svelte"
 
 const componentMap = {
   text: DrawerBindableCombobox,
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/ButtonActionDrawer.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/ButtonActionDrawer.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/ButtonActionEditor.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/ButtonActionEditor.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ChangeFormStep.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ChangeFormStep.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ClearForm.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ClearForm.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/CloseScreenModal.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/CloseScreenModal.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ContinueIf.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ContinueIf.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/DeleteRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/DeleteRow.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/DuplicateRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/DuplicateRow.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExecuteQuery.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExportData.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ExportData.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/LogOut.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/LogOut.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/LogOut.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/LogOut.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/NavigateTo.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/NavigateTo.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/RefreshDataProvider.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/RefreshDataProvider.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/S3Upload.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/S3Upload.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/SaveFields.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveFields.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/SaveFields.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveFields.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/SaveRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/SaveRow.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/TriggerAutomation.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/UpdateFieldValue.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/UpdateFieldValue.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/UpdateState.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/UpdateState.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ValidateForm.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/ValidateForm.svelte
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/index.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/actions/index.js
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/index.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/index.js
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/manifest.json b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ButtonActionEditor/manifest.json
rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte b/packages/builder/src/components/design/settings/controls/ColorPicker.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte
rename to packages/builder/src/components/design/settings/controls/ColorPicker.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/CellDrawer.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/CellDrawer.svelte
rename to packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/CellEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/CellEditor.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/CellEditor.svelte
rename to packages/builder/src/components/design/settings/controls/ColumnEditor/CellEditor.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte
rename to packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnEditor.svelte
rename to packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataProviderSelect.svelte b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataProviderSelect.svelte
rename to packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/DataSourceSelect.svelte
rename to packages/builder/src/components/design/settings/controls/DataSourceSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FieldSelect.svelte
rename to packages/builder/src/components/design/settings/controls/FieldSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
rename to packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterEditor.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterEditor.svelte
rename to packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/FlatButton.svelte b/packages/builder/src/components/design/settings/controls/FlatButtonGroup/FlatButton.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/FlatButton.svelte
rename to packages/builder/src/components/design/settings/controls/FlatButtonGroup/FlatButton.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/FlatButtonGroup.svelte b/packages/builder/src/components/design/settings/controls/FlatButtonGroup/FlatButtonGroup.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/FlatButtonGroup.svelte
rename to packages/builder/src/components/design/settings/controls/FlatButtonGroup/FlatButtonGroup.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/index.js b/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FlatButtonGroup/index.js
rename to packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FormFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/FormFieldSelect.svelte
rename to packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/IconSelect.svelte b/packages/builder/src/components/design/settings/controls/IconSelect/IconSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/IconSelect.svelte
rename to packages/builder/src/components/design/settings/controls/IconSelect/IconSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/icons.js b/packages/builder/src/components/design/settings/controls/IconSelect/icons.js
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/icons.js
rename to packages/builder/src/components/design/settings/controls/IconSelect/icons.js
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/index.js b/packages/builder/src/components/design/settings/controls/IconSelect/index.js
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/IconSelect/index.js
rename to packages/builder/src/components/design/settings/controls/IconSelect/index.js
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/LayoutSelect.svelte b/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/LayoutSelect.svelte
rename to packages/builder/src/components/design/settings/controls/LayoutSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiFieldSelect.svelte
rename to packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/NavigationEditor/NavigationDrawer.svelte b/packages/builder/src/components/design/settings/controls/NavigationEditor/NavigationDrawer.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/NavigationEditor/NavigationDrawer.svelte
rename to packages/builder/src/components/design/settings/controls/NavigationEditor/NavigationDrawer.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/NavigationEditor/NavigationEditor.svelte b/packages/builder/src/components/design/settings/controls/NavigationEditor/NavigationEditor.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/NavigationEditor/NavigationEditor.svelte
rename to packages/builder/src/components/design/settings/controls/NavigationEditor/NavigationEditor.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsDrawer.svelte b/packages/builder/src/components/design/settings/controls/OptionsEditor/OptionsDrawer.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsDrawer.svelte
rename to packages/builder/src/components/design/settings/controls/OptionsEditor/OptionsDrawer.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte b/packages/builder/src/components/design/settings/controls/OptionsEditor/OptionsEditor.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/OptionsEditor/OptionsEditor.svelte
rename to packages/builder/src/components/design/settings/controls/OptionsEditor/OptionsEditor.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
rename to packages/builder/src/components/design/settings/controls/PropertyControl.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ResetFieldsButton.svelte b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ResetFieldsButton.svelte
rename to packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte
rename to packages/builder/src/components/design/settings/controls/RoleSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/S3DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/S3DataSourceSelect.svelte
rename to packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SchemaSelect.svelte b/packages/builder/src/components/design/settings/controls/SchemaSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/SchemaSelect.svelte
rename to packages/builder/src/components/design/settings/controls/SchemaSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte
rename to packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SectionSelect.svelte b/packages/builder/src/components/design/settings/controls/SectionSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/SectionSelect.svelte
rename to packages/builder/src/components/design/settings/controls/SectionSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableSelect.svelte b/packages/builder/src/components/design/settings/controls/TableSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableSelect.svelte
rename to packages/builder/src/components/design/settings/controls/TableSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/URLSelect.svelte b/packages/builder/src/components/design/settings/controls/URLSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/URLSelect.svelte
rename to packages/builder/src/components/design/settings/controls/URLSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationDrawer.svelte
rename to packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationEditor.svelte b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationEditor.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ValidationEditor/ValidationEditor.svelte
rename to packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationEditor.svelte
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentSettingsPanel.svelte
deleted file mode 100644
index 335e46b447..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentSettingsPanel.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-  import SettingsPanel from "components/design/SettingsPanel/SettingsPanel.svelte"
-</script>
-
-<SettingsPanel title="Components" />
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/navigation/ComponentDropdownMenu.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentDropdownMenu.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/navigation/ComponentDropdownMenu.svelte
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/navigation/ComponentNavigationPanel.svelte
similarity index 96%
rename from packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentNavigationPanel.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/navigation/ComponentNavigationPanel.svelte
index 98d087d8de..fa16a74f0b 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/navigation/ComponentNavigationPanel.svelte
@@ -1,5 +1,5 @@
 <script>
-  import NavigationPanel from "components/design/NavigationPanel/NavigationPanel.svelte"
+  import NavigationPanel from "components/design/navigation/NavigationPanel.svelte"
   import ComponentTree from "./ComponentTree.svelte"
   import instantiateStore from "./dragDropStore.js"
   import { goto } from "@roxi/routify"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentTree.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/navigation/ComponentTree.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ComponentTree.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/navigation/ComponentTree.svelte
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ScreenslotDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/navigation/ScreenslotDropdownMenu.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/ScreenslotDropdownMenu.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/navigation/ScreenslotDropdownMenu.svelte
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/dragDropStore.js b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/navigation/dragDropStore.js
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/dragDropStore.js
rename to packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/navigation/dragDropStore.js
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/ComponentSettingsPanel.svelte
new file mode 100644
index 0000000000..baaae7b08c
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/ComponentSettingsPanel.svelte
@@ -0,0 +1,37 @@
+<script>
+  import SettingsPanel from "components/design/settings/SettingsPanel.svelte"
+  import { store, selectedComponent, currentAsset } from "builderStore"
+  import ComponentSettingsSection from "./ComponentSettingsSection.svelte"
+  import DesignSection from "./DesignSection.svelte"
+  import CustomStylesSection from "./CustomStylesSection.svelte"
+  import ConditionalUISection from "./ConditionalUISection.svelte"
+  import {
+    getBindableProperties,
+    getComponentBindableProperties,
+  } from "builderStore/dataBinding"
+
+  $: componentInstance = $selectedComponent
+  $: componentDefinition = store.actions.components.getDefinition(
+    $selectedComponent?._component
+  )
+  $: bindings = getBindableProperties($currentAsset, $store.selectedComponentId)
+  $: componentBindings = getComponentBindableProperties(
+    $currentAsset,
+    $store.selectedComponentId
+  )
+</script>
+
+<SettingsPanel
+  title={$selectedComponent._instanceName}
+  icon={componentDefinition.icon}
+>
+  <ComponentSettingsSection
+    {componentInstance}
+    {componentDefinition}
+    {bindings}
+    {componentBindings}
+  />
+  <DesignSection {componentInstance} {componentDefinition} {bindings} />
+  <CustomStylesSection {componentInstance} {componentDefinition} {bindings} />
+  <ConditionalUISection {componentInstance} {componentDefinition} {bindings} />
+</SettingsPanel>
diff --git a/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/ComponentSettingsSection.svelte
similarity index 89%
rename from packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/ComponentSettingsSection.svelte
index a043cca619..d1ba42a656 100644
--- a/packages/builder/src/components/design/PropertiesPanel/ComponentSettingsSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/ComponentSettingsSection.svelte
@@ -2,11 +2,11 @@
   import { isEmpty } from "lodash/fp"
   import { Input, DetailSummary, notifications } from "@budibase/bbui"
   import { store } from "builderStore"
-  import PropertyControl from "./PropertyControls/PropertyControl.svelte"
-  import LayoutSelect from "./PropertyControls/LayoutSelect.svelte"
-  import RoleSelect from "./PropertyControls/RoleSelect.svelte"
-  import ResetFieldsButton from "./PropertyControls/ResetFieldsButton.svelte"
-  import { getComponentForSettingType } from "./PropertyControls/componentSettings"
+  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
+  import LayoutSelect from "components/design/settings/controls/LayoutSelect.svelte"
+  import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
+  import ResetFieldsButton from "components/design/settings/controls/ResetFieldsButton.svelte"
+  import { getComponentForSettingType } from "components/design/settings/componentSettings"
   import { Utils } from "@budibase/frontend-core"
 
   export let componentDefinition
@@ -33,7 +33,7 @@
     const customSections = settings.filter(setting => setting.section)
     return [
       {
-        name: componentDefinition?.name || "General",
+        name: "General",
         info: componentDefinition?.info,
         settings: generalSettings,
       },
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/ConditionalUIDrawer.svelte
similarity index 97%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/ConditionalUIDrawer.svelte
index 11d19edf7c..2605343c45 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ConditionalUIDrawer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/ConditionalUIDrawer.svelte
@@ -14,8 +14,8 @@
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { LuceneUtils, Constants } from "@budibase/frontend-core"
   import { selectedComponent } from "builderStore"
-  import { getComponentForSettingType } from "./componentSettings"
-  import PropertyControl from "./PropertyControl.svelte"
+  import { getComponentForSettingType } from "components/design/settings/componentSettings"
+  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
   import { getComponentSettings } from "builderStore/componentUtils"
 
   export let conditions = []
diff --git a/packages/builder/src/components/design/PropertiesPanel/ConditionalUISection.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/ConditionalUISection.svelte
similarity index 93%
rename from packages/builder/src/components/design/PropertiesPanel/ConditionalUISection.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/ConditionalUISection.svelte
index b0863dce83..ba84b67622 100644
--- a/packages/builder/src/components/design/PropertiesPanel/ConditionalUISection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/ConditionalUISection.svelte
@@ -7,7 +7,7 @@
     notifications,
   } from "@budibase/bbui"
   import { store } from "builderStore"
-  import ConditionalUIDrawer from "./PropertyControls/ConditionalUIDrawer.svelte"
+  import ConditionalUIDrawer from "./ConditionalUIDrawer.svelte"
 
   export let componentInstance
   export let bindings
diff --git a/packages/builder/src/components/design/PropertiesPanel/CustomStylesSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/CustomStylesSection.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/CustomStylesSection.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/CustomStylesSection.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/DesignSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/DesignSection.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/DesignSection.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/DesignSection.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/StyleSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/StyleSection.svelte
similarity index 94%
rename from packages/builder/src/components/design/PropertiesPanel/StyleSection.svelte
rename to packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/StyleSection.svelte
index aa5147fa62..e34ea1019a 100644
--- a/packages/builder/src/components/design/PropertiesPanel/StyleSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/StyleSection.svelte
@@ -1,5 +1,5 @@
 <script>
-  import PropertyControl from "./PropertyControls/PropertyControl.svelte"
+  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
   import { DetailSummary, notifications } from "@budibase/bbui"
   import { store } from "builderStore"
 
diff --git a/packages/builder/src/components/design/PropertiesPanel/componentStyles.js b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/componentStyles.js
similarity index 99%
rename from packages/builder/src/components/design/PropertiesPanel/componentStyles.js
rename to packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/componentStyles.js
index 20d6b590ed..d4912241b3 100644
--- a/packages/builder/src/components/design/PropertiesPanel/componentStyles.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/[componentId]/_components/settings/componentStyles.js
@@ -1,5 +1,5 @@
 import { Input, Select } from "@budibase/bbui"
-import ColorPicker from "./PropertyControls/ColorPicker.svelte"
+import ColorPicker from "components/design/settings/controls/ColorPicker.svelte"
 
 export const margin = {
   label: "Margin",
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 f24897f658..c5ddc8cbb7 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,6 +1,6 @@
 <script>
-  import ComponentNavigationPanel from "./_components/ComponentNavigationPanel.svelte"
-  import ComponentSettingsPanel from "./_components/ComponentSettingsPanel.svelte"
+  import ComponentNavigationPanel from "./_components/navigation/ComponentNavigationPanel.svelte"
+  import ComponentSettingsPanel from "./_components/settings/ComponentSettingsPanel.svelte"
 </script>
 
 <ComponentNavigationPanel />
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/NewComponentPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/NewComponentPanel.svelte
index b3315403af..33a254e0f2 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/NewComponentPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/NewComponentPanel.svelte
@@ -1,5 +1,5 @@
 <script>
-  import NavigationPanel from "components/design/NavigationPanel/NavigationPanel.svelte"
+  import NavigationPanel from "components/design/navigation/NavigationPanel.svelte"
   import { goto } from "@roxi/routify"
   import {
     Layout,
diff --git a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/NewComponentTargetPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/NewComponentTargetPanel.svelte
index fd43983d9c..46b00c90eb 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/NewComponentTargetPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/components/[screenId]/new/_components/NewComponentTargetPanel.svelte
@@ -1,5 +1,5 @@
 <script>
-  import SettingsPanel from "components/design/SettingsPanel/SettingsPanel.svelte"
+  import SettingsPanel from "components/design/settings/SettingsPanel.svelte"
   import { Body, Layout } from "@budibase/bbui"
 </script>
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenDropdownMenu.svelte
index 0ca94d4c13..e9179ee828 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenDropdownMenu.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenDropdownMenu.svelte
@@ -62,14 +62,6 @@
       notifications.error("Error deleting screen")
     }
   }
-
-  const pasteComponent = mode => {
-    try {
-      store.actions.components.paste(screen?.props, mode)
-    } catch (error) {
-      notifications.error("Error saving component")
-    }
-  }
 </script>
 
 <ActionMenu>
@@ -77,13 +69,6 @@
     <Icon size="S" hoverable name="MoreSmallList" />
   </div>
   <MenuItem icon="Duplicate" on:click={duplicateScreen}>Duplicate</MenuItem>
-  <MenuItem
-    icon="ShowOneLayer"
-    on:click={() => pasteComponent("inside")}
-    disabled={!$store.componentToPaste}
-  >
-    Paste inside
-  </MenuItem>
   <MenuItem icon="Delete" on:click={confirmDeleteDialog.show}>Delete</MenuItem>
 </ActionMenu>
 
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 9728fb43c9..654a7272a8 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
@@ -1,6 +1,6 @@
 <script>
   import { Search, Layout, Select } from "@budibase/bbui"
-  import NavigationPanel from "components/design/NavigationPanel/NavigationPanel.svelte"
+  import NavigationPanel from "components/design/navigation/NavigationPanel.svelte"
   import { roles } from "stores/backend"
   import { store } from "builderStore"
   import NavItem from "components/common/NavItem.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenSettingsPanel.svelte
index 0ffd2d5748..8bbf35fbdc 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenSettingsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/screens/_components/ScreenSettingsPanel.svelte
@@ -1,5 +1,5 @@
 <script>
-  import SettingsPanel from "components/design/SettingsPanel/SettingsPanel.svelte"
+  import SettingsPanel from "components/design/settings/SettingsPanel.svelte"
   import { get } from "svelte/store"
   import { get as deepGet, setWith } from "lodash"
   import {
@@ -10,8 +10,8 @@
     Checkbox,
     notifications,
   } from "@budibase/bbui"
-  import PropertyControl from "components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte"
-  import RoleSelect from "components/design/PropertiesPanel/PropertyControls/RoleSelect.svelte"
+  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
+  import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
   import { selectedScreen, store } from "builderStore"
   import sanitizeUrl from "builderStore/store/screenTemplates/utils/sanitizeUrl"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/theme/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/theme/index.svelte
index f21267d810..f4959abc30 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/theme/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/theme/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import NavigationPanel from "components/design/NavigationPanel/NavigationPanel.svelte"
+  import NavigationPanel from "components/design/navigation/NavigationPanel.svelte"
   import { Body, Layout } from "@budibase/bbui"
   import ThemeEditor from "./_components/ThemeEditor.svelte"
 </script>