diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 1b3510cf3b..272e0937e1 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -34,7 +34,7 @@
     "dist"
   ],
   "dependencies": {
-    "@adobe/spectrum-css-workflow-icons": "1.2.1",
+    "@adobe/spectrum-css-workflow-icons": "3.0.0",
     "@budibase/shared-core": "0.0.0",
     "@budibase/string-templates": "0.0.0",
     "@spectrum-css/accordion": "3.0.24",
diff --git a/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte b/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
deleted file mode 100644
index f107acc315..0000000000
--- a/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
+++ /dev/null
@@ -1,44 +0,0 @@
-<script>
-  import { API } from "api"
-  import Table from "./Table.svelte"
-  import { tables } from "stores/builder"
-  import { notifications } from "@budibase/bbui"
-
-  export let tableId
-  export let rowId
-  export let fieldName
-
-  let row
-  let title
-
-  $: data = row?.[fieldName] ?? []
-  $: linkedTableId = data?.length ? data[0].tableId : null
-  $: linkedTable = $tables.list.find(table => table._id === linkedTableId)
-  $: schema = linkedTable?.schema
-  $: table = $tables.list.find(table => table._id === tableId)
-  $: fetchData(tableId, rowId)
-  $: {
-    let rowLabel = row?.[table?.primaryDisplay]
-    if (rowLabel) {
-      title = `${rowLabel} - ${fieldName}`
-    } else {
-      title = fieldName
-    }
-  }
-
-  async function fetchData(tableId, rowId) {
-    try {
-      row = await API.fetchRelationshipData({
-        tableId,
-        rowId,
-      })
-    } catch (error) {
-      row = null
-      notifications.error("Error fetching relationship data")
-    }
-  }
-</script>
-
-{#if row && row._id === rowId}
-  <Table {title} {schema} {data} />
-{/if}
diff --git a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
deleted file mode 100644
index 5f7a0feb67..0000000000
--- a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
+++ /dev/null
@@ -1,39 +0,0 @@
-<script>
-  import { viewsV2 } from "stores/builder"
-  import { admin, licensing } from "stores/portal"
-  import { Grid } from "@budibase/frontend-core"
-  import { API } from "api"
-  import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
-  import GridFilterButton from "components/backend/DataTable/buttons/grid/GridFilterButton.svelte"
-  import GridManageAccessButton from "components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte"
-
-  $: id = $viewsV2.selected?.id
-  $: datasource = {
-    type: "viewV2",
-    id,
-    tableId: $viewsV2.selected?.tableId,
-  }
-
-  const handleGridViewUpdate = async e => {
-    viewsV2.replaceView(id, e.detail)
-  }
-</script>
-
-<Grid
-  {API}
-  {datasource}
-  allowAddRows
-  allowDeleteRows
-  showAvatars={false}
-  on:updatedatasource={handleGridViewUpdate}
-  isCloud={$admin.cloud}
-  allowViewReadonlyColumns={$licensing.isViewReadonlyColumnsEnabled}
->
-  <svelte:fragment slot="filter">
-    <GridFilterButton />
-  </svelte:fragment>
-  <svelte:fragment slot="controls">
-    <GridCreateEditRowModal />
-    <GridManageAccessButton />
-  </svelte:fragment>
-</Grid>
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/ColumnsSettingButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte
similarity index 94%
rename from packages/builder/src/components/backend/DataTable/buttons/grid/ColumnsSettingButton.svelte
rename to packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte
index f3a7678cf2..706b98ae29 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/ColumnsSettingButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte
@@ -1,9 +1,9 @@
 <script>
   import { getContext } from "svelte"
   import { ActionButton, Popover, Icon, notifications } from "@budibase/bbui"
-  import { getColumnIcon } from "../lib/utils"
-  import ToggleActionButtonGroup from "./ToggleActionButtonGroup.svelte"
+  import ToggleActionButtonGroup from "components/common/ToggleActionButtonGroup.svelte"
   import { helpers } from "@budibase/shared-core"
+  import { SchemaUtils } from "@budibase/frontend-core"
 
   export let allowViewReadonlyColumns = false
 
@@ -110,7 +110,7 @@
     <div class="columns">
       {#each displayColumns as column}
         <div class="column">
-          <Icon size="S" name={getColumnIcon(column)} />
+          <Icon size="S" name={SchemaUtils.getColumnIcon(column)} />
           <div class="column-label" title={column.label}>
             {column.label}
           </div>
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/SizeButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridSizeButton.svelte
similarity index 86%
rename from packages/builder/src/components/backend/DataTable/buttons/grid/SizeButton.svelte
rename to packages/builder/src/components/backend/DataTable/buttons/grid/GridSizeButton.svelte
index a4db68f1aa..f9499e54b7 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/SizeButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridSizeButton.svelte
@@ -1,34 +1,34 @@
 <script>
   import { getContext } from "svelte"
   import { ActionButton, Popover, Label } from "@budibase/bbui"
-  import {
-    DefaultColumnWidth,
-    LargeRowHeight,
-    MediumRowHeight,
-    SmallRowHeight,
-  } from "../lib/constants"
 
-  const { columns, rowHeight, definition, fixedRowHeight, datasource } =
-    getContext("grid")
+  const {
+    Constants,
+    columns,
+    rowHeight,
+    definition,
+    fixedRowHeight,
+    datasource,
+  } = getContext("grid")
 
   // Some constants for column width options
   const smallColSize = 120
-  const mediumColSize = DefaultColumnWidth
-  const largeColSize = DefaultColumnWidth * 1.5
+  const mediumColSize = Constants.DefaultColumnWidth
+  const largeColSize = Constants.DefaultColumnWidth * 1.5
 
   // Row height sizes
   const rowSizeOptions = [
     {
       label: "Small",
-      size: SmallRowHeight,
+      size: Constants.SmallRowHeight,
     },
     {
       label: "Medium",
-      size: MediumRowHeight,
+      size: Constants.MediumRowHeight,
     },
     {
       label: "Large",
-      size: LargeRowHeight,
+      size: Constants.LargeRowHeight,
     },
   ]
 
@@ -66,7 +66,6 @@
   }
 </script>
 
-#
 <div bind:this={anchor}>
   <ActionButton
     icon="MoveUpDown"
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/SortButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridSortButton.svelte
similarity index 100%
rename from packages/builder/src/components/backend/DataTable/buttons/grid/SortButton.svelte
rename to packages/builder/src/components/backend/DataTable/buttons/grid/GridSortButton.svelte
diff --git a/packages/frontend-core/src/components/grid/controls/ToggleActionButtonGroup.svelte b/packages/builder/src/components/common/ToggleActionButtonGroup.svelte
similarity index 82%
rename from packages/frontend-core/src/components/grid/controls/ToggleActionButtonGroup.svelte
rename to packages/builder/src/components/common/ToggleActionButtonGroup.svelte
index 497e77c2c9..8a5778534f 100644
--- a/packages/frontend-core/src/components/grid/controls/ToggleActionButtonGroup.svelte
+++ b/packages/builder/src/components/common/ToggleActionButtonGroup.svelte
@@ -9,7 +9,7 @@
   export let options
 </script>
 
-<div class="permissionPicker">
+<div>
   {#each options as option}
     <AbsTooltip text={option.tooltip} type={TooltipType.Info}>
       <ActionButton
@@ -26,15 +26,14 @@
 </div>
 
 <style>
-  .permissionPicker {
+  div {
     display: flex;
     gap: var(--spacing-xs);
   }
-
-  .permissionPicker :global(.spectrum-Icon) {
+  div :global(.spectrum-Icon) {
     width: 14px;
   }
-  .permissionPicker :global(.spectrum-ActionButton) {
+  div :global(.spectrum-ActionButton) {
     width: 28px;
     height: 28px;
   }
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte
index c2281710ba..fb78433481 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte
@@ -1,5 +1,45 @@
 <script>
-  import ViewV2DataTable from "components/backend/DataTable/ViewV2DataTable.svelte"
+  import { viewsV2 } from "stores/builder"
+  import { admin, licensing } from "stores/portal"
+  import { Grid } from "@budibase/frontend-core"
+  import { API } from "api"
+  import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
+  import GridFilterButton from "components/backend/DataTable/buttons/grid/GridFilterButton.svelte"
+  import GridManageAccessButton from "components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte"
+  import GridSortButton from "components/backend/DataTable/buttons/grid/GridSortButton.svelte"
+  import GridColumnsSettingButton from "components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte"
+  import GridSizeButton from "components/backend/DataTable/buttons/grid/GridSizeButton.svelte"
+  import GridCreateAutomationButton from "components/backend/DataTable/buttons/grid/GridCreateAutomationButton.svelte"
+
+  $: id = $viewsV2.selected?.id
+  $: datasource = {
+    type: "viewV2",
+    id,
+    tableId: $viewsV2.selected?.tableId,
+  }
+
+  const handleGridViewUpdate = async e => {
+    viewsV2.replaceView(id, e.detail)
+  }
 </script>
 
-<ViewV2DataTable />
+<Grid
+  {API}
+  {datasource}
+  allowAddRows
+  allowDeleteRows
+  showAvatars={false}
+  on:updatedatasource={handleGridViewUpdate}
+  isCloud={$admin.cloud}
+  allowViewReadonlyColumns={$licensing.isViewReadonlyColumnsEnabled}
+>
+  <svelte:fragment slot="controls">
+    <GridFilterButton />
+    <GridSortButton />
+    <GridColumnsSettingButton />
+    <GridManageAccessButton />
+    <GridSizeButton />
+    <GridCreateAutomationButton />
+  </svelte:fragment>
+  <GridCreateEditRowModal />
+</Grid>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/[field]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/[field]/index.svelte
deleted file mode 100644
index 39dbcb9d11..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/[field]/index.svelte
+++ /dev/null
@@ -1,10 +0,0 @@
-<script>
-  import { params } from "@roxi/routify"
-  import RelationshipDataTable from "components/backend/DataTable/RelationshipDataTable.svelte"
-</script>
-
-<RelationshipDataTable
-  tableId={$params.tableId}
-  rowId={$params.rowId}
-  fieldName={decodeURI($params.field)}
-/>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/index.svelte
deleted file mode 100644
index 348ed0b5bf..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/index.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-  import { redirect } from "@roxi/routify"
-
-  $redirect("../../")
-</script>
-
-<!-- routify:options index=false -->
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte
deleted file mode 100644
index cecec0ab53..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-  import { redirect } from "@roxi/routify"
-
-  $redirect("../")
-</script>
-
-<!-- routify:options index=false -->
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/_layout.svelte
deleted file mode 100644
index 3d0cffc387..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/_layout.svelte
+++ /dev/null
@@ -1,24 +0,0 @@
-<script>
-  import { viewsV2, builderStore } from "stores/builder"
-  import { syncURLToState } from "helpers/urlStateSync"
-  import * as routify from "@roxi/routify"
-  import { onDestroy } from "svelte"
-
-  $: id = $viewsV2.selectedViewId
-  $: builderStore.selectResource(id)
-
-  const stopSyncing = syncURLToState({
-    urlParam: "viewId",
-    stateKey: "selectedViewId",
-    validate: id => $viewsV2.list?.some(view => view.id === id),
-    update: viewsV2.select,
-    fallbackUrl: "../../",
-    store: viewsV2,
-    routify,
-    decode: decodeURIComponent,
-  })
-
-  onDestroy(stopSyncing)
-</script>
-
-<slot />
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/index.svelte
deleted file mode 100644
index c2281710ba..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/index.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-  import ViewV2DataTable from "components/backend/DataTable/ViewV2DataTable.svelte"
-</script>
-
-<ViewV2DataTable />
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/v2/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/v2/index.svelte
deleted file mode 100644
index c11ca87023..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/data/view/v2/index.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-  import { redirect } from "@roxi/routify"
-
-  $redirect("../")
-</script>
diff --git a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte
index 3b6aa5d424..1e6e49c354 100644
--- a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte
@@ -3,7 +3,7 @@
   import { canBeDisplayColumn, canBeSortColumn } from "@budibase/shared-core"
   import { Icon, Menu, MenuItem, Modal } from "@budibase/bbui"
   import GridCell from "./GridCell.svelte"
-  import { getColumnIcon } from "../lib/utils"
+  import { getColumnIcon } from "../../../utils/schema"
   import MigrationModal from "../controls/MigrationModal.svelte"
   import { debounce } from "../../../utils/utils"
   import { FieldType, FormulaType } from "@budibase/types"
diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte
index 86c154be95..9b9abfbabd 100644
--- a/packages/frontend-core/src/components/grid/layout/Grid.svelte
+++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte
@@ -21,15 +21,7 @@
   import KeyboardManager from "../overlays/KeyboardManager.svelte"
   import NewRow from "./NewRow.svelte"
   import { createGridWebsocket } from "../lib/websocket"
-  import {
-    MaxCellRenderOverflow,
-    GutterWidth,
-    DefaultRowHeight,
-    VPadding,
-    SmallRowHeight,
-    ControlsHeight,
-    ScrollBarSize,
-  } from "../lib/constants"
+  import * as Constants from "../lib/constants"
 
   export let API = null
   export let datasource = null
@@ -64,6 +56,7 @@
   // Build up context
   let context = {
     API: API || createAPIClient(),
+    Constants,
     gridID,
     props,
   }
@@ -112,8 +105,13 @@
 
   // Derive min height and make available in context
   const minHeight = derived(rowHeight, $height => {
-    const heightForControls = $$slots.controls ? ControlsHeight : 0
-    return VPadding + SmallRowHeight + $height + heightForControls
+    const heightForControls = $$slots.controls ? Constants.ControlsHeight : 0
+    return (
+      Constants.VPadding +
+      Constants.SmallRowHeight +
+      $height +
+      heightForControls
+    )
   })
   context = { ...context, minHeight }
 
@@ -141,7 +139,7 @@
   class:quiet
   on:mouseenter={() => gridFocused.set(true)}
   on:mouseleave={() => gridFocused.set(false)}
-  style="--row-height:{$rowHeight}px; --default-row-height:{DefaultRowHeight}px; --gutter-width:{GutterWidth}px; --max-cell-render-overflow:{MaxCellRenderOverflow}px; --content-lines:{$contentLines}; --min-height:{$minHeight}px; --controls-height:{ControlsHeight}px; --scroll-bar-size:{ScrollBarSize}px;"
+  style="--row-height:{$rowHeight}px; --default-row-height:{Constants.DefaultRowHeight}px; --gutter-width:{Constants.GutterWidth}px; --max-cell-render-overflow:{Constants.MaxCellRenderOverflow}px; --content-lines:{$contentLines}; --min-height:{$minHeight}px; --controls-height:{Constants.ControlsHeight}px; --scroll-bar-size:{Constants.ScrollBarSize}px;"
 >
   {#if $$slots.controls}
     <div class="controls">
diff --git a/packages/frontend-core/src/components/grid/lib/utils.js b/packages/frontend-core/src/components/grid/lib/utils.js
index 1988b66cc2..b5485abc36 100644
--- a/packages/frontend-core/src/components/grid/lib/utils.js
+++ b/packages/frontend-core/src/components/grid/lib/utils.js
@@ -1,6 +1,3 @@
-import { helpers } from "@budibase/shared-core"
-import { TypeIconMap } from "../../../constants"
-
 // We can't use "-" as a separator as this can be present in the ID
 // or column name, so we use something very unusual to avoid this problem
 const JOINING_CHARACTER = "‽‽"
@@ -18,24 +15,6 @@ export const getCellID = (rowId, fieldName) => {
   return `${rowId}${JOINING_CHARACTER}${fieldName}`
 }
 
-export const getColumnIcon = column => {
-  if (column.schema.autocolumn) {
-    return "MagicWand"
-  }
-
-  if (helpers.schema.isDeprecatedSingleUserColumn(column.schema)) {
-    return "User"
-  }
-
-  const { type, subtype } = column.schema
-  const result =
-    typeof TypeIconMap[type] === "object" && subtype
-      ? TypeIconMap[type][subtype]
-      : TypeIconMap[type]
-
-  return result || "Text"
-}
-
 export const parseEventLocation = e => {
   return {
     x: e.clientX ?? e.touches?.[0]?.clientX,
diff --git a/packages/frontend-core/src/utils/index.js b/packages/frontend-core/src/utils/index.js
index 9eb7206012..f471446678 100644
--- a/packages/frontend-core/src/utils/index.js
+++ b/packages/frontend-core/src/utils/index.js
@@ -5,6 +5,7 @@ export * as RoleUtils from "./roles"
 export * as Utils from "./utils"
 export * as RowUtils from "./rows"
 export * as search from "./searchFields"
+export * as SchemaUtils from "./schema"
 export { memo, derivedMemo } from "./memo"
 export { createWebsocket } from "./websocket"
 export * from "./download"
diff --git a/packages/frontend-core/src/utils/schema.js b/packages/frontend-core/src/utils/schema.js
new file mode 100644
index 0000000000..7185b30d10
--- /dev/null
+++ b/packages/frontend-core/src/utils/schema.js
@@ -0,0 +1,20 @@
+import { helpers } from "@budibase/shared-core"
+import { TypeIconMap } from "../constants"
+
+export const getColumnIcon = column => {
+  if (column.schema.autocolumn) {
+    return "MagicWand"
+  }
+
+  if (helpers.schema.isDeprecatedSingleUserColumn(column.schema)) {
+    return "User"
+  }
+
+  const { type, subtype } = column.schema
+  const result =
+    typeof TypeIconMap[type] === "object" && subtype
+      ? TypeIconMap[type][subtype]
+      : TypeIconMap[type]
+
+  return result || "Text"
+}