diff --git a/packages/builder/src/components/backend/DataTable/ModelDataTable.svelte b/packages/builder/src/components/backend/DataTable/ModelDataTable.svelte
index 6587451462..6565bf1766 100644
--- a/packages/builder/src/components/backend/DataTable/ModelDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ModelDataTable.svelte
@@ -1,8 +1,8 @@
 <script>
   import { backendUiStore } from "builderStore"
-  import RowPopover from "./popovers/Row.svelte"
-  import ColumnPopover from "./popovers/Column.svelte"
-  import ViewPopover from "./popovers/View.svelte"
+  import CreateRowButton from "./buttons/CreateRowButton.svelte"
+  import CreateColumnButton from "./buttons/CreateColumnButton.svelte"
+  import CreateViewButton from "./buttons/CreateViewButton.svelte"
   import * as api from "./api"
   import Table from "./Table.svelte"
 
@@ -22,9 +22,9 @@
 </script>
 
 <Table {title} {schema} {data} allowEditing={true}>
-  <ColumnPopover />
+  <CreateColumnButton />
   {#if Object.keys(schema).length > 0}
-    <RowPopover />
-    <ViewPopover />
+    <CreateRowButton />
+    <CreateViewButton />
   {/if}
 </Table>
diff --git a/packages/builder/src/components/backend/DataTable/popovers/RecordFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RecordFieldControl.svelte
similarity index 96%
rename from packages/builder/src/components/backend/DataTable/popovers/RecordFieldControl.svelte
rename to packages/builder/src/components/backend/DataTable/RecordFieldControl.svelte
index 10aeb56ae8..55129b47e3 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/RecordFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RecordFieldControl.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Input, Select, Label, DatePicker, Toggle } from "@budibase/bbui"
   import Dropzone from "components/common/Dropzone.svelte"
-  import { capitalise } from "../../../../helpers"
+  import { capitalise } from "../../../helpers"
 
   export let meta
   export let value = meta.type === "boolean" ? false : ""
diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index 0852a64097..a4d08fc6e3 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -9,13 +9,13 @@
   import ActionButton from "components/common/ActionButton.svelte"
   import AttachmentList from "./AttachmentList.svelte"
   import TablePagination from "./TablePagination.svelte"
-  import CreateEditRecordModal from "./popovers/CreateEditRecord.svelte"
-  import RowPopover from "./popovers/Row.svelte"
-  import ColumnPopover from "./popovers/Column.svelte"
-  import ViewPopover from "./popovers/View.svelte"
-  import ColumnHeaderPopover from "./popovers/ColumnHeader.svelte"
-  import EditRowPopover from "./popovers/EditRow.svelte"
-  import CalculationPopover from "./popovers/Calculate.svelte"
+  import CreateEditRecordModal from "./modals/CreateEditRecordModal.svelte"
+  import RowPopover from "./buttons/CreateRowButton.svelte"
+  import ColumnPopover from "./buttons/CreateColumnButton.svelte"
+  import ViewPopover from "./buttons/CreateViewButton.svelte"
+  import ColumnHeaderPopover from "./popovers/ColumnPopover.svelte"
+  import EditRowPopover from "./popovers/RowPopover.svelte"
+  import CalculationPopover from "./buttons/CalculateButton.svelte"
 
   const ITEMS_PER_PAGE = 10
 
@@ -32,9 +32,9 @@
   $: paginatedData =
     sorted && sorted.length
       ? sorted.slice(
-      currentPage * ITEMS_PER_PAGE,
-      currentPage * ITEMS_PER_PAGE + ITEMS_PER_PAGE,
-      )
+          currentPage * ITEMS_PER_PAGE,
+          currentPage * ITEMS_PER_PAGE + ITEMS_PER_PAGE
+        )
       : []
   $: modelId = data?.length ? data[0].modelId : null
 
@@ -42,7 +42,9 @@
     if (!record?.[fieldName]?.length) {
       return
     }
-    $goto(`/${$params.application}/backend/model/${modelId}/relationship/${record._id}/${fieldName}`)
+    $goto(
+      `/${$params.application}/backend/model/${modelId}/relationship/${record._id}/${fieldName}`
+    )
   }
 </script>
 
@@ -50,68 +52,68 @@
   <div class="table-controls">
     <h2 class="title">{title}</h2>
     <div class="popovers">
-      <slot/>
+      <slot />
     </div>
   </div>
   <table class="bb-table">
     <thead>
-    <tr>
-      {#if allowEditing}
-        <th class="edit-header">
-          <div>Edit</div>
-        </th>
-      {/if}
-      {#each columns as header}
-        <th>
-          {#if allowEditing}
-            <ColumnHeaderPopover field={schema[header]}/>
-          {:else}
-            <div class="header">{header}</div>
-          {/if}
-        </th>
-      {/each}
-    </tr>
-    </thead>
-    <tbody>
-    {#if paginatedData.length === 0}
-      {#if allowEditing}
-        <td class="no-border">No data.</td>
-      {/if}
-      {#each columns as header, idx}
-        <td class="no-border">
-          {#if idx === 0}No data.{/if}
-        </td>
-      {/each}
-    {/if}
-    {#each paginatedData as row}
       <tr>
         {#if allowEditing}
-          <td>
-            <EditRowPopover {row}/>
-          </td>
+          <th class="edit-header">
+            <div>Edit</div>
+          </th>
         {/if}
         {#each columns as header}
-          <td>
-            {#if schema[header].type === 'link'}
-              <div
-                  class:link={row[header] && row[header].length}
-                  on:click={() => selectRelationship(row, header)}>
-                {row[header] ? row[header].length : 0} linked row(s)
-              </div>
-            {:else if schema[header].type === 'attachment'}
-              <AttachmentList files={row[header] || []}/>
-            {:else}{getOr('', header, row)}{/if}
-          </td>
+          <th>
+            {#if allowEditing}
+              <ColumnHeaderPopover field={schema[header]} />
+            {:else}
+              <div class="header">{header}</div>
+            {/if}
+          </th>
         {/each}
       </tr>
-    {/each}
+    </thead>
+    <tbody>
+      {#if paginatedData.length === 0}
+        {#if allowEditing}
+          <td class="no-border">No data.</td>
+        {/if}
+        {#each columns as header, idx}
+          <td class="no-border">
+            {#if idx === 0}No data.{/if}
+          </td>
+        {/each}
+      {/if}
+      {#each paginatedData as row}
+        <tr>
+          {#if allowEditing}
+            <td>
+              <EditRowPopover {row} />
+            </td>
+          {/if}
+          {#each columns as header}
+            <td>
+              {#if schema[header].type === 'link'}
+                <div
+                  class:link={row[header] && row[header].length}
+                  on:click={() => selectRelationship(row, header)}>
+                  {row[header] ? row[header].length : 0} linked row(s)
+                </div>
+              {:else if schema[header].type === 'attachment'}
+                <AttachmentList files={row[header] || []} />
+              {:else}{getOr('', header, row)}{/if}
+            </td>
+          {/each}
+        </tr>
+      {/each}
     </tbody>
   </table>
   <TablePagination
-      {data}
-      bind:currentPage
-      pageItemCount={paginatedData.length}
-      {ITEMS_PER_PAGE}/>
+    {data}
+    bind:currentPage
+    pageItemCount={paginatedData.length}
+    {ITEMS_PER_PAGE} />
 </section>
 
 <style>
diff --git a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
index 41ddc734b1..4c7e6bb915 100644
--- a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
@@ -1,9 +1,9 @@
 <script>
   import api from "builderStore/api"
   import Table from "./Table.svelte"
-  import CalculationPopover from "./popovers/Calculate.svelte"
-  import GroupByPopover from "./popovers/GroupBy.svelte"
-  import FilterPopover from "./popovers/Filter.svelte"
+  import CalculateButton from "./buttons/CalculateButton.svelte"
+  import GroupByButton from "./buttons/GroupByButton.svelte"
+  import FilterButton from "./buttons/FilterButton.svelte"
 
   export let view = {}
 
@@ -34,9 +34,9 @@
 </script>
 
 <Table title={decodeURI(name)} schema={view.schema} {data}>
-  <FilterPopover {view} />
-  <CalculationPopover {view} />
+  <FilterButton {view} />
+  <CalculateButton {view} />
   {#if view.calculation}
-    <GroupByPopover {view} />
+    <GroupByButton {view} />
   {/if}
 </Table>
diff --git a/packages/builder/src/components/backend/DataTable/buttons/CalculateButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/CalculateButton.svelte
new file mode 100644
index 0000000000..efe3dcd79d
--- /dev/null
+++ b/packages/builder/src/components/backend/DataTable/buttons/CalculateButton.svelte
@@ -0,0 +1,19 @@
+<script>
+  import { Popover, TextButton, Icon } from "@budibase/bbui"
+  import CalculatePopover from "../popovers/CalculatePopover.svelte"
+
+  export let view = {}
+
+  let anchor
+  let dropdown
+</script>
+
+<div bind:this={anchor}>
+  <TextButton text small on:click={dropdown.show} active={!!view.field}>
+    <Icon name="calculate" />
+    Calculate
+  </TextButton>
+</div>
+<Popover bind:this={dropdown} {anchor} align="left">
+  <CalculatePopover {view} onClosed={dropdown.hide} />
+</Popover>
diff --git a/packages/builder/src/components/backend/DataTable/popovers/Column.svelte b/packages/builder/src/components/backend/DataTable/buttons/CreateColumnButton.svelte
similarity index 57%
rename from packages/builder/src/components/backend/DataTable/popovers/Column.svelte
rename to packages/builder/src/components/backend/DataTable/buttons/CreateColumnButton.svelte
index 61d03a2fbb..7ddced256e 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/Column.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/CreateColumnButton.svelte
@@ -1,14 +1,6 @@
 <script>
-  import { backendUiStore } from "builderStore"
-  import {
-    DropdownMenu,
-    TextButton as Button,
-    Icon,
-    Input,
-    Select,
-  } from "@budibase/bbui"
-  import { FIELDS } from "constants/backend"
-  import CreateEditColumn from "./CreateEditColumn.svelte"
+  import { DropdownMenu, TextButton as Button, Icon } from "@budibase/bbui"
+  import CreateEditColumnPopover from "../popovers/CreateEditColumnPopover.svelte"
 
   let anchor
   let dropdown
@@ -23,7 +15,7 @@
 </div>
 <DropdownMenu bind:this={dropdown} {anchor} align="left">
   <h5>Create Column</h5>
-  <CreateEditColumn onClosed={dropdown.hide} />
+  <CreateEditColumnPopover onClosed={dropdown.hide} />
 </DropdownMenu>
 
 <style>
diff --git a/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte
new file mode 100644
index 0000000000..1005b6b278
--- /dev/null
+++ b/packages/builder/src/components/backend/DataTable/buttons/CreateRowButton.svelte
@@ -0,0 +1,17 @@
+<script>
+  import { TextButton as Button, Icon } from "@budibase/bbui"
+  import CreateEditRecordModal from "../modals/CreateEditRecordModal.svelte"
+  import { Modal } from "components/common/Modal"
+
+  let modal
+</script>
+
+<div>
+  <Button text small on:click={modal.show}>
+    <Icon name="addrow" />
+    Create New Row
+  </Button>
+</div>
+<Modal bind:this={modal}>
+  <CreateEditRecordModal />
+</Modal>
diff --git a/packages/builder/src/components/backend/DataTable/buttons/CreateViewButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/CreateViewButton.svelte
new file mode 100644
index 0000000000..ef58b52c60
--- /dev/null
+++ b/packages/builder/src/components/backend/DataTable/buttons/CreateViewButton.svelte
@@ -0,0 +1,17 @@
+<script>
+  import { Popover, TextButton, Icon } from "@budibase/bbui"
+  import CreateViewPopover from "../popovers/CreateViewPopover.svelte"
+
+  let anchor
+  let dropdown
+</script>
+
+<div bind:this={anchor}>
+  <TextButton text small on:click={dropdown.show}>
+    <Icon name="view" />
+    Create New View
+  </TextButton>
+</div>
+<Popover bind:this={dropdown} {anchor} align="left">
+  <CreateViewPopover onClosed={dropdown.hide} />
+</Popover>
diff --git a/packages/builder/src/components/backend/DataTable/buttons/FilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/FilterButton.svelte
new file mode 100644
index 0000000000..5c7efab369
--- /dev/null
+++ b/packages/builder/src/components/backend/DataTable/buttons/FilterButton.svelte
@@ -0,0 +1,23 @@
+<script>
+  import { Popover, TextButton, Icon } from "@budibase/bbui"
+  import FilterPopover from "../popovers/FilterPopover.svelte"
+
+  export let view = {}
+
+  let anchor
+  let dropdown
+</script>
+
+<div bind:this={anchor}>
+  <TextButton
+    text
+    small
+    on:click={dropdown.show}
+    active={view.filters && view.filters.length}>
+    <Icon name="filter" />
+    Filter
+  </TextButton>
+</div>
+<Popover bind:this={dropdown} {anchor} align="left">
+  <FilterPopover {view} onClosed={dropdown.hide} />
+</Popover>
diff --git a/packages/builder/src/components/backend/DataTable/buttons/GroupByButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/GroupByButton.svelte
new file mode 100644
index 0000000000..dbe88d8f1f
--- /dev/null
+++ b/packages/builder/src/components/backend/DataTable/buttons/GroupByButton.svelte
@@ -0,0 +1,19 @@
+<script>
+  import { Popover, TextButton, Icon } from "@budibase/bbui"
+  import GroupByPopover from "../popovers/GroupByPopover.svelte"
+
+  export let view = {}
+
+  let anchor
+  let dropdown
+</script>
+
+<div bind:this={anchor}>
+  <TextButton text small active={!!view.groupBy} on:click={dropdown.show}>
+    <Icon name="group" />
+    Group By
+  </TextButton>
+</div>
+<Popover bind:this={dropdown} {anchor} align="left">
+  <GroupByPopover {view} onClosed={dropdown.hide} />
+</Popover>
diff --git a/packages/builder/src/components/backend/DataTable/index.js b/packages/builder/src/components/backend/DataTable/index.js
deleted file mode 100644
index bd9df8885c..0000000000
--- a/packages/builder/src/components/backend/DataTable/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./ModelDataTable.svelte"
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRecordModal.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRecordModal.svelte
new file mode 100644
index 0000000000..474fc8b9a2
--- /dev/null
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRecordModal.svelte
@@ -0,0 +1,50 @@
+<script>
+  import { backendUiStore } from "builderStore"
+  import { notifier } from "builderStore/store/notifications"
+  import LinkedRecordSelector from "components/common/LinkedRecordSelector.svelte"
+  import RecordFieldControl from "../RecordFieldControl.svelte"
+  import * as api from "../api"
+  import { ModalTitle, ModalFooter } from "components/common/Modal"
+  import ErrorsBox from "components/common/ErrorsBox.svelte"
+
+  export let record = {}
+  export let visible = false
+
+  let modal
+  let errors = []
+
+  $: creating = record?._id == null
+  $: model = record.modelId
+    ? $backendUiStore.models.find(model => model._id === record?.modelId)
+    : $backendUiStore.selectedModel
+  $: modelSchema = Object.entries(model?.schema ?? {})
+
+  async function saveRecord() {
+    const recordResponse = await api.saveRecord(
+      { ...record, modelId: model._id },
+      model._id
+    )
+    if (recordResponse.errors) {
+      errors = Object.keys(recordResponse.errors)
+        .map(k => ({ dataPath: k, message: recordResponse.errors[k] }))
+        .flat()
+      // Prevent modal closing if there were errors
+      return false
+    }
+    notifier.success("Record saved successfully.")
+    backendUiStore.actions.records.save(recordResponse)
+  }
+</script>
+
+<ModalTitle>{creating ? 'Create Row' : 'Edit Row'}</ModalTitle>
+<ErrorsBox {errors} />
+{#each modelSchema as [key, meta]}
+  <div>
+    {#if meta.type === 'link'}
+      <LinkedRecordSelector bind:linkedRecords={record[key]} schema={meta} />
+    {:else}
+      <RecordFieldControl {meta} bind:value={record[key]} />
+    {/if}
+  </div>
+{/each}
+<ModalFooter confirmText={creating ? 'Add' : 'Save'} onConfirm={saveRecord} />
diff --git a/packages/builder/src/components/backend/DataTable/popovers/Calculate.svelte b/packages/builder/src/components/backend/DataTable/popovers/Calculate.svelte
deleted file mode 100644
index 08e3ece75c..0000000000
--- a/packages/builder/src/components/backend/DataTable/popovers/Calculate.svelte
+++ /dev/null
@@ -1,102 +0,0 @@
-<script>
-  import {
-    Popover,
-    TextButton,
-    Button,
-    Icon,
-    Input,
-    Select,
-  } from "@budibase/bbui"
-  import { backendUiStore } from "builderStore"
-  import { notifier } from "builderStore/store/notifications"
-  import CreateEditRecord from "./CreateEditRecord.svelte"
-
-  const CALCULATIONS = [
-    {
-      name: "Statistics",
-      key: "stats",
-    },
-  ]
-
-  export let view = {}
-
-  let anchor
-  let dropdown
-
-  $: viewModel = $backendUiStore.models.find(
-    ({ _id }) => _id === $backendUiStore.selectedView.modelId
-  )
-  $: fields =
-    viewModel &&
-    Object.keys(viewModel.schema).filter(
-      field => viewModel.schema[field].type === "number"
-    )
-
-  function saveView() {
-    backendUiStore.actions.views.save(view)
-    notifier.success(`View ${view.name} saved.`)
-    dropdown.hide()
-  }
-</script>
-
-<div bind:this={anchor}>
-  <TextButton text small on:click={dropdown.show} active={!!view.field}>
-    <Icon name="calculate" />
-    Calculate
-  </TextButton>
-</div>
-<Popover bind:this={dropdown} {anchor} align="left">
-  <div class="actions">
-    <h5>Calculate</h5>
-    <div class="input-group-row">
-      <p>The</p>
-      <Select secondary thin bind:value={view.calculation}>
-        <option value="">Choose an option</option>
-        {#each CALCULATIONS as calculation}
-          <option value={calculation.key}>{calculation.name}</option>
-        {/each}
-      </Select>
-      <p>of</p>
-      <Select secondary thin bind:value={view.field}>
-        <option value="">Choose an option</option>
-        {#each fields as field}
-          <option value={field}>{field}</option>
-        {/each}
-      </Select>
-    </div>
-    <div class="footer">
-      <Button secondary on:click={dropdown.hide}>Cancel</Button>
-      <Button primary on:click={saveView}>Save</Button>
-    </div>
-  </div>
-</Popover>
-
-<style>
-  .actions {
-    display: grid;
-    grid-gap: var(--spacing-xl);
-  }
-
-  h5 {
-    margin: 0;
-    font-weight: 500;
-  }
-
-  .footer {
-    display: flex;
-    justify-content: flex-end;
-    gap: var(--spacing-m);
-  }
-
-  .input-group-row {
-    display: grid;
-    grid-template-columns: 30px 1fr 20px 1fr;
-    gap: var(--spacing-s);
-    align-items: center;
-  }
-
-  p {
-    margin: 0;
-    font-size: var(--font-size-xs);
-  }
-</style>
diff --git a/packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte
new file mode 100644
index 0000000000..ef97598af5
--- /dev/null
+++ b/packages/builder/src/components/backend/DataTable/popovers/CalculatePopover.svelte
@@ -0,0 +1,84 @@
+<script>
+  import { Button, Input, Select } from "@budibase/bbui"
+  import { backendUiStore } from "builderStore"
+  import { notifier } from "builderStore/store/notifications"
+
+  const CALCULATIONS = [
+    {
+      name: "Statistics",
+      key: "stats",
+    },
+  ]
+
+  export let view = {}
+  export let onClosed
+
+  $: viewModel = $backendUiStore.models.find(
+    ({ _id }) => _id === $backendUiStore.selectedView.modelId
+  )
+  $: fields =
+    viewModel &&
+    Object.keys(viewModel.schema).filter(
+      field => viewModel.schema[field].type === "number"
+    )
+
+  function saveView() {
+    backendUiStore.actions.views.save(view)
+    notifier.success(`View ${view.name} saved.`)
+    onClosed()
+  }
+</script>
+
+<div class="actions">
+  <h5>Calculate</h5>
+  <div class="input-group-row">
+    <p>The</p>
+    <Select secondary thin bind:value={view.calculation}>
+      <option value="">Choose an option</option>
+      {#each CALCULATIONS as calculation}
+        <option value={calculation.key}>{calculation.name}</option>
+      {/each}
+    </Select>
+    <p>of</p>
+    <Select secondary thin bind:value={view.field}>
+      <option value="">Choose an option</option>
+      {#each fields as field}
+        <option value={field}>{field}</option>
+      {/each}
+    </Select>
+  </div>
+  <div class="footer">
+    <Button secondary on:click={onClosed}>Cancel</Button>
+    <Button primary on:click={saveView}>Save</Button>
+  </div>
+</div>
+
+<style>
+  .actions {
+    display: grid;
+    grid-gap: var(--spacing-xl);
+  }
+
+  h5 {
+    margin: 0;
+    font-weight: 500;
+  }
+
+  .footer {
+    display: flex;
+    justify-content: flex-end;
+    gap: var(--spacing-m);
+  }
+
+  .input-group-row {
+    display: grid;
+    grid-template-columns: 30px 1fr 20px 1fr;
+    gap: var(--spacing-s);
+    align-items: center;
+  }
+
+  p {
+    margin: 0;
+    font-size: var(--font-size-xs);
+  }
+</style>
diff --git a/packages/builder/src/components/backend/DataTable/popovers/ColumnHeader.svelte b/packages/builder/src/components/backend/DataTable/popovers/ColumnPopover.svelte
similarity index 91%
rename from packages/builder/src/components/backend/DataTable/popovers/ColumnHeader.svelte
rename to packages/builder/src/components/backend/DataTable/popovers/ColumnPopover.svelte
index e1429edb34..de431035da 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/ColumnHeader.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/ColumnPopover.svelte
@@ -2,7 +2,7 @@
   import { backendUiStore } from "builderStore"
   import { DropdownMenu, Button, Icon, Input, Select } from "@budibase/bbui"
   import { FIELDS } from "constants/backend"
-  import CreateEditColumnModal from "./CreateEditColumn.svelte"
+  import CreateEditColumnPopover from "./CreateEditColumnPopover.svelte"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { notifier } from "../../../../builderStore/store/notifications"
 
@@ -26,6 +26,11 @@
     editing = false
   }
 
+  function showDelete() {
+    dropdown.hide()
+    confirmDeleteDialog.show()
+  }
+
   function deleteColumn() {
     if (field.name === $backendUiStore.selectedModel.primaryDisplay) {
       notifier.danger("You cannot delete the primary display column")
@@ -52,7 +57,7 @@
 <DropdownMenu bind:this={dropdown} {anchor} align="left">
   {#if editing}
     <h5>Edit Column</h5>
-    <CreateEditColumnModal onClosed={hideEditor} {field} />
+    <CreateEditColumnPopover onClosed={hideEditor} {field} />
   {:else}
     <ul>
       {#if type !== 'link'}
@@ -61,9 +66,7 @@
           Edit
         </li>
       {/if}
-      <li
-        data-cy="delete-column-header"
-        on:click={() => confirmDeleteDialog.show()}>
+      <li data-cy="delete-column-header" on:click={showDelete}>
         <Icon name="delete" />
         Delete
       </li>
diff --git a/packages/builder/src/components/backend/DataTable/popovers/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/popovers/CreateEditColumnPopover.svelte
similarity index 100%
rename from packages/builder/src/components/backend/DataTable/popovers/CreateEditColumn.svelte
rename to packages/builder/src/components/backend/DataTable/popovers/CreateEditColumnPopover.svelte
diff --git a/packages/builder/src/components/backend/DataTable/popovers/CreateEditRecord.svelte b/packages/builder/src/components/backend/DataTable/popovers/CreateEditRecord.svelte
deleted file mode 100644
index dda74a6ab3..0000000000
--- a/packages/builder/src/components/backend/DataTable/popovers/CreateEditRecord.svelte
+++ /dev/null
@@ -1,81 +0,0 @@
-<script>
-  import { onMount, tick } from "svelte"
-  import { store, backendUiStore } from "builderStore"
-  import { notifier } from "builderStore/store/notifications"
-  import { compose, map, get, flatten } from "lodash/fp"
-  import { Input, TextArea, Button } from "@budibase/bbui"
-  import LinkedRecordSelector from "components/common/LinkedRecordSelector.svelte"
-  import RecordFieldControl from "./RecordFieldControl.svelte"
-  import * as api from "../api"
-  import ErrorsBox from "components/common/ErrorsBox.svelte"
-
-  export let record = {}
-  export let onClosed
-
-  let errors = []
-  $: model = record.modelId
-    ? $backendUiStore.models.find(model => model._id === record?.modelId)
-    : $backendUiStore.selectedModel
-  $: modelSchema = Object.entries(model?.schema ?? {})
-
-  async function saveRecord() {
-    const recordResponse = await api.saveRecord(
-      {
-        ...record,
-        modelId: model._id,
-      },
-      model._id
-    )
-    if (recordResponse.errors) {
-      errors = Object.keys(recordResponse.errors)
-        .map(k => ({ dataPath: k, message: recordResponse.errors[k] }))
-        .flat()
-      return
-    }
-
-    onClosed()
-    notifier.success("Record saved successfully.")
-    backendUiStore.actions.records.save(recordResponse)
-  }
-</script>
-
-<div class="actions">
-  <ErrorsBox {errors} />
-  <form on:submit|preventDefault>
-    {#each modelSchema as [key, meta]}
-      <div>
-        {#if meta.type === 'link'}
-          <LinkedRecordSelector
-            bind:linkedRecords={record[key]}
-            schema={meta} />
-        {:else}
-          <RecordFieldControl {meta} bind:value={record[key]} />
-        {/if}
-      </div>
-    {/each}
-  </form>
-  <footer>
-    <Button secondary on:click={onClosed}>Cancel</Button>
-    <Button primary on:click={saveRecord}>Save</Button>
-  </footer>
-</div>
-
-<style>
-  .actions {
-    padding: var(--spacing-xl);
-    display: grid;
-    grid-gap: var(--spacing-xl);
-    min-width: 400px;
-  }
-
-  form {
-    display: grid;
-    grid-gap: var(--spacing-xl);
-  }
-
-  footer {
-    display: flex;
-    justify-content: flex-end;
-    gap: var(--spacing-m);
-  }
-</style>
diff --git a/packages/builder/src/components/backend/DataTable/popovers/View.svelte b/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
similarity index 60%
rename from packages/builder/src/components/backend/DataTable/popovers/View.svelte
rename to packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
index f8f6ce948b..1c732c7edc 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/View.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/CreateViewPopover.svelte
@@ -1,19 +1,10 @@
 <script>
-  import {
-    Popover,
-    TextButton,
-    Button,
-    Icon,
-    Input,
-    Select,
-  } from "@budibase/bbui"
+  import { Button, Input, Select } from "@budibase/bbui"
   import { goto } from "@sveltech/routify"
   import { backendUiStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
-  import CreateEditRecord from "./CreateEditRecord.svelte"
 
-  let anchor
-  let dropdown
+  export let onClosed
 
   let name
   let field
@@ -36,27 +27,19 @@
       field,
     })
     notifier.success(`View ${name} created`)
-    dropdown.hide()
+    onClosed()
     $goto(`../../../view/${name}`)
   }
 </script>
 
-<div bind:this={anchor}>
-  <TextButton text small on:click={dropdown.show}>
-    <Icon name="view" />
-    Create New View
-  </TextButton>
-</div>
-<Popover bind:this={dropdown} {anchor} align="left">
-  <div class="actions">
-    <h5>Create View</h5>
-    <Input label="View Name" thin bind:value={name} />
-    <div class="footer">
-      <Button secondary on:click={dropdown.hide}>Cancel</Button>
-      <Button primary on:click={saveView}>Save View</Button>
-    </div>
+<div class="actions">
+  <h5>Create View</h5>
+  <Input label="View Name" thin bind:value={name} />
+  <div class="footer">
+    <Button secondary on:click={onClosed}>Cancel</Button>
+    <Button primary on:click={saveView}>Save View</Button>
   </div>
-</Popover>
+</div>
 
 <style>
   h5 {
diff --git a/packages/builder/src/components/backend/DataTable/popovers/Filter.svelte b/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte
similarity index 50%
rename from packages/builder/src/components/backend/DataTable/popovers/Filter.svelte
rename to packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte
index 379ccc4bd0..15ac2dc3d1 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/Filter.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte
@@ -1,15 +1,7 @@
 <script>
-  import {
-    Popover,
-    TextButton,
-    Button,
-    Icon,
-    Input,
-    Select,
-  } from "@budibase/bbui"
+  import { Button, Input, Select } from "@budibase/bbui"
   import { backendUiStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
-  import CreateEditRecord from "./CreateEditRecord.svelte"
 
   const CONDITIONS = [
     {
@@ -50,9 +42,7 @@
   ]
 
   export let view = {}
-
-  let anchor
-  let dropdown
+  export let onClosed
 
   $: viewModel = $backendUiStore.models.find(
     ({ _id }) => _id === $backendUiStore.selectedView.modelId
@@ -62,7 +52,7 @@
   function saveView() {
     backendUiStore.actions.views.save(view)
     notifier.success(`View ${view.name} saved.`)
-    dropdown.hide()
+    onClosed()
   }
 
   function removeFilter(idx) {
@@ -84,67 +74,55 @@
   }
 </script>
 
-<div bind:this={anchor}>
-  <TextButton
-    text
-    small
-    on:click={dropdown.show}
-    active={view.filters && view.filters.length}>
-    <Icon name="filter" />
-    Filter
-  </TextButton>
-</div>
-<Popover bind:this={dropdown} {anchor} align="left">
-  <div class="actions">
-    <h5>Filter</h5>
-    {#if view.filters.length}
-      <div class="input-group-row">
-        {#each view.filters as filter, idx}
-          {#if idx === 0}
-            <p>Where</p>
-          {:else}
-            <Select secondary thin bind:value={filter.conjunction}>
-              <option value="">Choose an option</option>
-              {#each CONJUNCTIONS as conjunction}
-                <option value={conjunction.key}>{conjunction.name}</option>
-              {/each}
-            </Select>
-          {/if}
-          <Select secondary thin bind:value={filter.key}>
+<div class="actions">
+  <h5>Filter</h5>
+  {#if view.filters.length}
+    <div class="input-group-row">
+      {#each view.filters as filter, idx}
+        {#if idx === 0}
+          <p>Where</p>
+        {:else}
+          <Select secondary thin bind:value={filter.conjunction}>
             <option value="">Choose an option</option>
-            {#each fields as field}
-              <option value={field}>{field}</option>
+            {#each CONJUNCTIONS as conjunction}
+              <option value={conjunction.key}>{conjunction.name}</option>
             {/each}
           </Select>
-          <Select secondary thin bind:value={filter.condition}>
+        {/if}
+        <Select secondary thin bind:value={filter.key}>
+          <option value="">Choose an option</option>
+          {#each fields as field}
+            <option value={field}>{field}</option>
+          {/each}
+        </Select>
+        <Select secondary thin bind:value={filter.condition}>
+          <option value="">Choose an option</option>
+          {#each CONDITIONS as condition}
+            <option value={condition.key}>{condition.name}</option>
+          {/each}
+        </Select>
+        {#if filter.key && isMultipleChoice(filter.key)}
+          <Select secondary thin bind:value={filter.value}>
             <option value="">Choose an option</option>
-            {#each CONDITIONS as condition}
-              <option value={condition.key}>{condition.name}</option>
+            {#each viewModel.schema[filter.key].constraints.inclusion as option}
+              <option value={option}>{option}</option>
             {/each}
           </Select>
-          {#if filter.key && isMultipleChoice(filter.key)}
-            <Select secondary thin bind:value={filter.value}>
-              <option value="">Choose an option</option>
-              {#each viewModel.schema[filter.key].constraints.inclusion as option}
-                <option value={option}>{option}</option>
-              {/each}
-            </Select>
-          {:else}
-            <Input thin placeholder="Value" bind:value={filter.value} />
-          {/if}
-          <i class="ri-close-circle-fill" on:click={() => removeFilter(idx)} />
-        {/each}
-      </div>
-    {/if}
-    <div class="footer">
-      <Button text on:click={addFilter}>Add Filter</Button>
-      <div class="buttons">
-        <Button secondary on:click={dropdown.hide}>Cancel</Button>
-        <Button primary on:click={saveView}>Save</Button>
-      </div>
+        {:else}
+          <Input thin placeholder="Value" bind:value={filter.value} />
+        {/if}
+        <i class="ri-close-circle-fill" on:click={() => removeFilter(idx)} />
+      {/each}
+    </div>
+  {/if}
+  <div class="footer">
+    <Button text on:click={addFilter}>Add Filter</Button>
+    <div class="buttons">
+      <Button secondary on:click={onClosed}>Cancel</Button>
+      <Button primary on:click={saveView}>Save</Button>
     </div>
   </div>
-</Popover>
+</div>
 
 <style>
   .actions {
diff --git a/packages/builder/src/components/backend/DataTable/popovers/GroupBy.svelte b/packages/builder/src/components/backend/DataTable/popovers/GroupBy.svelte
deleted file mode 100644
index 7f42660357..0000000000
--- a/packages/builder/src/components/backend/DataTable/popovers/GroupBy.svelte
+++ /dev/null
@@ -1,91 +0,0 @@
-<script>
-  import {
-    Popover,
-    TextButton,
-    Button,
-    Icon,
-    Input,
-    Select,
-  } from "@budibase/bbui"
-  import { backendUiStore } from "builderStore"
-  import { notifier } from "builderStore/store/notifications"
-  import CreateEditRecord from "./CreateEditRecord.svelte"
-
-  const CALCULATIONS = [
-    {
-      name: "Statistics",
-      key: "stats",
-    },
-  ]
-
-  export let view = {}
-
-  let anchor
-  let dropdown
-
-  $: viewModel = $backendUiStore.models.find(
-    ({ _id }) => _id === $backendUiStore.selectedView.modelId
-  )
-  $: fields = viewModel && Object.keys(viewModel.schema)
-
-  function saveView() {
-    backendUiStore.actions.views.save(view)
-    notifier.success(`View ${view.name} saved.`)
-    dropdown.hide()
-  }
-</script>
-
-<div bind:this={anchor}>
-  <TextButton text small active={!!view.groupBy} on:click={dropdown.show}>
-    <Icon name="group" />
-    Group
-  </TextButton>
-</div>
-<Popover bind:this={dropdown} {anchor} align="left">
-  <div class="actions">
-    <h5>Group</h5>
-    <div class="input-group-row">
-      <p>By</p>
-      <Select secondary thin bind:value={view.groupBy}>
-        <option value="">Choose an option</option>
-        {#each fields as field}
-          <option value={field}>{field}</option>
-        {/each}
-      </Select>
-    </div>
-    <div class="footer">
-      <Button secondary on:click={dropdown.hide}>Cancel</Button>
-      <Button primary on:click={saveView}>Save</Button>
-    </div>
-  </div>
-</Popover>
-
-<style>
-  .actions {
-    display: grid;
-    grid-gap: var(--spacing-xl);
-  }
-
-  h5 {
-    margin: 0;
-    font-weight: 500;
-  }
-
-  .footer {
-    display: flex;
-    justify-content: flex-end;
-    gap: var(--spacing-m);
-  }
-
-  .input-group-row {
-    display: grid;
-    grid-template-columns: 20px 1fr;
-    gap: var(--spacing-s);
-    align-items: center;
-  }
-
-  p {
-    margin: 0;
-    font-size: var(--font-size-xs);
-  }
-</style>
diff --git a/packages/builder/src/components/backend/DataTable/popovers/GroupByPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/GroupByPopover.svelte
new file mode 100644
index 0000000000..da5cf7b8ec
--- /dev/null
+++ b/packages/builder/src/components/backend/DataTable/popovers/GroupByPopover.svelte
@@ -0,0 +1,66 @@
+<script>
+  import { Button, Input, Select } from "@budibase/bbui"
+  import { backendUiStore } from "builderStore"
+  import { notifier } from "builderStore/store/notifications"
+
+  export let view = {}
+  export let onClosed
+
+  $: viewModel = $backendUiStore.models.find(
+    ({ _id }) => _id === $backendUiStore.selectedView.modelId
+  )
+  $: fields = viewModel && Object.keys(viewModel.schema)
+
+  function saveView() {
+    backendUiStore.actions.views.save(view)
+    notifier.success(`View ${view.name} saved.`)
+    onClosed()
+  }
+</script>
+
+<div class="actions">
+  <h5>Group</h5>
+  <div class="input-group-row">
+    <p>By</p>
+    <Select secondary thin bind:value={view.groupBy}>
+      <option value="">Choose an option</option>
+      {#each fields as field}
+        <option value={field}>{field}</option>
+      {/each}
+    </Select>
+  </div>
+  <div class="footer">
+    <Button secondary on:click={onClosed}>Cancel</Button>
+    <Button primary on:click={saveView}>Save</Button>
+  </div>
+</div>
+
+<style>
+  .actions {
+    display: grid;
+    grid-gap: var(--spacing-xl);
+  }
+
+  h5 {
+    margin: 0;
+    font-weight: 500;
+  }
+
+  .footer {
+    display: flex;
+    justify-content: flex-end;
+    gap: var(--spacing-m);
+  }
+
+  .input-group-row {
+    display: grid;
+    grid-template-columns: 20px 1fr;
+    gap: var(--spacing-s);
+    align-items: center;
+  }
+
+  p {
+    margin: 0;
+    font-size: var(--font-size-xs);
+  }
+</style>
diff --git a/packages/builder/src/components/backend/DataTable/popovers/Row.svelte b/packages/builder/src/components/backend/DataTable/popovers/Row.svelte
deleted file mode 100644
index 38b56e83fd..0000000000
--- a/packages/builder/src/components/backend/DataTable/popovers/Row.svelte
+++ /dev/null
@@ -1,27 +0,0 @@
-<script>
-  import { DropdownMenu, TextButton as Button, Icon } from "@budibase/bbui"
-  import CreateEditRecord from "./CreateEditRecord.svelte"
-  import { Modal } from "components/common/Modal"
-
-  let anchor
-  let dropdown
-</script>
-
-<div bind:this={anchor}>
-  <Button text small on:click={dropdown.show}>
-    <Icon name="addrow" />
-    Create New Row
-  </Button>
-</div>
-<Modal bind:this={dropdown}>
-  <h5>Add New Row</h5>
-  <CreateEditRecord onClosed={dropdown.hide} />
-</Modal>
-
-<style>
-  h5 {
-    padding: var(--spacing-xl) 0 0 var(--spacing-xl);
-    margin: 0;
-    font-weight: 500;
-  }
-</style>
diff --git a/packages/builder/src/components/backend/DataTable/popovers/EditRow.svelte b/packages/builder/src/components/backend/DataTable/popovers/RowPopover.svelte
similarity index 65%
rename from packages/builder/src/components/backend/DataTable/popovers/EditRow.svelte
rename to packages/builder/src/components/backend/DataTable/popovers/RowPopover.svelte
index 8b50bf6b61..ca8488e134 100644
--- a/packages/builder/src/components/backend/DataTable/popovers/EditRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/popovers/RowPopover.svelte
@@ -1,41 +1,33 @@
 <script>
-  import { getContext } from "svelte"
   import { backendUiStore } from "builderStore"
-  import {
-    DropdownMenu,
-    Button,
-    Icon,
-    Input,
-    Select,
-    Heading,
-  } from "@budibase/bbui"
-  import { FIELDS } from "constants/backend"
-  import CreateEditRecordModal from "./CreateEditRecord.svelte"
+  import { DropdownMenu, Icon } from "@budibase/bbui"
+  import CreateEditRecordModal from "../modals/CreateEditRecordModal.svelte"
   import * as api from "../api"
   import { notifier } from "builderStore/store/notifications"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import { Modal } from "components/common/Modal"
 
   export let row
 
   let anchor
   let dropdown
-  let editing
   let confirmDeleteDialog
+  let modal
 
-  function showEditor() {
-    editing = true
+  function showModal() {
+    dropdown.hide()
+    modal.show()
   }
 
-  function hideEditor() {
+  function showDelete() {
     dropdown.hide()
-    editing = false
+    confirmDeleteDialog.show()
   }
 
   async function deleteRow() {
     await api.deleteRecord(row)
     notifier.success("Record deleted")
     backendUiStore.actions.records.delete(row)
-    hideEditor()
   }
 </script>
 
@@ -43,21 +35,16 @@
   <i class="ri-more-line" />
 </div>
 <DropdownMenu bind:this={dropdown} {anchor} align="left">
-  {#if editing}
-    <h5>Edit Row</h5>
-    <CreateEditRecordModal onClosed={hideEditor} record={row} />
-  {:else}
-    <ul>
-      <li data-cy="edit-row" on:click={showEditor}>
-        <Icon name="edit" />
-        <span>Edit</span>
-      </li>
-      <li data-cy="delete-row" on:click={() => confirmDeleteDialog.show()}>
-        <Icon name="delete" />
-        <span>Delete</span>
-      </li>
-    </ul>
-  {/if}
+  <ul>
+    <li data-cy="edit-row" on:click={showModal}>
+      <Icon name="edit" />
+      <span>Edit</span>
+    </li>
+    <li data-cy="delete-row" on:click={showDelete}>
+      <Icon name="delete" />
+      <span>Delete</span>
+    </li>
+  </ul>
 </DropdownMenu>
 <ConfirmDialog
   bind:this={confirmDeleteDialog}
@@ -65,6 +52,9 @@
   okText="Delete Row"
   onOk={deleteRow}
   title="Confirm Delete" />
+<Modal bind:this={modal}>
+  <CreateEditRecordModal record={row} />
+</Modal>
 
 <style>
   .ri-more-line:hover {
diff --git a/packages/builder/src/components/backend/ModelNavigator/EditTable.svelte b/packages/builder/src/components/backend/ModelNavigator/EditTable.svelte
index 26623d5f6b..522168b4a3 100644
--- a/packages/builder/src/components/backend/ModelNavigator/EditTable.svelte
+++ b/packages/builder/src/components/backend/ModelNavigator/EditTable.svelte
@@ -24,6 +24,11 @@
     editing = false
   }
 
+  function showModal() {
+    hideEditor()
+    confirmDeleteDialog.show()
+  }
+
   async function deleteTable() {
     await backendUiStore.actions.models.delete(table)
     notifier.success("Table deleted")
@@ -66,7 +71,7 @@
         <Icon name="edit" />
         Edit
       </li>
-      <li data-cy="delete-table" on:click={() => confirmDeleteDialog.show()}>
+      <li data-cy="delete-table" on:click={showModal}>
         <Icon name="delete" />
         Delete
       </li>
@@ -78,7 +83,6 @@
   body={`Are you sure you wish to delete the table '${table.name}'? Your data will be deleted and this action cannot be undone.`}
   okText="Delete Table"
   onOk={deleteTable}
-  onCancel={hideEditor}
   title="Confirm Delete" />
 
 <style>
diff --git a/packages/builder/src/components/backend/ModelNavigator/EditView.svelte b/packages/builder/src/components/backend/ModelNavigator/EditView.svelte
index c51ad86339..8c7e4d238e 100644
--- a/packages/builder/src/components/backend/ModelNavigator/EditView.svelte
+++ b/packages/builder/src/components/backend/ModelNavigator/EditView.svelte
@@ -24,6 +24,11 @@
     editing = false
   }
 
+  function showDelete() {
+    dropdown.hide()
+    confirmDeleteDialog.show()
+  }
+
   async function save() {
     await backendUiStore.actions.views.save({
       originalName,
@@ -61,7 +66,7 @@
         <Icon name="edit" />
         Edit
       </li>
-      <li data-cy="delete-view" on:click={() => confirmDeleteDialog.show()}>
+      <li data-cy="delete-view" on:click={showDelete}>
         <Icon name="delete" />
         Delete
       </li>
diff --git a/packages/builder/src/components/backend/ModelNavigator/ModelNavigator.svelte b/packages/builder/src/components/backend/ModelNavigator/ModelNavigator.svelte
index 85fff62d2e..e12b9d3b1d 100644
--- a/packages/builder/src/components/backend/ModelNavigator/ModelNavigator.svelte
+++ b/packages/builder/src/components/backend/ModelNavigator/ModelNavigator.svelte
@@ -1,19 +1,13 @@
 <script>
-  import { getContext } from "svelte"
-  import { slide } from "svelte/transition"
-  import { Switcher } from "@budibase/bbui"
   import { goto } from "@sveltech/routify"
-  import { store, backendUiStore } from "builderStore"
+  import { backendUiStore } from "builderStore"
   import ListItem from "./ListItem.svelte"
-  import { Button } from "@budibase/bbui"
   import CreateTablePopover from "./CreateTable.svelte"
   import EditTablePopover from "./EditTable.svelte"
   import EditViewPopover from "./EditView.svelte"
   import { Heading } from "@budibase/bbui"
   import { Spacer } from "@budibase/bbui"
 
-  const { open, close } = getContext("simple-modal")
-
   $: selectedView =
     $backendUiStore.selectedView && $backendUiStore.selectedView.name
 
diff --git a/packages/builder/src/components/common/ConfirmDialog.svelte b/packages/builder/src/components/common/ConfirmDialog.svelte
index 437f657fac..21ae2b96a0 100644
--- a/packages/builder/src/components/common/ConfirmDialog.svelte
+++ b/packages/builder/src/components/common/ConfirmDialog.svelte
@@ -1,64 +1,31 @@
 <script>
-  import { Modal, Button, Heading, Spacer } from "@budibase/bbui"
+  import { Modal, ModalTitle, ModalFooter } from "components/common/Modal"
 
   export let title = ""
-  export let body = ""
-  export let okText = "OK"
-  export let cancelText = "Cancel"
-  export let onOk = () => {}
-  export let onCancel = () => {}
+  export let body
+  export let okText
+  export let cancelText
+  export let onOk
+  export let onCancel
+
+  let modal
 
   export const show = () => {
-    theModal.show()
+    modal.show()
   }
-
   export const hide = () => {
-    theModal.hide()
-  }
-
-  let theModal
-
-  const cancel = () => {
-    hide()
-    onCancel()
-  }
-
-  const ok = () => {
-    const result = onOk()
-    // allow caller to return false, to cancel the "ok"
-    if (result === false) return
-    hide()
+    modal.hide()
   }
 </script>
 
-<Modal id={title} bind:this={theModal}>
-  <h2>{title}</h2>
-  <Spacer extraLarge />
-  <div class="content">
-    <slot class="rows">{body}</slot>
-  </div>
-  <Spacer extraLarge />
-  <div class="modal-footer">
-    <Button red wide on:click={ok}>{okText}</Button>
-    <Button secondary wide on:click={cancel}>{cancelText}</Button>
-  </div>
+<Modal id={title} bind:this={modal} on:hide={onCancel}>
+  <ModalTitle>{title}</ModalTitle>
+  <div class="body">{body}</div>
+  <ModalFooter confirmText={okText} {cancelText} onConfirm={onOk} red />
 </Modal>
 
 <style>
-  h2 {
-    font-size: var(--font-size-xl);
-    margin: 0;
-    font-family: var(--font-sans);
-    font-weight: 600;
-  }
-
-  .modal-footer {
-    display: grid;
-    grid-gap: var(--spacing-s);
-  }
-
-  .content {
-    white-space: normal;
+  .body {
     font-size: var(--font-size-s);
   }
 </style>
diff --git a/packages/builder/src/components/common/LinkedRecordSelector.svelte b/packages/builder/src/components/common/LinkedRecordSelector.svelte
index c263332ca5..f4df3a7d1f 100644
--- a/packages/builder/src/components/common/LinkedRecordSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRecordSelector.svelte
@@ -20,7 +20,6 @@
     const FETCH_RECORDS_URL = `/api/${linkedModelId}/records`
     const response = await api.get(FETCH_RECORDS_URL)
     const result = await response.json()
-    console.log(result)
     return result
   }
 
diff --git a/packages/builder/src/components/common/Modal/Modal.svelte b/packages/builder/src/components/common/Modal/Modal.svelte
index 0077567100..dd6c6615fd 100644
--- a/packages/builder/src/components/common/Modal/Modal.svelte
+++ b/packages/builder/src/components/common/Modal/Modal.svelte
@@ -1,17 +1,23 @@
 <script>
-  import { createEventDispatcher } from "svelte"
+  /**
+   * Confirmation is handled as a callback rather than an event to allow
+   * handling the result - meaning a parent can prevent the modal closing.
+   *
+   * A show/hide API is exposed as part of the modal and also via context for
+   * children inside the modal.
+   * "show" and "hide" events are emitted as visibility changes.
+   *
+   * Modals are rendered at the top of the DOM tree.
+   */
+  import { createEventDispatcher, setContext } from "svelte"
   import { fade, fly } from "svelte/transition"
   import { portal } from "./portal"
+  import { ContextKey } from "./context"
   const dispatch = createEventDispatcher()
 
-  export let visible = false
-  export let cancelText = "Cancel"
-  export let confirmText = "Confirm"
-  export let showCancelButton = true
-  export let showConfirmButton = true
+  let visible
 
   export function show() {
-    console.log("show")
     if (visible) {
       return
     }
@@ -26,6 +32,8 @@
     visible = false
     dispatch("hide")
   }
+
+  setContext(ContextKey, { show, hide })
 </script>
 
 {#if visible}
@@ -66,7 +74,6 @@
     justify-content: center;
     align-items: center;
     background-color: rgba(0, 0, 0, 0.25);
-    z-index: 999;
   }
 
   .scroll-wrapper {
@@ -98,5 +105,7 @@
     flex: 0 0 400px;
     margin: 2rem 0;
     border-radius: var(--border-radius-m);
+    gap: var(--spacing-xl);
+    padding: var(--spacing-xl);
   }
 </style>
diff --git a/packages/builder/src/components/common/Modal/ModalContainer.svelte b/packages/builder/src/components/common/Modal/ModalContainer.svelte
index 891df8630b..ed6d9e15ad 100644
--- a/packages/builder/src/components/common/Modal/ModalContainer.svelte
+++ b/packages/builder/src/components/common/Modal/ModalContainer.svelte
@@ -5,5 +5,6 @@
     position: fixed;
     top: 0;
     left: 0;
+    z-index: 999;
   }
 </style>
diff --git a/packages/builder/src/components/common/Modal/ModalFooter.svelte b/packages/builder/src/components/common/Modal/ModalFooter.svelte
new file mode 100644
index 0000000000..39c2652ead
--- /dev/null
+++ b/packages/builder/src/components/common/Modal/ModalFooter.svelte
@@ -0,0 +1,44 @@
+<script>
+  import { getContext } from "svelte"
+  import { Button } from "@budibase/bbui"
+  import { ContextKey } from "./context"
+
+  export let cancelText = "Cancel"
+  export let confirmText = "Confirm"
+  export let showCancelButton = true
+  export let showConfirmButton = true
+  export let onConfirm
+
+  const modalContext = getContext(ContextKey)
+
+  function hide() {
+    modalContext.hide()
+  }
+
+  async function confirm() {
+    if (!onConfirm || (await onConfirm()) !== false) {
+      hide()
+    }
+  }
+</script>
+
+{#if showCancelButton || showConfirmButton}
+  <footer>
+    {#if showCancelButton}
+      <Button secondary on:click={hide}>{cancelText}</Button>
+    {/if}
+    {#if showConfirmButton}
+      <Button primary {...$$restProps} on:click={confirm}>{confirmText}</Button>
+    {/if}
+  </footer>
+{/if}
+
+<style>
+  footer {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    align-items: center;
+    gap: var(--spacing-m);
+  }
+</style>
diff --git a/packages/builder/src/components/common/Modal/ModalTitle.svelte b/packages/builder/src/components/common/Modal/ModalTitle.svelte
new file mode 100644
index 0000000000..0f6a4f5207
--- /dev/null
+++ b/packages/builder/src/components/common/Modal/ModalTitle.svelte
@@ -0,0 +1,10 @@
+<h5>
+  <slot />
+</h5>
+
+<style>
+  h5 {
+    margin: 0;
+    font-weight: 500;
+  }
+</style>
diff --git a/packages/builder/src/components/common/Modal/context.js b/packages/builder/src/components/common/Modal/context.js
new file mode 100644
index 0000000000..81ea1cdcf5
--- /dev/null
+++ b/packages/builder/src/components/common/Modal/context.js
@@ -0,0 +1 @@
+export const ContextKey = "budibase-modal"
diff --git a/packages/builder/src/components/common/Modal/index.js b/packages/builder/src/components/common/Modal/index.js
index bd53a1373b..8420f8416a 100644
--- a/packages/builder/src/components/common/Modal/index.js
+++ b/packages/builder/src/components/common/Modal/index.js
@@ -1,2 +1,5 @@
 export { default as Modal } from "./Modal.svelte"
 export { default as ModalContainer } from "./ModalContainer.svelte"
+export { default as ModalTitle } from "./ModalTitle.svelte"
+export { default as ModalFooter } from "./ModalFooter.svelte"
+export { ContextKey } from "./context"
diff --git a/packages/builder/src/pages/[application]/backend/model/[selectedModel]/index.svelte b/packages/builder/src/pages/[application]/backend/model/[selectedModel]/index.svelte
index 176bfc4c30..c2cf7f6ff9 100644
--- a/packages/builder/src/pages/[application]/backend/model/[selectedModel]/index.svelte
+++ b/packages/builder/src/pages/[application]/backend/model/[selectedModel]/index.svelte
@@ -1,13 +1,6 @@
 <script>
-  import { getContext } from "svelte"
-  import { Button } from "@budibase/bbui"
-  import ModelDataTable from "components/backend/DataTable"
+  import ModelDataTable from "components/backend/DataTable/ModelDataTable.svelte"
   import { backendUiStore } from "builderStore"
-  import ActionButton from "components/common/ActionButton.svelte"
-  import * as api from "components/backend/DataTable/api"
-  import CreateEditRecordModal from "components/backend/DataTable/popovers/CreateEditRecord.svelte"
-
-  const { open, close } = getContext("simple-modal")
 
   $: selectedModel = $backendUiStore.selectedModel
 </script>
diff --git a/packages/builder/src/pages/[application]/backend/view/[selectedView]/index.svelte b/packages/builder/src/pages/[application]/backend/view/[selectedView]/index.svelte
index 168461699b..8a0c87b98b 100644
--- a/packages/builder/src/pages/[application]/backend/view/[selectedView]/index.svelte
+++ b/packages/builder/src/pages/[application]/backend/view/[selectedView]/index.svelte
@@ -1,13 +1,6 @@
 <script>
-  import { getContext } from "svelte"
-  import { Button } from "@budibase/bbui"
   import ViewDataTable from "components/backend/DataTable/ViewDataTable"
   import { backendUiStore } from "builderStore"
-  import ActionButton from "components/common/ActionButton.svelte"
-  import * as api from "components/backend/DataTable/api"
-  import CreateEditRecord from "components/backend/DataTable/popovers/CreateEditRecord.svelte"
-
-  const { open, close } = getContext("simple-modal")
 
   $: selectedView = $backendUiStore.selectedView
 </script>