diff --git a/lerna.json b/lerna.json
index fb239ee35d..5e28c36166 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.29.24",
+  "version": "2.29.25",
   "npmClient": "yarn",
   "packages": [
     "packages/*",
diff --git a/package.json b/package.json
index 29b87898ac..f3cbd75836 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "@types/proper-lockfile": "^4.1.4",
     "@typescript-eslint/parser": "6.9.0",
     "esbuild": "^0.18.17",
-    "esbuild-node-externals": "^1.8.0",
+    "esbuild-node-externals": "^1.14.0",
     "eslint": "^8.52.0",
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-jest": "^27.9.0",
diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts
index f3c3beeaab..feeba6061e 100644
--- a/packages/backend-core/src/db/couch/DatabaseImpl.ts
+++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts
@@ -56,24 +56,24 @@ class CouchDBError extends Error implements DBError {
   constructor(
     message: string,
     info: {
-      status: number | undefined
-      statusCode: number | undefined
+      status?: number
+      statusCode?: number
       name: string
-      errid: string
-      description: string
-      reason: string
-      error: string
+      errid?: string
+      description?: string
+      reason?: string
+      error?: string
     }
   ) {
     super(message)
     const statusCode = info.status || info.statusCode || 500
     this.status = statusCode
     this.statusCode = statusCode
-    this.reason = info.reason
+    this.reason = info.reason || "Unknown"
     this.name = info.name
-    this.errid = info.errid
-    this.description = info.description
-    this.error = info.error
+    this.errid = info.errid || "Unknown"
+    this.description = info.description || "Unknown"
+    this.error = info.error || "Not found"
   }
 }
 
@@ -246,6 +246,35 @@ export class DatabaseImpl implements Database {
     })
   }
 
+  async bulkRemove(documents: Document[], opts?: { silenceErrors?: boolean }) {
+    const response: Nano.DocumentBulkResponse[] = await this.performCall(db => {
+      return () =>
+        db.bulk({
+          docs: documents.map(doc => ({
+            ...doc,
+            _deleted: true,
+          })),
+        })
+    })
+    if (opts?.silenceErrors) {
+      return
+    }
+    let errorFound = false
+    let errorMessage: string = "Unable to bulk remove documents: "
+    for (let res of response) {
+      if (res.error) {
+        errorFound = true
+        errorMessage += res.error
+      }
+    }
+    if (errorFound) {
+      throw new CouchDBError(errorMessage, {
+        name: this.name,
+        status: 400,
+      })
+    }
+  }
+
   async post(document: AnyDocument, opts?: DatabasePutOpts) {
     if (!document._id) {
       document._id = newid()
diff --git a/packages/backend-core/src/db/instrumentation.ts b/packages/backend-core/src/db/instrumentation.ts
index 4e2b147ef3..7026224564 100644
--- a/packages/backend-core/src/db/instrumentation.ts
+++ b/packages/backend-core/src/db/instrumentation.ts
@@ -71,6 +71,16 @@ export class DDInstrumentedDatabase implements Database {
     })
   }
 
+  bulkRemove(
+    documents: Document[],
+    opts?: { silenceErrors?: boolean }
+  ): Promise<void> {
+    return tracer.trace("db.bulkRemove", span => {
+      span?.addTags({ db_name: this.name, num_docs: documents.length })
+      return this.db.bulkRemove(documents, opts)
+    })
+  }
+
   put(
     document: AnyDocument,
     opts?: DatabasePutOpts | undefined
diff --git a/packages/backend-core/src/db/views.ts b/packages/backend-core/src/db/views.ts
index 5d9c5b74d3..6ee06d12ef 100644
--- a/packages/backend-core/src/db/views.ts
+++ b/packages/backend-core/src/db/views.ts
@@ -199,9 +199,8 @@ export const createPlatformUserView = async () => {
 
 export const queryPlatformView = async <T extends Document>(
   viewName: ViewName,
-  params: DatabaseQueryOpts,
-  opts?: QueryViewOptions
-): Promise<T[] | T> => {
+  params: DatabaseQueryOpts
+): Promise<T[]> => {
   const CreateFuncByName: any = {
     [ViewName.ACCOUNT_BY_EMAIL]: createPlatformAccountEmailView,
     [ViewName.PLATFORM_USERS_LOWERCASE]: createPlatformUserView,
@@ -209,7 +208,9 @@ export const queryPlatformView = async <T extends Document>(
 
   return doWithDB(StaticDatabases.PLATFORM_INFO.name, async (db: Database) => {
     const createFn = CreateFuncByName[viewName]
-    return queryView(viewName, params, db, createFn, opts)
+    return queryView(viewName, params, db, createFn, {
+      arrayResponse: true,
+    }) as Promise<T[]>
   })
 }
 
diff --git a/packages/backend-core/src/platform/users.ts b/packages/backend-core/src/platform/users.ts
index ccaad76b19..9378e23724 100644
--- a/packages/backend-core/src/platform/users.ts
+++ b/packages/backend-core/src/platform/users.ts
@@ -25,6 +25,11 @@ export async function getUserDoc(emailOrId: string): Promise<PlatformUser> {
   return db.get(emailOrId)
 }
 
+export async function updateUserDoc(platformUser: PlatformUserById) {
+  const db = getPlatformDB()
+  await db.put(platformUser)
+}
+
 // CREATE
 
 function newUserIdDoc(id: string, tenantId: string): PlatformUserById {
@@ -113,15 +118,12 @@ export async function addUser(
 export async function removeUser(user: User) {
   const db = getPlatformDB()
   const keys = [user._id!, user.email]
-  const userDocs = await db.allDocs({
+  const userDocs = await db.allDocs<User>({
     keys,
     include_docs: true,
   })
-  const toDelete = userDocs.rows.map((row: any) => {
-    return {
-      ...row.doc,
-      _deleted: true,
-    }
-  })
-  await db.bulkDocs(toDelete)
+  await db.bulkRemove(
+    userDocs.rows.map(row => row.doc!),
+    { silenceErrors: true }
+  )
 }
diff --git a/packages/backend-core/src/users/db.ts b/packages/backend-core/src/users/db.ts
index 4865ebb5bc..c96c615f4b 100644
--- a/packages/backend-core/src/users/db.ts
+++ b/packages/backend-core/src/users/db.ts
@@ -18,6 +18,9 @@ import {
   User,
   UserStatus,
   UserGroup,
+  PlatformUserBySsoId,
+  PlatformUserById,
+  AnyDocument,
 } from "@budibase/types"
 import {
   getAccountHolderFromUserIds,
@@ -25,7 +28,11 @@ import {
   isCreator,
   validateUniqueUser,
 } from "./utils"
-import { searchExistingEmails } from "./lookup"
+import {
+  getFirstPlatformUser,
+  getPlatformUsers,
+  searchExistingEmails,
+} from "./lookup"
 import { hash } from "../utils"
 import { validatePassword } from "../security"
 
@@ -446,9 +453,32 @@ export class UserDB {
       creator => !!creator
     ).length
 
+    const ssoUsersToDelete: AnyDocument[] = []
     for (let user of usersToDelete) {
+      const platformUser = (await getFirstPlatformUser(
+        user._id!
+      )) as PlatformUserById
+      const ssoId = platformUser.ssoId
+      if (ssoId) {
+        // Need to get the _rev of the SSO user doc to delete it. The view also returns docs that have the ssoId property, so we need to ignore those.
+        const ssoUsers = (await getPlatformUsers(
+          ssoId
+        )) as PlatformUserBySsoId[]
+        ssoUsers
+          .filter(user => user.ssoId == null)
+          .forEach(user => {
+            ssoUsersToDelete.push({
+              ...user,
+              _deleted: true,
+            })
+          })
+      }
       await bulkDeleteProcessing(user)
     }
+
+    // Delete any associated SSO user docs
+    await platform.getPlatformDB().bulkDocs(ssoUsersToDelete)
+
     await UserDB.quotas.removeUsers(toDelete.length, creatorsToDeleteCount)
 
     // Build Response
diff --git a/packages/backend-core/src/users/lookup.ts b/packages/backend-core/src/users/lookup.ts
index 355be74dab..5324ba950f 100644
--- a/packages/backend-core/src/users/lookup.ts
+++ b/packages/backend-core/src/users/lookup.ts
@@ -34,15 +34,22 @@ export async function searchExistingEmails(emails: string[]) {
 }
 
 // lookup, could be email or userId, either will return a doc
-export async function getPlatformUser(
+export async function getPlatformUsers(
   identifier: string
-): Promise<PlatformUser | null> {
+): Promise<PlatformUser[]> {
   // use the view here and allow to find anyone regardless of casing
   // Use lowercase to ensure email login is case insensitive
-  return (await dbUtils.queryPlatformView(ViewName.PLATFORM_USERS_LOWERCASE, {
+  return await dbUtils.queryPlatformView(ViewName.PLATFORM_USERS_LOWERCASE, {
     keys: [identifier.toLowerCase()],
     include_docs: true,
-  })) as PlatformUser
+  })
+}
+
+export async function getFirstPlatformUser(
+  identifier: string
+): Promise<PlatformUser | null> {
+  const platformUserDocs = await getPlatformUsers(identifier)
+  return platformUserDocs[0] ?? null
 }
 
 export async function getExistingTenantUsers(
@@ -74,15 +81,10 @@ export async function getExistingPlatformUsers(
     keys: lcEmails,
     include_docs: true,
   }
-
-  const opts = {
-    arrayResponse: true,
-  }
-  return (await dbUtils.queryPlatformView(
+  return await dbUtils.queryPlatformView(
     ViewName.PLATFORM_USERS_LOWERCASE,
-    params,
-    opts
-  )) as PlatformUserByEmail[]
+    params
+  )
 }
 
 export async function getExistingAccounts(
@@ -93,14 +95,5 @@ export async function getExistingAccounts(
     keys: lcEmails,
     include_docs: true,
   }
-
-  const opts = {
-    arrayResponse: true,
-  }
-
-  return (await dbUtils.queryPlatformView(
-    ViewName.ACCOUNT_BY_EMAIL,
-    params,
-    opts
-  )) as AccountMetadata[]
+  return await dbUtils.queryPlatformView(ViewName.ACCOUNT_BY_EMAIL, params)
 }
diff --git a/packages/backend-core/src/users/utils.ts b/packages/backend-core/src/users/utils.ts
index 348ad1532f..e1e3da181d 100644
--- a/packages/backend-core/src/users/utils.ts
+++ b/packages/backend-core/src/users/utils.ts
@@ -1,7 +1,7 @@
 import { CloudAccount, ContextUser, User, UserGroup } from "@budibase/types"
 import * as accountSdk from "../accounts"
 import env from "../environment"
-import { getPlatformUser } from "./lookup"
+import { getFirstPlatformUser } from "./lookup"
 import { EmailUnavailableError } from "../errors"
 import { getTenantId } from "../context"
 import { sdk } from "@budibase/shared-core"
@@ -51,7 +51,7 @@ async function isCreatorByGroupMembership(user?: User | ContextUser) {
 export async function validateUniqueUser(email: string, tenantId: string) {
   // check budibase users in other tenants
   if (env.MULTI_TENANCY) {
-    const tenantUser = await getPlatformUser(email)
+    const tenantUser = await getFirstPlatformUser(email)
     if (tenantUser != null && tenantUser.tenantId !== tenantId) {
       throw new EmailUnavailableError(email)
     }
diff --git a/packages/backend-core/tests/core/utilities/jestUtils.ts b/packages/backend-core/tests/core/utilities/jestUtils.ts
index a49c2a795e..683a4e025b 100644
--- a/packages/backend-core/tests/core/utilities/jestUtils.ts
+++ b/packages/backend-core/tests/core/utilities/jestUtils.ts
@@ -1,6 +1,6 @@
 import {
-  CONSTANT_EXTERNAL_ROW_COLS,
-  CONSTANT_INTERNAL_ROW_COLS,
+  PROTECTED_EXTERNAL_COLUMNS,
+  PROTECTED_INTERNAL_COLUMNS,
 } from "@budibase/shared-core"
 
 export function expectFunctionWasCalledTimesWith(
@@ -14,7 +14,7 @@ export function expectFunctionWasCalledTimesWith(
 }
 
 export const expectAnyInternalColsAttributes: {
-  [K in (typeof CONSTANT_INTERNAL_ROW_COLS)[number]]: any
+  [K in (typeof PROTECTED_INTERNAL_COLUMNS)[number]]: any
 } = {
   tableId: expect.anything(),
   type: expect.anything(),
@@ -25,7 +25,7 @@ export const expectAnyInternalColsAttributes: {
 }
 
 export const expectAnyExternalColsAttributes: {
-  [K in (typeof CONSTANT_EXTERNAL_ROW_COLS)[number]]: any
+  [K in (typeof PROTECTED_EXTERNAL_COLUMNS)[number]]: any
 } = {
   tableId: expect.anything(),
   _id: expect.anything(),
diff --git a/packages/bbui/src/InlineAlert/InlineAlert.svelte b/packages/bbui/src/InlineAlert/InlineAlert.svelte
index bfc56818cb..3b98936f62 100644
--- a/packages/bbui/src/InlineAlert/InlineAlert.svelte
+++ b/packages/bbui/src/InlineAlert/InlineAlert.svelte
@@ -36,9 +36,11 @@
     <use xlink:href="#spectrum-icon-18-{icon}" />
   </svg>
   <div class="spectrum-InLineAlert-header">{header}</div>
-  {#each split as splitMsg}
-    <div class="spectrum-InLineAlert-content">{splitMsg}</div>
-  {/each}
+  <slot>
+    {#each split as splitMsg}
+      <div class="spectrum-InLineAlert-content">{splitMsg}</div>
+    {/each}
+  </slot>
   {#if onConfirm}
     <div class="spectrum-InLineAlert-footer button">
       <Button {cta} secondary={cta ? false : true} on:click={onConfirm}
diff --git a/packages/bbui/src/StatusLight/StatusLight.svelte b/packages/bbui/src/StatusLight/StatusLight.svelte
index 5d239795d2..f3ef1f62de 100644
--- a/packages/bbui/src/StatusLight/StatusLight.svelte
+++ b/packages/bbui/src/StatusLight/StatusLight.svelte
@@ -30,7 +30,7 @@
   class:custom={!!color}
   class:square
   class:hoverable
-  style={`--color: ${color};`}
+  style={`--color: ${color ?? "var(--spectrum-global-color-gray-400)"};`}
   class:spectrum-StatusLight--celery={celery}
   class:spectrum-StatusLight--yellow={yellow}
   class:spectrum-StatusLight--fuchsia={fuchsia}
@@ -61,13 +61,17 @@
     min-height: 0;
     padding-top: 0;
     padding-bottom: 0;
-    transition: color ease-out 130ms;
   }
   .spectrum-StatusLight.withText::before {
     margin-right: 10px;
   }
+
+  .spectrum-StatusLight::before {
+    transition: background-color ease-out 160ms;
+  }
+
   .custom::before {
-    background: var(--color) !important;
+    background-color: var(--color) !important;
   }
   .square::before {
     width: 14px;
@@ -79,4 +83,14 @@
     cursor: pointer;
     color: var(--spectrum-global-color-gray-900);
   }
+
+  .spectrum-StatusLight--sizeXS::before {
+    width: 10px;
+    height: 10px;
+    border-radius: 2px;
+  }
+
+  .spectrum-StatusLight--disabled::before {
+    background-color: var(--spectrum-global-color-gray-400) !important;
+  }
 </style>
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index 811909845a..c88317c79f 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -3,6 +3,7 @@
     automationStore,
     selectedAutomation,
     permissions,
+    selectedAutomationDisplayData,
   } from "stores/builder"
   import {
     Icon,
@@ -14,6 +15,7 @@
     notifications,
     Label,
     AbsTooltip,
+    InlineAlert,
   } from "@budibase/bbui"
   import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
   import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
@@ -49,6 +51,8 @@
   $: isAppAction && setPermissions(role)
   $: isAppAction && getPermissions(automationId)
 
+  $: triggerInfo = $selectedAutomationDisplayData?.triggerInfo
+
   async function setPermissions(role) {
     if (!role || !automationId) {
       return
@@ -183,6 +187,12 @@
           {block}
           {webhookModal}
         />
+        {#if isTrigger && triggerInfo}
+          <InlineAlert
+            header={triggerInfo.type}
+            message={`This trigger is tied to the row action ${triggerInfo.rowAction.name} on your ${triggerInfo.table.name} table`}
+          />
+        {/if}
         {#if lastStep}
           <Button on:click={() => testDataModal.show()} cta>
             Finish and test automation
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index 2a553f8b48..f656a1ecb9 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -81,7 +81,7 @@
   // Check the schema to see if required fields have been entered
   $: isError =
     !isTriggerValid(trigger) ||
-    !trigger.schema.outputs.required?.every(
+    !(trigger.schema.outputs.required || []).every(
       required => $memoTestData?.[required] || required !== "row"
     )
 
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte
index 31f86f5d78..df5ac3bd98 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte
@@ -6,6 +6,7 @@
     contextMenuStore,
   } from "stores/builder"
   import { notifications, Icon } from "@budibase/bbui"
+  import { sdk } from "@budibase/shared-core"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import UpdateAutomationModal from "components/automation/AutomationPanel/UpdateAutomationModal.svelte"
   import NavItem from "components/common/NavItem.svelte"
@@ -35,45 +36,53 @@
   }
 
   const getContextMenuItems = () => {
-    return [
-      {
-        icon: "Delete",
-        name: "Delete",
-        keyBind: null,
-        visible: true,
-        disabled: false,
-        callback: confirmDeleteDialog.show,
+    const isRowAction = sdk.automations.isRowAction(automation)
+    const result = []
+    if (!isRowAction) {
+      result.push(
+        ...[
+          {
+            icon: "Delete",
+            name: "Delete",
+            keyBind: null,
+            visible: true,
+            disabled: false,
+            callback: confirmDeleteDialog.show,
+          },
+          {
+            icon: "Edit",
+            name: "Edit",
+            keyBind: null,
+            visible: true,
+            disabled: false,
+            callback: updateAutomationDialog.show,
+          },
+          {
+            icon: "Duplicate",
+            name: "Duplicate",
+            keyBind: null,
+            visible: true,
+            disabled: automation.definition.trigger.name === "Webhook",
+            callback: duplicateAutomation,
+          },
+        ]
+      )
+    }
+
+    result.push({
+      icon: automation.disabled ? "CheckmarkCircle" : "Cancel",
+      name: automation.disabled ? "Activate" : "Pause",
+      keyBind: null,
+      visible: true,
+      disabled: false,
+      callback: () => {
+        automationStore.actions.toggleDisabled(
+          automation._id,
+          automation.disabled
+        )
       },
-      {
-        icon: "Edit",
-        name: "Edit",
-        keyBind: null,
-        visible: true,
-        disabled: false,
-        callback: updateAutomationDialog.show,
-      },
-      {
-        icon: "Duplicate",
-        name: "Duplicate",
-        keyBind: null,
-        visible: true,
-        disabled: automation.definition.trigger.name === "Webhook",
-        callback: duplicateAutomation,
-      },
-      {
-        icon: automation.disabled ? "CheckmarkCircle" : "Cancel",
-        name: automation.disabled ? "Activate" : "Pause",
-        keyBind: null,
-        visible: true,
-        disabled: false,
-        callback: () => {
-          automationStore.actions.toggleDisabled(
-            automation._id,
-            automation.disabled
-          )
-        },
-      },
-    ]
+    })
+    return result
   }
 
   const openContextMenu = e => {
@@ -89,7 +98,7 @@
   on:contextmenu={openContextMenu}
   {icon}
   iconColor={"var(--spectrum-global-color-gray-900)"}
-  text={automation.name}
+  text={automation.displayName}
   selected={automation._id === $selectedAutomation?._id}
   hovering={automation._id === $contextMenuStore.id}
   on:click={() => automationStore.actions.select(automation._id)}
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
index c3ef3157bd..e017e6a26a 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
@@ -17,9 +17,15 @@
         automation.name.toLowerCase().includes(searchString.toLowerCase())
       )
     })
+    .map(automation => ({
+      ...automation,
+      displayName:
+        $automationStore.automationDisplayData[automation._id].displayName ||
+        automation.name,
+    }))
     .sort((a, b) => {
-      const lowerA = a.name.toLowerCase()
-      const lowerB = b.name.toLowerCase()
+      const lowerA = a.displayName.toLowerCase()
+      const lowerB = b.displayName.toLowerCase()
       return lowerA > lowerB ? 1 : -1
     })
 
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 677ee79981..f3759f7afd 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -876,6 +876,7 @@
                 options={value.enum}
                 getOptionLabel={(x, idx) =>
                   value.pretty ? value.pretty[idx] : x}
+                disabled={value.readonly}
               />
             {:else if value.type === "json"}
               <Editor
@@ -884,6 +885,7 @@
                 mode="json"
                 value={inputData[key]?.value}
                 on:change={e => onChange({ [key]: e.detail })}
+                readOnly={value.readonly}
               />
             {:else if value.type === "boolean"}
               <div style="margin-top: 10px">
@@ -891,6 +893,7 @@
                   text={value.title}
                   value={inputData[key]}
                   on:change={e => onChange({ [key]: e.detail })}
+                  disabled={value.readonly}
                 />
               </div>
             {:else if value.type === "date"}
@@ -904,6 +907,7 @@
                 allowJS={true}
                 updateOnChange={false}
                 drawerLeft="260px"
+                disabled={value.readonly}
               >
                 <DatePicker
                   value={inputData[key]}
@@ -915,6 +919,7 @@
                 on:change={e => onChange({ [key]: e.detail })}
                 value={inputData[key]}
                 options={Object.keys(table?.schema || {})}
+                disabled={value.readonly}
               />
             {:else if value.type === "attachment" || value.type === "signature_single"}
               <div class="attachment-field-wrapper">
@@ -1028,6 +1033,7 @@
                 {isTrigger}
                 value={inputData[key]}
                 on:change={e => onChange({ [key]: e.detail })}
+                disabled={value.readonly}
               />
             {:else if value.customType === "webhookUrl"}
               <WebhookDisplay value={inputData[key]} />
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index f982ef5333..a9ea90242a 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -17,8 +17,8 @@
     SWITCHABLE_TYPES,
     ValidColumnNameRegex,
     helpers,
-    CONSTANT_INTERNAL_ROW_COLS,
-    CONSTANT_EXTERNAL_ROW_COLS,
+    PROTECTED_INTERNAL_COLUMNS,
+    PROTECTED_EXTERNAL_COLUMNS,
   } from "@budibase/shared-core"
   import { createEventDispatcher, getContext, onMount } from "svelte"
   import { cloneDeep } from "lodash/fp"
@@ -489,8 +489,8 @@
     }
     const newError = {}
     const prohibited = externalTable
-      ? CONSTANT_EXTERNAL_ROW_COLS
-      : CONSTANT_INTERNAL_ROW_COLS
+      ? PROTECTED_EXTERNAL_COLUMNS
+      : PROTECTED_INTERNAL_COLUMNS
     if (!externalTable && fieldInfo.name?.startsWith("_")) {
       newError.name = `Column name cannot start with an underscore.`
     } else if (fieldInfo.name && !fieldInfo.name.match(ValidColumnNameRegex)) {
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DeleteConfirmationModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DeleteConfirmationModal.svelte
index 13380c2700..3d36d1e00e 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DeleteConfirmationModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DeleteConfirmationModal.svelte
@@ -33,6 +33,5 @@
   title="Confirm Deletion"
 >
   Are you sure you wish to delete the datasource
-  <i>{datasource.name}?</i>
-  This action cannot be undone.
+  <i>{datasource.name}</i>? This action cannot be undone.
 </ConfirmDialog>
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte
index 21a763be08..03da9f3fd3 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { goto, params } from "@roxi/routify"
-  import { tables, datasources, screenStore } from "stores/builder"
-  import { Input, notifications } from "@budibase/bbui"
+  import { appStore, tables, datasources, screenStore } from "stores/builder"
+  import { InlineAlert, Link, Input, notifications } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { DB_TYPE_EXTERNAL } from "constants/backend"
 
@@ -9,28 +9,41 @@
 
   let confirmDeleteDialog
 
-  export const show = () => {
-    templateScreens = $screenStore.screens.filter(
-      screen => screen.autoTableId === table._id
-    )
-    willBeDeleted = ["All table data"].concat(
-      templateScreens.map(screen => `Screen ${screen.routing?.route || ""}`)
-    )
-    confirmDeleteDialog.show()
+  let screensPossiblyAffected = []
+  let viewsMessage = ""
+  let deleteTableName
+
+  const getViewsMessage = () => {
+    const views = Object.values(table?.views ?? [])
+    if (views.length < 1) {
+      return ""
+    }
+    if (views.length === 1) {
+      return ", including 1 view"
+    }
+
+    return `, including ${views.length} views`
   }
 
-  let templateScreens
-  let willBeDeleted
-  let deleteTableName
+  export const show = () => {
+    viewsMessage = getViewsMessage()
+    screensPossiblyAffected = $screenStore.screens
+      .filter(
+        screen => screen.autoTableId === table._id && screen.routing?.route
+      )
+      .map(screen => ({
+        text: screen.routing.route,
+        url: `/builder/app/${$appStore.appId}/design/${screen._id}`,
+      }))
+
+    confirmDeleteDialog.show()
+  }
 
   async function deleteTable() {
     const isSelected = $params.tableId === table._id
     try {
       await tables.delete(table)
-      // Screens need deleted one at a time because of undo/redo
-      for (let screen of templateScreens) {
-        await screenStore.delete(screen)
-      }
+
       if (table.sourceType === DB_TYPE_EXTERNAL) {
         await datasources.fetch()
       }
@@ -46,6 +59,10 @@
   function hideDeleteDialog() {
     deleteTableName = ""
   }
+
+  const autofillTableName = () => {
+    deleteTableName = table.name
+  }
 </script>
 
 <ConfirmDialog
@@ -56,34 +73,103 @@
   title="Confirm Deletion"
   disabled={deleteTableName !== table.name}
 >
-  <p>
-    Are you sure you wish to delete the table
-    <b>{table.name}?</b>
-    The following will also be deleted:
-  </p>
-  <b>
-    <div class="delete-items">
-      {#each willBeDeleted as item}
-        <div>{item}</div>
-      {/each}
-    </div>
-  </b>
-  <p>
-    This action cannot be undone - to continue please enter the table name below
-    to confirm.
-  </p>
-  <Input bind:value={deleteTableName} placeholder={table.name} />
+  <div class="content">
+    <p class="firstWarning">
+      Are you sure you wish to delete the table
+      <span class="tableNameLine">
+        <!-- svelte-ignore a11y-click-events-have-key-events -->
+        <!-- svelte-ignore a11y-no-static-element-interactions -->
+        <b on:click={autofillTableName} class="tableName">{table.name}</b>
+        <span>?</span>
+      </span>
+    </p>
+
+    <p class="secondWarning">All table data will be deleted{viewsMessage}.</p>
+    <p class="thirdWarning">This action <b>cannot be undone</b>.</p>
+
+    {#if screensPossiblyAffected.length > 0}
+      <div class="affectedScreens">
+        <InlineAlert
+          header="The following screens were originally generated from this table and may no longer function as expected"
+        >
+          <ul class="affectedScreensList">
+            {#each screensPossiblyAffected as item}
+              <li>
+                <Link quiet overBackground target="_blank" href={item.url}
+                  >{item.text}</Link
+                >
+              </li>
+            {/each}
+          </ul>
+        </InlineAlert>
+      </div>
+    {/if}
+    <p class="fourthWarning">Please enter the app name below to confirm.</p>
+    <Input bind:value={deleteTableName} placeholder={table.name} />
+  </div>
 </ConfirmDialog>
 
 <style>
-  div.delete-items {
-    margin-top: 10px;
-    margin-bottom: 10px;
-    margin-left: 10px;
+  .content {
+    margin-top: 0;
+    max-width: 320px;
   }
 
-  div.delete-items div {
+  .firstWarning {
+    margin: 0 0 12px;
+    max-width: 100%;
+  }
+
+  .tableNameLine {
+    display: inline-flex;
+    max-width: 100%;
+    vertical-align: bottom;
+  }
+
+  .tableName {
+    flex-grow: 1;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    cursor: pointer;
+  }
+
+  .secondWarning {
+    margin: 0;
+    max-width: 100%;
+  }
+
+  .thirdWarning {
+    margin: 0 0 12px;
+    max-width: 100%;
+  }
+
+  .affectedScreens {
+    margin: 18px 0;
+    max-width: 100%;
+    margin-bottom: 24px;
+  }
+
+  .affectedScreens :global(.spectrum-InLineAlert) {
+    max-width: 100%;
+  }
+
+  .affectedScreensList {
+    padding: 0;
+    margin-bottom: 0;
+  }
+
+  .affectedScreensList li {
+    display: block;
+    max-width: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
     margin-top: 4px;
-    font-weight: 600;
+  }
+
+  .fourthWarning {
+    margin: 12px 0 6px;
+    max-width: 100%;
   }
 </style>
diff --git a/packages/builder/src/components/common/RoleIcon.svelte b/packages/builder/src/components/common/RoleIcon.svelte
new file mode 100644
index 0000000000..1bd6ba49bc
--- /dev/null
+++ b/packages/builder/src/components/common/RoleIcon.svelte
@@ -0,0 +1,12 @@
+<script>
+  import { RoleUtils } from "@budibase/frontend-core"
+  import { StatusLight } from "@budibase/bbui"
+
+  export let id
+  export let size = "M"
+  export let disabled = false
+
+  $: color = RoleUtils.getRoleColour(id)
+</script>
+
+<StatusLight square {disabled} {size} {color} />
diff --git a/packages/builder/src/components/common/users/PasswordRepeatInput.svelte b/packages/builder/src/components/common/users/PasswordRepeatInput.svelte
index 4a453ef049..9aa9000720 100644
--- a/packages/builder/src/components/common/users/PasswordRepeatInput.svelte
+++ b/packages/builder/src/components/common/users/PasswordRepeatInput.svelte
@@ -1,20 +1,32 @@
 <script>
-  import { Layout, Input } from "@budibase/bbui"
+  import { FancyForm, FancyInput } from "@budibase/bbui"
   import { createValidationStore, requiredValidator } from "helpers/validation"
 
   export let password
+  export let passwordForm
   export let error
 
+  const validatePassword = value => {
+    if (!value || value.length < 12) {
+      return "Please enter at least 12 characters. We recommend using machine generated or random passwords."
+    }
+    return null
+  }
+
   const [firstPassword, passwordError, firstTouched] = createValidationStore(
     "",
     requiredValidator
   )
   const [repeatPassword, _, repeatTouched] = createValidationStore(
     "",
-    requiredValidator
+    requiredValidator,
+    validatePassword
   )
 
   $: password = $firstPassword
+  $: firstPasswordError =
+    ($firstTouched && $passwordError) ||
+    ($repeatTouched && validatePassword(password))
   $: error =
     !$firstPassword ||
     !$firstTouched ||
@@ -22,19 +34,19 @@
     $firstPassword !== $repeatPassword
 </script>
 
-<Layout gap="XS" noPadding>
-  <Input
+<FancyForm bind:this={passwordForm}>
+  <FancyInput
     label="Password"
     type="password"
-    error={$firstTouched && $passwordError}
+    error={firstPasswordError}
     bind:value={$firstPassword}
   />
-  <Input
-    label="Repeat Password"
+  <FancyInput
+    label="Repeat password"
     type="password"
     error={$repeatTouched &&
       $firstPassword !== $repeatPassword &&
       "Passwords must match"}
     bind:value={$repeatPassword}
   />
-</Layout>
+</FancyForm>
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
index d2b5174139..99b5ace847 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@@ -115,6 +115,7 @@
     })
   $: fields = bindings
     .filter(x => arrayTypes.includes(x.fieldSchema?.type))
+    .filter(x => x.fieldSchema?.tableId != null)
     .map(binding => {
       const { providerId, readableBinding, runtimeBinding } = binding
       const { name, type, tableId } = binding.fieldSchema
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte
index 68d74218c8..7c2775e054 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte
@@ -1,108 +1,88 @@
 <script>
   import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
   import DatasourceModal from "./DatasourceModal.svelte"
-  import ScreenRoleModal from "./ScreenRoleModal.svelte"
   import sanitizeUrl from "helpers/sanitizeUrl"
   import FormTypeModal from "./FormTypeModal.svelte"
   import { Modal, notifications } from "@budibase/bbui"
   import {
     screenStore,
     navigationStore,
-    tables,
+    permissions as permissionsStore,
     builderStore,
   } from "stores/builder"
   import { auth } from "stores/portal"
   import { get } from "svelte/store"
-  import getTemplates from "templates"
-  import { Roles } from "constants/backend"
   import { capitalise } from "helpers"
   import { goto } from "@roxi/routify"
   import { TOUR_KEYS } from "components/portal/onboarding/tours.js"
+  import blankScreen from "templates/blankScreen"
   import formScreen from "templates/formScreen"
-  import gridListScreen from "templates/gridListScreen"
+  import gridScreen from "templates/gridScreen"
   import gridDetailsScreen from "templates/gridDetailsScreen"
+  import { Roles } from "constants/backend"
 
   let mode
-  let pendingScreen
 
-  // Modal refs
   let screenDetailsModal
   let datasourceModal
-  let screenAccessRoleModal
   let formTypeModal
 
-  // Cache variables for workflow
-  let screenAccessRole = Roles.BASIC
+  let selectedTablesAndViews = []
+  let permissions = {}
 
-  let templates = null
-  let screens = null
+  export const show = newMode => {
+    mode = newMode
+    selectedTablesAndViews = []
+    permissions = {}
 
-  let selectedDatasources = null
-  let blankScreenUrl = null
-  let screenMode = null
-  let formType = null
-
-  // Creates an array of screens, checking and sanitising their URLs
-  const createScreens = async ({ screens, screenAccessRole }) => {
-    if (!screens?.length) {
-      return
+    if (mode === "grid" || mode === "gridDetails" || mode === "form") {
+      datasourceModal.show()
+    } else if (mode === "blank") {
+      screenDetailsModal.show()
+    } else {
+      throw new Error("Invalid mode provided")
     }
+  }
 
+  const createScreen = async screen => {
     try {
-      let createdScreens = []
-
-      for (let screen of screens) {
-        // Check we aren't clashing with an existing URL
-        if (hasExistingUrl(screen.routing.route)) {
-          let suffix = 2
-          let candidateUrl = makeCandidateUrl(screen, suffix)
-          while (hasExistingUrl(candidateUrl)) {
-            candidateUrl = makeCandidateUrl(screen, ++suffix)
-          }
-          screen.routing.route = candidateUrl
+      // Check we aren't clashing with an existing URL
+      if (hasExistingUrl(screen.routing.route, screen.routing.roleId)) {
+        let suffix = 2
+        let candidateUrl = makeCandidateUrl(screen, suffix)
+        while (hasExistingUrl(candidateUrl, screen.routing.roleId)) {
+          candidateUrl = makeCandidateUrl(screen, ++suffix)
         }
-
-        // Sanitise URL
-        screen.routing.route = sanitizeUrl(screen.routing.route)
-
-        // Use the currently selected role
-        if (!screenAccessRole) {
-          return
-        }
-        screen.routing.roleId = screenAccessRole
-
-        // Create the screen
-        const response = await screenStore.save(screen)
-        createdScreens.push(response)
-
-        // Add link in layout. We only ever actually create 1 screen now, even
-        // for autoscreens, so it's always safe to do this.
-        await navigationStore.saveLink(
-          screen.routing.route,
-          capitalise(screen.routing.route.split("/")[1]),
-          screenAccessRole
-        )
+        screen.routing.route = candidateUrl
       }
 
-      return createdScreens
+      screen.routing.route = sanitizeUrl(screen.routing.route)
+
+      return await screenStore.save(screen)
     } catch (error) {
       console.error(error)
       notifications.error("Error creating screens")
     }
   }
 
+  const addNavigationLink = async screen =>
+    await navigationStore.saveLink(
+      screen.routing.route,
+      capitalise(screen.routing.route.split("/")[1]),
+      screen.routing.roleId
+    )
+
   // Checks if any screens exist in the store with the given route and
   // currently selected role
-  const hasExistingUrl = url => {
-    const roleId = screenAccessRole
+  const hasExistingUrl = (url, screenAccessRole) => {
     const screens = get(screenStore).screens.filter(
-      s => s.routing.roleId === roleId
+      s => s.routing.roleId === screenAccessRole
     )
     return !!screens.find(s => s.routing?.route === url)
   }
 
-  // Constructs a candidate URL for a new screen, suffixing the base of the
-  // screen's URL with a given suffix.
+  // Constructs a candidate URL for a new screen, appending a given suffix to the
+  // screen's URL
   // e.g. "/sales/:id" => "/sales-1/:id"
   const makeCandidateUrl = (screen, suffix) => {
     let url = screen.routing?.route || ""
@@ -117,105 +97,79 @@
     }
   }
 
-  // Handler for NewScreenModal
-  export const show = newMode => {
-    mode = newMode
-    templates = null
-    screens = null
-    selectedDatasources = null
-    blankScreenUrl = null
-    screenMode = mode
-    pendingScreen = null
-    screenAccessRole = Roles.BASIC
-    formType = null
-
-    if (mode === "grid" || mode === "gridDetails" || mode === "form") {
-      datasourceModal.show()
-    } else if (mode === "blank") {
-      let templates = getTemplates($tables.list)
-      const blankScreenTemplate = templates.find(
-        t => t.id === "createFromScratch"
-      )
-      pendingScreen = blankScreenTemplate.create()
-      screenDetailsModal.show()
-    } else {
-      throw new Error("Invalid mode provided")
-    }
-  }
-
-  // Handler for DatasourceModal confirmation, move to screen access select
-  const confirmScreenDatasources = async ({ datasources }) => {
-    selectedDatasources = datasources
-    if (screenMode === "form") {
+  const onSelectDatasources = async () => {
+    if (mode === "form") {
       formTypeModal.show()
-    } else {
-      screenAccessRoleModal.show()
+    } else if (mode === "grid") {
+      await createGridScreen()
+    } else if (mode === "gridDetails") {
+      await createGridDetailsScreen()
     }
   }
 
-  // Handler for Datasource Screen Creation
-  const completeDatasourceScreenCreation = async () => {
-    templates =
-      mode === "grid"
-        ? gridListScreen(selectedDatasources)
-        : gridDetailsScreen(selectedDatasources)
+  const createBlankScreen = async ({ screenUrl }) => {
+    const screenTemplate = blankScreen(screenUrl)
+    const screen = await createScreen(screenTemplate)
+    await addNavigationLink(screenTemplate)
 
-    const screens = templates.map(template => {
-      let screenTemplate = template.create()
-      screenTemplate.autoTableId = template.resourceId
-      return screenTemplate
-    })
-    const createdScreens = await createScreens({ screens, screenAccessRole })
-    loadNewScreen(createdScreens)
+    loadNewScreen(screen)
   }
 
-  const confirmScreenBlank = async ({ screenUrl }) => {
-    blankScreenUrl = screenUrl
-    screenAccessRoleModal.show()
-  }
+  const createGridScreen = async () => {
+    let firstScreen = null
 
-  // Submit request for a blank screen
-  const confirmBlankScreenCreation = async ({
-    screenUrl,
-    screenAccessRole,
-  }) => {
-    if (!pendingScreen) {
-      return
-    }
-    pendingScreen.routing.route = screenUrl
-    const createdScreens = await createScreens({
-      screens: [pendingScreen],
-      screenAccessRole,
-    })
-    loadNewScreen(createdScreens)
-  }
+    for (let tableOrView of selectedTablesAndViews) {
+      const screenTemplate = gridScreen(
+        tableOrView,
+        permissions[tableOrView.id]
+      )
 
-  const onConfirmFormType = () => {
-    screenAccessRoleModal.show()
-  }
+      const screen = await createScreen(screenTemplate)
+      await addNavigationLink(screen)
 
-  const loadNewScreen = createdScreens => {
-    const lastScreen = createdScreens.slice(-1)[0]
-
-    // Go to new screen
-    if (lastScreen?.props?._children.length) {
-      // Focus on the main component for the streen type
-      const mainComponent = lastScreen?.props?._children?.[0]._id
-      $goto(`./${lastScreen._id}/${mainComponent}`)
-    } else {
-      $goto(`./${lastScreen._id}`)
+      firstScreen ??= screen
     }
 
-    screenStore.select(lastScreen._id)
+    loadNewScreen(firstScreen)
   }
 
-  const confirmFormScreenCreation = async () => {
-    templates = formScreen(selectedDatasources, { actionType: formType })
-    screens = templates.map(template => {
-      let screenTemplate = template.create()
-      return screenTemplate
-    })
-    const createdScreens = await createScreens({ screens, screenAccessRole })
+  const createGridDetailsScreen = async () => {
+    let firstScreen = null
+
+    for (let tableOrView of selectedTablesAndViews) {
+      const screenTemplate = gridDetailsScreen(
+        tableOrView,
+        permissions[tableOrView.id]
+      )
+
+      const screen = await createScreen(screenTemplate)
+      await addNavigationLink(screen)
+
+      firstScreen ??= screen
+    }
+
+    loadNewScreen(firstScreen)
+  }
+
+  const createFormScreen = async formType => {
+    let firstScreen = null
+
+    for (let tableOrView of selectedTablesAndViews) {
+      const screenTemplate = formScreen(
+        tableOrView,
+        formType,
+        permissions[tableOrView.id]
+      )
+
+      const screen = await createScreen(screenTemplate)
+      // Only add a navigation link for `Create`, as both `Update` and `View`
+      // require an `id` in their URL in order to function.
+      if (formType === "Create") {
+        await addNavigationLink(screen)
+      }
+
+      firstScreen ??= screen
+    }
 
     if (formType === "Update" || formType === "Create") {
       const associatedTour =
@@ -229,66 +183,89 @@
       }
     }
 
-    // Go to new screen
-    loadNewScreen(createdScreens)
+    loadNewScreen(firstScreen)
   }
 
-  // Submit screen config for creation.
-  const confirmScreenCreation = async () => {
-    if (screenMode === "blank") {
-      confirmBlankScreenCreation({
-        screenUrl: blankScreenUrl,
-        screenAccessRole,
-      })
-    } else if (screenMode === "form") {
-      confirmFormScreenCreation()
+  const loadNewScreen = screen => {
+    if (screen?.props?._children.length) {
+      // Focus on the main component for the screen type
+      const mainComponent = screen?.props?._children?.[0]._id
+      $goto(`./${screen._id}/${mainComponent}`)
     } else {
-      completeDatasourceScreenCreation()
+      $goto(`./${screen._id}`)
     }
+
+    screenStore.select(screen._id)
   }
 
-  const roleSelectBack = () => {
-    if (screenMode === "blank") {
-      screenDetailsModal.show()
+  const fetchPermission = resourceId => {
+    permissions[resourceId] = { loading: true, read: null, write: null }
+
+    permissionsStore
+      .forResource(resourceId)
+      .then(permission => {
+        if (permissions[resourceId]?.loading) {
+          permissions[resourceId] = {
+            loading: false,
+            read: permission?.read?.role,
+            write: permission?.write?.role,
+          }
+        }
+      })
+      .catch(e => {
+        console.error("Error fetching permission data: ", e)
+
+        if (permissions[resourceId]?.loading) {
+          permissions[resourceId] = {
+            loading: false,
+            read: Roles.PUBLIC,
+            write: Roles.PUBLIC,
+          }
+        }
+      })
+  }
+
+  const deletePermission = resourceId => {
+    delete permissions[resourceId]
+    permissions = permissions
+  }
+
+  const handleTableOrViewToggle = ({ detail: tableOrView }) => {
+    const alreadySelected = selectedTablesAndViews.some(
+      selected => selected.id === tableOrView.id
+    )
+
+    if (!alreadySelected) {
+      fetchPermission(tableOrView.id)
+      selectedTablesAndViews = [...selectedTablesAndViews, tableOrView]
     } else {
-      datasourceModal.show()
+      deletePermission(tableOrView.id)
+      selectedTablesAndViews = selectedTablesAndViews.filter(
+        selected => selected.id !== tableOrView.id
+      )
     }
   }
 </script>
 
 <Modal bind:this={datasourceModal} autoFocus={false}>
-  <DatasourceModal {mode} onConfirm={confirmScreenDatasources} />
-</Modal>
-
-<Modal bind:this={screenAccessRoleModal}>
-  <ScreenRoleModal
-    onConfirm={() => {
-      confirmScreenCreation()
-    }}
-    bind:screenAccessRole
-    onCancel={roleSelectBack}
-    screenUrl={blankScreenUrl}
-    confirmText={screenMode === "form" ? "Confirm" : "Done"}
+  <DatasourceModal
+    {selectedTablesAndViews}
+    {permissions}
+    onConfirm={onSelectDatasources}
+    on:toggle={handleTableOrViewToggle}
   />
 </Modal>
 
 <Modal bind:this={screenDetailsModal}>
-  <ScreenDetailsModal
-    onConfirm={confirmScreenBlank}
-    initialUrl={blankScreenUrl}
-  />
+  <ScreenDetailsModal onConfirm={createBlankScreen} />
 </Modal>
 
 <Modal bind:this={formTypeModal}>
   <FormTypeModal
-    onConfirm={onConfirmFormType}
+    onConfirm={createFormScreen}
     onCancel={() => {
       formTypeModal.hide()
       datasourceModal.show()
     }}
-    on:select={e => {
-      formType = e.detail
-    }}
-    type={formType}
   />
 </Modal>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte
index 8e2428d832..a6bfbfd3d3 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte
@@ -1,42 +1,95 @@
 <script>
   import { ModalContent, Layout, notifications, Body } from "@budibase/bbui"
-  import { datasources } from "stores/builder"
+  import { datasources as datasourcesStore } from "stores/builder"
   import ICONS from "components/backend/DatasourceNavigator/icons"
   import { IntegrationNames } from "constants"
-  import { onMount } from "svelte"
-  import DatasourceTemplateRow from "./DatasourceTemplateRow.svelte"
+  import { createEventDispatcher, onMount } from "svelte"
+  import TableOrViewOption from "./TableOrViewOption.svelte"
 
-  export let onCancel
   export let onConfirm
+  export let selectedTablesAndViews
+  export let permissions
 
-  let selectedSources = []
+  const dispatch = createEventDispatcher()
 
-  $: filteredSources = $datasources.list?.filter(datasource => {
-    return datasource.source !== IntegrationNames.REST && datasource["entities"]
-  })
-
-  const toggleSelection = datasource => {
-    const exists = selectedSources.find(
-      d => d.resourceId === datasource.resourceId
+  const getViews = table => {
+    const views = Object.values(table.views || {}).filter(
+      view => view.version === 2
     )
-    if (exists) {
-      selectedSources = selectedSources.filter(
-        d => d.resourceId === datasource.resourceId
-      )
-    } else {
-      selectedSources = [...selectedSources, datasource]
-    }
+
+    return views.map(view => ({
+      icon: "Remove",
+      name: view.name,
+      id: view.id,
+      clientData: {
+        ...view,
+        type: "viewV2",
+        label: view.name,
+      },
+    }))
   }
 
-  const confirmDatasourceSelection = async () => {
-    await onConfirm({
-      datasources: selectedSources,
-    })
+  const getTablesAndViews = datasource => {
+    let tablesAndViews = []
+    const rawTables = Array.isArray(datasource.entities)
+      ? datasource.entities
+      : Object.values(datasource.entities ?? {})
+
+    for (const rawTable of rawTables) {
+      if (rawTable._id === "ta_users") {
+        continue
+      }
+
+      const table = {
+        icon: "Table",
+        name: rawTable.name,
+        id: rawTable._id,
+        clientData: {
+          ...rawTable,
+          label: rawTable.name,
+          tableId: rawTable._id,
+          type: "table",
+        },
+      }
+
+      tablesAndViews = tablesAndViews.concat([table, ...getViews(rawTable)])
+    }
+
+    return tablesAndViews
+  }
+
+  const getDatasources = rawDatasources => {
+    const datasources = []
+
+    for (const rawDatasource of rawDatasources) {
+      if (
+        rawDatasource.source === IntegrationNames.REST ||
+        !rawDatasource["entities"]
+      ) {
+        continue
+      }
+
+      const datasource = {
+        name: rawDatasource.name,
+        iconComponent: ICONS[rawDatasource.source],
+        tablesAndViews: getTablesAndViews(rawDatasource),
+      }
+
+      datasources.push(datasource)
+    }
+
+    return datasources
+  }
+
+  $: datasources = getDatasources($datasourcesStore.list)
+
+  const toggleSelection = tableOrView => {
+    dispatch("toggle", tableOrView)
   }
 
   onMount(async () => {
     try {
-      await datasources.fetch()
+      await datasourcesStore.fetch()
     } catch (error) {
       notifications.error("Error fetching datasources")
     }
@@ -48,66 +101,35 @@
     title="Autogenerated screens"
     confirmText="Confirm"
     cancelText="Back"
-    onConfirm={confirmDatasourceSelection}
-    {onCancel}
-    disabled={!selectedSources.length}
+    {onConfirm}
+    disabled={!selectedTablesAndViews.length}
     size="L"
   >
     <Body size="S">
       Select which datasources you would like to use to create your screens
     </Body>
     <Layout noPadding gap="S">
-      {#each filteredSources as datasource}
-        {@const entities = Array.isArray(datasource.entities)
-          ? datasource.entities
-          : Object.values(datasource.entities || {})}
+      {#each datasources as datasource}
         <div class="data-source-wrap">
           <div class="data-source-header">
             <svelte:component
-              this={ICONS[datasource.source]}
+              this={datasource.iconComponent}
               height="24"
               width="24"
             />
             <div class="data-source-name">{datasource.name}</div>
           </div>
           <!-- List all tables -->
-          {#each entities.filter(table => table._id !== "ta_users") as table}
-            {@const views = Object.values(table.views || {}).filter(
-              view => view.version === 2
+          {#each datasource.tablesAndViews as tableOrView}
+            {@const selected = selectedTablesAndViews.some(
+              selected => selected.id === tableOrView.id
             )}
-            {@const tableDS = {
-              tableId: table._id,
-              label: table.name,
-              resourceId: table._id,
-              type: "table",
-            }}
-            {@const selected = selectedSources.find(
-              datasource => datasource.resourceId === tableDS.resourceId
-            )}
-            <DatasourceTemplateRow
-              on:click={() => toggleSelection(tableDS)}
+            <TableOrViewOption
+              roles={permissions[tableOrView.id]}
+              on:click={() => toggleSelection(tableOrView)}
               {selected}
-              datasource={tableDS}
+              {tableOrView}
             />
-
-            <!-- List all views inside this table -->
-            {#each views as view}
-              {@const viewDS = {
-                label: view.name,
-                id: view.id,
-                resourceId: view.id,
-                tableId: view.tableId,
-                type: "viewV2",
-              }}
-              {@const selected = selectedSources.find(
-                x => x.resourceId === viewDS.resourceId
-              )}
-              <DatasourceTemplateRow
-                on:click={() => toggleSelection(viewDS)}
-                {selected}
-                datasource={viewDS}
-              />
-            {/each}
           {/each}
         </div>
       {/each}
@@ -118,8 +140,11 @@
 <style>
   .data-source-wrap {
     padding-bottom: var(--spectrum-alias-item-padding-s);
-    display: grid;
+    display: flex;
+    flex-direction: column;
     grid-gap: var(--spacing-s);
+    max-width: 100%;
+    min-width: 0;
   }
   .data-source-header {
     display: flex;
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte
deleted file mode 100644
index 902ee48425..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte
+++ /dev/null
@@ -1,45 +0,0 @@
-<script>
-  import { Icon } from "@budibase/bbui"
-
-  export let datasource
-  export let selected = false
-
-  $: icon = datasource.type === "viewV2" ? "Remove" : "Table"
-</script>
-
-<!-- svelte-ignore a11y-no-static-element-interactions -->
-<!-- svelte-ignore a11y-click-events-have-key-events -->
-<div class="data-source-entry" class:selected on:click>
-  <Icon name={icon} color="var(--spectrum-global-color-gray-600)" />
-  {datasource.label}
-  {#if selected}
-    <span class="data-source-check">
-      <Icon size="S" name="CheckmarkCircle" />
-    </span>
-  {/if}
-</div>
-
-<style>
-  .data-source-entry {
-    cursor: pointer;
-    grid-gap: var(--spacing-m);
-    padding: var(--spectrum-alias-item-padding-s);
-    background: var(--spectrum-alias-background-color-secondary);
-    transition: 0.3s all;
-    border: 1px solid var(--spectrum-global-color-gray-300);
-    border-radius: 4px;
-    display: flex;
-    align-items: center;
-  }
-  .data-source-entry:hover,
-  .selected {
-    background: var(--spectrum-alias-background-color-tertiary);
-  }
-
-  .data-source-check {
-    margin-left: auto;
-  }
-  .data-source-check :global(.spectrum-Icon) {
-    color: var(--spectrum-global-color-green-600);
-  }
-</style>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/FormTypeModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/FormTypeModal.svelte
index 6183f682b0..b7108fd9aa 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/FormTypeModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/FormTypeModal.svelte
@@ -1,12 +1,10 @@
 <script>
   import { ModalContent, Layout, Body, Icon } from "@budibase/bbui"
-  import { createEventDispatcher } from "svelte"
+
+  let type = null
 
   export let onCancel = () => {}
   export let onConfirm = () => {}
-  export let type
-
-  const dispatch = createEventDispatcher()
 </script>
 
 <span>
@@ -14,7 +12,7 @@
     title="Select form type"
     confirmText="Done"
     cancelText="Back"
-    {onConfirm}
+    onConfirm={() => onConfirm(type)}
     {onCancel}
     disabled={!type}
     size="L"
@@ -25,9 +23,7 @@
       <div
         class="form-type"
         class:selected={type === "Create"}
-        on:click={() => {
-          dispatch("select", "Create")
-        }}
+        on:click={() => (type = "Create")}
       >
         <div class="form-type-wrap">
           <div class="form-type-content">
@@ -46,9 +42,7 @@
       <div
         class="form-type"
         class:selected={type === "Update"}
-        on:click={() => {
-          dispatch("select", "Update")
-        }}
+        on:click={() => (type = "Update")}
       >
         <div class="form-type-wrap">
           <div class="form-type-content">
@@ -65,9 +59,7 @@
       <div
         class="form-type"
         class:selected={type === "View"}
-        on:click={() => {
-          dispatch("select", "View")
-        }}
+        on:click={() => (type = "View")}
       >
         <div class="form-type-wrap">
           <div class="form-type-content">
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/ScreenRoleModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/ScreenRoleModal.svelte
deleted file mode 100644
index 8605412c1c..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/ScreenRoleModal.svelte
+++ /dev/null
@@ -1,62 +0,0 @@
-<script>
-  import { Select, ModalContent } from "@budibase/bbui"
-  import { RoleUtils } from "@budibase/frontend-core"
-  import { roles, screenStore } from "stores/builder"
-  import { get } from "svelte/store"
-  import { onMount } from "svelte"
-
-  export let onConfirm
-  export let onCancel
-  export let screenUrl
-  export let screenAccessRole
-  export let confirmText = "Done"
-
-  let error
-
-  const onChangeRole = e => {
-    const roleId = e.detail
-    if (routeExists(screenUrl, roleId)) {
-      error = "This URL is already taken for this access role"
-    } else {
-      error = null
-    }
-  }
-
-  const routeExists = (url, role) => {
-    if (!url || !role) {
-      return false
-    }
-    return get(screenStore).screens.some(
-      screen =>
-        screen.routing.route.toLowerCase() === url.toLowerCase() &&
-        screen.routing.roleId === role
-    )
-  }
-
-  onMount(() => {
-    // Validate the initial role
-    onChangeRole({ detail: screenAccessRole })
-  })
-</script>
-
-<ModalContent
-  title="Access"
-  {confirmText}
-  cancelText="Back"
-  {onConfirm}
-  {onCancel}
-  disabled={!!error}
->
-  Select the level of access required to see these screens
-  <Select
-    bind:value={screenAccessRole}
-    on:change={onChangeRole}
-    label="Access"
-    {error}
-    getOptionLabel={role => role.name}
-    getOptionValue={role => role._id}
-    getOptionColour={role => RoleUtils.getRoleColour(role._id)}
-    options={$roles}
-    placeholder={null}
-  />
-</ModalContent>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/TableOrViewOption.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/TableOrViewOption.svelte
new file mode 100644
index 0000000000..b0b9f3dfc1
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/TableOrViewOption.svelte
@@ -0,0 +1,112 @@
+<script>
+  import { Icon, AbsTooltip } from "@budibase/bbui"
+  import RoleIcon from "components/common/RoleIcon.svelte"
+
+  export let tableOrView
+  export let roles
+  export let selected = false
+
+  $: hideRoles = roles == undefined || roles?.loading
+</script>
+
+<!-- svelte-ignore a11y-click-events-have-key-events -->
+<div role="button" tabindex="0" class="datasource" class:selected on:click>
+  <div class="content">
+    <Icon name={tableOrView.icon} />
+    <span>{tableOrView.name}</span>
+  </div>
+
+  <div class:hideRoles class="roles">
+    <AbsTooltip
+      type="info"
+      text={`Screens that only read data will be generated with access "${roles?.read?.toLowerCase()}"`}
+    >
+      <div class="role">
+        <span>read</span>
+        <RoleIcon
+          size="XS"
+          id={roles?.read}
+          disabled={roles?.loading !== false}
+        />
+      </div>
+    </AbsTooltip>
+    <AbsTooltip
+      type="info"
+      text={`Screens that write data will be generated with access "${roles?.write?.toLowerCase()}"`}
+    >
+      <div class="role">
+        <span>write</span>
+        <RoleIcon
+          size="XS"
+          id={roles?.write}
+          disabled={roles?.loading !== false}
+        />
+      </div>
+    </AbsTooltip>
+  </div>
+</div>
+
+<style>
+  .datasource {
+    cursor: pointer;
+    border: 1px solid var(--spectrum-global-color-gray-300);
+    transition: 160ms all;
+    border-radius: 4px;
+    display: flex;
+    align-items: center;
+    user-select: none;
+    background-color: var(--background);
+  }
+
+  .datasource :global(svg) {
+    transition: 160ms all;
+    color: var(--spectrum-global-color-gray-600);
+  }
+
+  .content {
+    padding: var(--spectrum-alias-item-padding-s);
+    display: flex;
+    align-items: center;
+    grid-gap: var(--spacing-m);
+    min-width: 0;
+  }
+
+  .content span {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .datasource:hover {
+    border: 1px solid var(--grey-5);
+  }
+
+  .selected {
+    border: 1px solid var(--blue) !important;
+  }
+
+  .roles {
+    margin-left: auto;
+    display: flex;
+    flex-direction: column;
+    align-items: end;
+    padding-right: var(--spectrum-alias-item-padding-s);
+    opacity: 0.5;
+    transition: opacity 160ms;
+  }
+
+  .hideRoles {
+    opacity: 0;
+    pointer-events: none;
+  }
+
+  .role {
+    display: flex;
+    align-items: center;
+  }
+
+  .role span {
+    font-size: 11px;
+    margin-right: 5px;
+  }
+</style>
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
index 7bba5f638c..6518b6cf58 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
@@ -187,7 +187,9 @@
   <Divider />
   <Layout gap="XS" noPadding>
     <Heading size="XS">History</Heading>
-    <Body size="S">Free plan stores up to 1 day of automation history</Body>
+    {#if licensePlan?.type === Constants.PlanType.FREE}
+      <Body size="S">Free plan stores up to 1 day of automation history</Body>
+    {/if}
   </Layout>
   <div class="controls">
     <div class="search">
diff --git a/packages/builder/src/pages/builder/auth/reset.svelte b/packages/builder/src/pages/builder/auth/reset.svelte
index 06d5feaa53..e1464aba77 100644
--- a/packages/builder/src/pages/builder/auth/reset.svelte
+++ b/packages/builder/src/pages/builder/auth/reset.svelte
@@ -4,47 +4,45 @@
     Button,
     Heading,
     Layout,
+    ProgressCircle,
     notifications,
-    FancyForm,
-    FancyInput,
   } from "@budibase/bbui"
   import { goto, params } from "@roxi/routify"
   import { auth, organisation } from "stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { TestimonialPage } from "@budibase/frontend-core/src/components"
   import { onMount } from "svelte"
-  import { handleError, passwordsMatch } from "./_components/utils"
+  import PasswordRepeatInput from "../../../components/common/users/PasswordRepeatInput.svelte"
 
   const resetCode = $params["?code"]
   let form
-  let formData = {}
-  let errors = {}
   let loaded = false
+  let loading = false
+  let password
+  let passwordError
 
-  $: submitted = false
   $: forceResetPassword = $auth?.user?.forceResetPassword
 
   async function reset() {
-    form.validate()
-    if (Object.keys(errors).length > 0) {
+    if (!form.validate() || passwordError) {
       return
     }
-    submitted = true
     try {
+      loading = true
       if (forceResetPassword) {
         await auth.updateSelf({
-          password: formData.password,
+          password,
           forceResetPassword: false,
         })
         $goto("../portal/")
       } else {
-        await auth.resetPassword(formData.password, resetCode)
+        await auth.resetPassword(password, resetCode)
         notifications.success("Password reset successfully")
         // send them to login if reset successful
         $goto("./login")
       }
     } catch (err) {
-      submitted = false
+      loading = false
       notifications.error(err.message || "Unable to reset password")
     }
   }
@@ -58,86 +56,37 @@
     }
     loaded = true
   })
+
+  const handleKeydown = evt => {
+    if (evt.key === "Enter") {
+      reset()
+    }
+  }
 </script>
 
+<svelte:window on:keydown={handleKeydown} />
 <TestimonialPage enabled={$organisation.testimonialsEnabled}>
   <Layout gap="S" noPadding>
     {#if loaded}
       <img alt="logo" src={$organisation.logoUrl || Logo} />
     {/if}
-    <Layout gap="XS" noPadding>
-      <Heading size="M">Reset your password</Heading>
-      <Body size="M">Please enter the new password you'd like to use.</Body>
-    </Layout>
-
     <Layout gap="S" noPadding>
-      <FancyForm bind:this={form}>
-        <FancyInput
-          label="Password"
-          value={formData.password}
-          type="password"
-          on:change={e => {
-            formData = {
-              ...formData,
-              password: e.detail,
-            }
-          }}
-          validate={() => {
-            let fieldError = {}
-
-            fieldError["password"] = !formData.password
-              ? "Please enter a password"
-              : undefined
-
-            fieldError["confirmationPassword"] =
-              !passwordsMatch(
-                formData.password,
-                formData.confirmationPassword
-              ) && formData.confirmationPassword
-                ? "Passwords must match"
-                : undefined
-
-            errors = handleError({ ...errors, ...fieldError })
-          }}
-          error={errors.password}
-          disabled={submitted}
-        />
-        <FancyInput
-          label="Repeat Password"
-          value={formData.confirmationPassword}
-          type="password"
-          on:change={e => {
-            formData = {
-              ...formData,
-              confirmationPassword: e.detail,
-            }
-          }}
-          validate={() => {
-            const isValid =
-              !passwordsMatch(
-                formData.password,
-                formData.confirmationPassword
-              ) && formData.password
-
-            let fieldError = {
-              confirmationPassword: isValid ? "Passwords must match" : null,
-            }
-
-            errors = handleError({ ...errors, ...fieldError })
-          }}
-          error={errors.confirmationPassword}
-          disabled={submitted}
-        />
-      </FancyForm>
+      <Heading size="M">Reset your password</Heading>
+      <Body size="M">Must contain at least 12 characters</Body>
+      <PasswordRepeatInput
+        bind:passwordForm={form}
+        bind:password
+        bind:error={passwordError}
+      />
+      <Button secondary cta on:click={reset}>
+        {#if loading}
+          <ProgressCircle overBackground={true} size="S" />
+        {:else}
+          Reset
+        {/if}
+      </Button>
     </Layout>
-    <div>
-      <Button
-        disabled={Object.keys(errors).length > 0 ||
-          (forceResetPassword ? false : !resetCode)}
-        cta
-        on:click={reset}>Reset your password</Button
-      >
-    </div>
+    <div />
   </Layout>
 </TestimonialPage>
 
diff --git a/packages/builder/src/stores/builder/automations.js b/packages/builder/src/stores/builder/automations.js
index b2335ff7e5..57c823da9b 100644
--- a/packages/builder/src/stores/builder/automations.js
+++ b/packages/builder/src/stores/builder/automations.js
@@ -15,6 +15,7 @@ const initialAutomationState = {
     ACTION: [],
   },
   selectedAutomationId: null,
+  automationDisplayData: {},
 }
 
 // If this functions, remove the actions elements
@@ -58,18 +59,19 @@ const automationActions = store => ({
     return response
   },
   fetch: async () => {
-    const responses = await Promise.all([
-      API.getAutomations(),
+    const [automationResponse, definitions] = await Promise.all([
+      API.getAutomations({ enrich: true }),
       API.getAutomationDefinitions(),
     ])
     store.update(state => {
-      state.automations = responses[0]
+      state.automations = automationResponse.automations
       state.automations.sort((a, b) => {
         return a.name < b.name ? -1 : 1
       })
+      state.automationDisplayData = automationResponse.builderData
       state.blockDefinitions = {
-        TRIGGER: responses[1].trigger,
-        ACTION: responses[1].action,
+        TRIGGER: definitions.trigger,
+        ACTION: definitions.action,
       }
       return state
     })
@@ -102,19 +104,8 @@ const automationActions = store => ({
   },
   save: async automation => {
     const response = await API.updateAutomation(automation)
-    store.update(state => {
-      const updatedAutomation = response.automation
-      const existingIdx = state.automations.findIndex(
-        existing => existing._id === automation._id
-      )
-      if (existingIdx !== -1) {
-        state.automations.splice(existingIdx, 1, updatedAutomation)
-        return state
-      } else {
-        state.automations = [...state.automations, updatedAutomation]
-      }
-      return state
-    })
+
+    await store.actions.fetch()
     return response.automation
   },
   delete: async automation => {
@@ -308,7 +299,9 @@ const automationActions = store => ({
     if (!automation) {
       return
     }
-    delete newAutomation.definition.stepNames[blockId]
+    if (newAutomation.definition.stepNames) {
+      delete newAutomation.definition.stepNames[blockId]
+    }
 
     await store.actions.save(newAutomation)
   },
@@ -384,3 +377,13 @@ export const selectedAutomation = derived(automationStore, $automationStore => {
     x => x._id === $automationStore.selectedAutomationId
   )
 })
+
+export const selectedAutomationDisplayData = derived(
+  [automationStore, selectedAutomation],
+  ([$automationStore, $selectedAutomation]) => {
+    if (!$selectedAutomation._id) {
+      return null
+    }
+    return $automationStore.automationDisplayData[$selectedAutomation._id]
+  }
+)
diff --git a/packages/builder/src/stores/builder/index.js b/packages/builder/src/stores/builder/index.js
index c47782c0f5..aa0062dd7d 100644
--- a/packages/builder/src/stores/builder/index.js
+++ b/packages/builder/src/stores/builder/index.js
@@ -11,6 +11,7 @@ import {
   automationStore,
   selectedAutomation,
   automationHistoryStore,
+  selectedAutomationDisplayData,
 } from "./automations.js"
 import { userStore, userSelectedResourceMap, isOnlyUser } from "./users.js"
 import { deploymentStore } from "./deployments.js"
@@ -44,6 +45,7 @@ export {
   previewStore,
   automationStore,
   selectedAutomation,
+  selectedAutomationDisplayData,
   automationHistoryStore,
   sortedScreens,
   userStore,
diff --git a/packages/builder/src/templates/Screen.js b/packages/builder/src/templates/Screen.js
index afe9123b6d..cde1dcfc68 100644
--- a/packages/builder/src/templates/Screen.js
+++ b/packages/builder/src/templates/Screen.js
@@ -63,6 +63,11 @@ export class Screen extends BaseStructure {
     return this
   }
 
+  autoTableId(autoTableId) {
+    this._json.autoTableId = autoTableId
+    return this
+  }
+
   instanceName(name) {
     this._json.props._instanceName = name
     return this
diff --git a/packages/builder/src/templates/blankScreen.js b/packages/builder/src/templates/blankScreen.js
new file mode 100644
index 0000000000..80735ef53a
--- /dev/null
+++ b/packages/builder/src/templates/blankScreen.js
@@ -0,0 +1,7 @@
+import { Screen } from "./Screen"
+
+const blankScreen = route => {
+  return new Screen().instanceName("New Screen").route(route).json()
+}
+
+export default blankScreen
diff --git a/packages/builder/src/templates/createFromScratchScreen.js b/packages/builder/src/templates/createFromScratchScreen.js
deleted file mode 100644
index 13e2a98908..0000000000
--- a/packages/builder/src/templates/createFromScratchScreen.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Screen } from "./Screen"
-
-export default {
-  name: `Create from scratch`,
-  id: `createFromScratch`,
-  create: () => createScreen(),
-  table: `Create from scratch`,
-}
-
-const createScreen = () => {
-  return new Screen().instanceName("New Screen").json()
-}
diff --git a/packages/builder/src/templates/formScreen.js b/packages/builder/src/templates/formScreen.js
index b99744e8e8..e335a6b811 100644
--- a/packages/builder/src/templates/formScreen.js
+++ b/packages/builder/src/templates/formScreen.js
@@ -3,41 +3,47 @@ import { Component } from "./Component"
 import sanitizeUrl from "helpers/sanitizeUrl"
 
 export const FORM_TEMPLATE = "FORM_TEMPLATE"
-export const formUrl = datasource => sanitizeUrl(`/${datasource.label}-form`)
-
-// Mode not really necessary
-export default function (datasources, config) {
-  if (!Array.isArray(datasources)) {
-    return []
+export const formUrl = (tableOrView, actionType) => {
+  if (actionType === "Create") {
+    return sanitizeUrl(`/${tableOrView.name}/new`)
+  } else if (actionType === "Update") {
+    return sanitizeUrl(`/${tableOrView.name}/edit/:id`)
+  } else if (actionType === "View") {
+    return sanitizeUrl(`/${tableOrView.name}/view/:id`)
   }
-  return datasources.map(datasource => {
-    return {
-      name: `${datasource.label} - Form`,
-      create: () => createScreen(datasource, config),
-      id: FORM_TEMPLATE,
-      resourceId: datasource.resourceId,
-    }
-  })
 }
 
-const generateMultistepFormBlock = (dataSource, { actionType } = {}) => {
+export const getRole = (permissions, actionType) => {
+  if (actionType === "View") {
+    return permissions.read
+  }
+
+  return permissions.write
+}
+
+const generateMultistepFormBlock = (tableOrView, actionType) => {
   const multistepFormBlock = new Component(
     "@budibase/standard-components/multistepformblock"
   )
   multistepFormBlock
     .customProps({
       actionType,
-      dataSource,
+      dataSource: tableOrView.clientData,
       steps: [{}],
+      rowId: actionType === "new" ? undefined : `{{ url.id }}`,
     })
-    .instanceName(`${dataSource.label} - Multistep Form block`)
+    .instanceName(`${tableOrView.name} - Multistep Form block`)
   return multistepFormBlock
 }
 
-const createScreen = (datasource, config) => {
+const createScreen = (tableOrView, actionType, permissions) => {
   return new Screen()
-    .route(formUrl(datasource))
-    .instanceName(`${datasource.label} - Form`)
-    .addChild(generateMultistepFormBlock(datasource, config))
+    .route(formUrl(tableOrView, actionType))
+    .instanceName(`${tableOrView.name} - Form`)
+    .role(getRole(permissions, actionType))
+    .autoTableId(tableOrView.id)
+    .addChild(generateMultistepFormBlock(tableOrView, actionType))
     .json()
 }
+
+export default createScreen
diff --git a/packages/builder/src/templates/gridDetailsScreen.js b/packages/builder/src/templates/gridDetailsScreen.js
index 35ab651268..5b6363ac89 100644
--- a/packages/builder/src/templates/gridDetailsScreen.js
+++ b/packages/builder/src/templates/gridDetailsScreen.js
@@ -5,24 +5,9 @@ import { generate } from "shortid"
 import { makePropSafe as safe } from "@budibase/string-templates"
 import { Utils } from "@budibase/frontend-core"
 
-export default function (datasources) {
-  if (!Array.isArray(datasources)) {
-    return []
-  }
-  return datasources.map(datasource => {
-    return {
-      name: `${datasource.label} - List with panel`,
-      create: () => createScreen(datasource),
-      id: GRID_DETAILS_TEMPLATE,
-      resourceId: datasource.resourceId,
-    }
-  })
-}
+const gridDetailsUrl = tableOrView => sanitizeUrl(`/${tableOrView.name}`)
 
-export const GRID_DETAILS_TEMPLATE = "GRID_DETAILS_TEMPLATE"
-export const gridDetailsUrl = datasource => sanitizeUrl(`/${datasource.label}`)
-
-const createScreen = datasource => {
+const createScreen = (tableOrView, permissions) => {
   /*
     Create Row
    */
@@ -47,7 +32,7 @@ const createScreen = datasource => {
     type: "cta",
   })
 
-  buttonGroup.instanceName(`${datasource.label} - Create`).customProps({
+  buttonGroup.instanceName(`${tableOrView.name} - Create`).customProps({
     hAlign: "right",
     buttons: [createButton.json()],
   })
@@ -62,7 +47,7 @@ const createScreen = datasource => {
   const heading = new Component("@budibase/standard-components/heading")
     .instanceName("Table heading")
     .customProps({
-      text: datasource?.label,
+      text: tableOrView.name,
     })
 
   gridHeader.addChild(heading)
@@ -72,7 +57,7 @@ const createScreen = datasource => {
     "@budibase/standard-components/formblock"
   )
   createFormBlock.instanceName("Create row form block").customProps({
-    dataSource: datasource,
+    dataSource: tableOrView.clientData,
     labelPosition: "left",
     buttonPosition: "top",
     actionType: "Create",
@@ -83,7 +68,7 @@ const createScreen = datasource => {
       showSaveButton: true,
       saveButtonLabel: "Save",
       actionType: "Create",
-      dataSource: datasource,
+      dataSource: tableOrView.clientData,
     }),
   })
 
@@ -99,7 +84,7 @@ const createScreen = datasource => {
 
   const editFormBlock = new Component("@budibase/standard-components/formblock")
   editFormBlock.instanceName("Edit row form block").customProps({
-    dataSource: datasource,
+    dataSource: tableOrView.clientData,
     labelPosition: "left",
     buttonPosition: "top",
     actionType: "Update",
@@ -112,7 +97,7 @@ const createScreen = datasource => {
       saveButtonLabel: "Save",
       deleteButtonLabel: "Delete",
       actionType: "Update",
-      dataSource: datasource,
+      dataSource: tableOrView.clientData,
     }),
   })
 
@@ -121,7 +106,7 @@ const createScreen = datasource => {
   const gridBlock = new Component("@budibase/standard-components/gridblock")
   gridBlock
     .customProps({
-      table: datasource,
+      table: tableOrView.clientData,
       allowAddRows: false,
       allowEditRows: false,
       allowDeleteRows: false,
@@ -145,14 +130,18 @@ const createScreen = datasource => {
         },
       ],
     })
-    .instanceName(`${datasource.label} - Table`)
+    .instanceName(`${tableOrView.name} - Table`)
 
   return new Screen()
-    .route(gridDetailsUrl(datasource))
-    .instanceName(`${datasource.label} - List and details`)
+    .route(gridDetailsUrl(tableOrView))
+    .instanceName(`${tableOrView.name} - List and details`)
+    .role(permissions.write)
+    .autoTableId(tableOrView.resourceId)
     .addChild(gridHeader)
     .addChild(gridBlock)
     .addChild(createRowSidePanel)
     .addChild(detailsSidePanel)
     .json()
 }
+
+export default createScreen
diff --git a/packages/builder/src/templates/gridListScreen.js b/packages/builder/src/templates/gridListScreen.js
deleted file mode 100644
index c98d5d4baf..0000000000
--- a/packages/builder/src/templates/gridListScreen.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import sanitizeUrl from "helpers/sanitizeUrl"
-import { Screen } from "./Screen"
-import { Component } from "./Component"
-
-export default function (datasources) {
-  if (!Array.isArray(datasources)) {
-    return []
-  }
-  return datasources.map(datasource => {
-    return {
-      name: `${datasource.label} - List`,
-      create: () => createScreen(datasource),
-      id: GRID_LIST_TEMPLATE,
-      resourceId: datasource.resourceId,
-    }
-  })
-}
-
-export const GRID_LIST_TEMPLATE = "GRID_LIST_TEMPLATE"
-export const gridListUrl = datasource => sanitizeUrl(`/${datasource.label}`)
-
-const createScreen = datasource => {
-  const heading = new Component("@budibase/standard-components/heading")
-    .instanceName("Table heading")
-    .customProps({
-      text: datasource?.label,
-    })
-
-  const gridBlock = new Component("@budibase/standard-components/gridblock")
-    .instanceName(`${datasource.label} - Table`)
-    .customProps({
-      table: datasource,
-    })
-
-  return new Screen()
-    .route(gridListUrl(datasource))
-    .instanceName(`${datasource.label} - List`)
-    .addChild(heading)
-    .addChild(gridBlock)
-    .json()
-}
diff --git a/packages/builder/src/templates/gridScreen.js b/packages/builder/src/templates/gridScreen.js
new file mode 100644
index 0000000000..e4482a3d62
--- /dev/null
+++ b/packages/builder/src/templates/gridScreen.js
@@ -0,0 +1,30 @@
+import sanitizeUrl from "helpers/sanitizeUrl"
+import { Screen } from "./Screen"
+import { Component } from "./Component"
+
+const gridUrl = tableOrView => sanitizeUrl(`/${tableOrView.name}`)
+
+const createScreen = (tableOrView, permissions) => {
+  const heading = new Component("@budibase/standard-components/heading")
+    .instanceName("Table heading")
+    .customProps({
+      text: tableOrView.name,
+    })
+
+  const gridBlock = new Component("@budibase/standard-components/gridblock")
+    .instanceName(`${tableOrView.name} - Table`)
+    .customProps({
+      table: tableOrView.clientData,
+    })
+
+  return new Screen()
+    .route(gridUrl(tableOrView))
+    .instanceName(`${tableOrView.name} - List`)
+    .role(permissions.write)
+    .autoTableId(tableOrView.id)
+    .addChild(heading)
+    .addChild(gridBlock)
+    .json()
+}
+
+export default createScreen
diff --git a/packages/builder/src/templates/index.js b/packages/builder/src/templates/index.js
deleted file mode 100644
index b00b8cb621..0000000000
--- a/packages/builder/src/templates/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import gridListScreen from "./gridListScreen"
-import gridDetailsScreen from "./gridDetailsScreen"
-import createFromScratchScreen from "./createFromScratchScreen"
-import formScreen from "./formScreen"
-
-const allTemplates = datasources => [
-  ...gridListScreen(datasources),
-  ...gridDetailsScreen(datasources),
-  ...formScreen(datasources),
-]
-
-// Allows us to apply common behaviour to all create() functions
-const createTemplateOverride = template => () => {
-  const screen = template.create()
-  screen.name = screen.props._id
-  screen.routing.route = screen.routing.route.toLowerCase()
-  screen.template = template.id
-  return screen
-}
-
-export default datasources => {
-  const enrichTemplate = template => ({
-    ...template,
-    create: createTemplateOverride(template),
-  })
-  const fromScratch = enrichTemplate(createFromScratchScreen)
-  const tableTemplates = allTemplates(datasources).map(enrichTemplate)
-
-  return [
-    fromScratch,
-    ...tableTemplates.sort((templateA, templateB) => {
-      return templateA.name > templateB.name ? 1 : -1
-    }),
-  ]
-}
diff --git a/packages/frontend-core/src/api/automations.js b/packages/frontend-core/src/api/automations.js
index 37a834cf04..ce5f7d3aba 100644
--- a/packages/frontend-core/src/api/automations.js
+++ b/packages/frontend-core/src/api/automations.js
@@ -26,9 +26,14 @@ export const buildAutomationEndpoints = API => ({
   /**
    * Gets a list of all automations.
    */
-  getAutomations: async () => {
+  getAutomations: async ({ enrich }) => {
+    const params = new URLSearchParams()
+    if (enrich) {
+      params.set("enrich", true)
+    }
+
     return await API.get({
-      url: "/api/automations",
+      url: `/api/automations?${params.toString()}`,
     })
   },
 
diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts
index 7eca17e0e8..6177868303 100644
--- a/packages/server/src/api/controllers/automation.ts
+++ b/packages/server/src/api/controllers/automation.ts
@@ -1,4 +1,5 @@
 import * as triggers from "../../automations/triggers"
+import { sdk as coreSdk } from "@budibase/shared-core"
 import { DocumentType } from "../../db/utils"
 import { updateTestHistory, removeDeprecated } from "../../automations/utils"
 import { setTestFlag, clearTestFlag } from "../../utilities/redis"
@@ -11,6 +12,7 @@ import {
   AutomationResults,
   UserCtx,
   DeleteAutomationResponse,
+  FetchAutomationResponse,
 } from "@budibase/types"
 import { getActionDefinitions as actionDefs } from "../../automations/actions"
 import sdk from "../../sdk"
@@ -73,8 +75,17 @@ export async function update(ctx: UserCtx) {
   builderSocket?.emitAutomationUpdate(ctx, automation)
 }
 
-export async function fetch(ctx: UserCtx) {
-  ctx.body = await sdk.automations.fetch()
+export async function fetch(ctx: UserCtx<void, FetchAutomationResponse>) {
+  const query: { enrich?: string } = ctx.request.query || {}
+  const enrich = query.enrich === "true"
+
+  const automations = await sdk.automations.fetch()
+  ctx.body = { automations }
+  if (enrich) {
+    ctx.body.builderData = await sdk.automations.utils.getBuilderData(
+      automations
+    )
+  }
 }
 
 export async function find(ctx: UserCtx) {
@@ -84,6 +95,11 @@ export async function find(ctx: UserCtx) {
 export async function destroy(ctx: UserCtx<void, DeleteAutomationResponse>) {
   const automationId = ctx.params.id
 
+  const automation = await sdk.automations.get(ctx.params.id)
+  if (coreSdk.automations.isRowAction(automation)) {
+    ctx.throw("Row actions automations cannot be deleted", 422)
+  }
+
   ctx.body = await sdk.automations.remove(automationId, ctx.params.rev)
   builderSocket?.emitAutomationDeletion(ctx, automationId)
 }
diff --git a/packages/server/src/api/controllers/row/utils/basic.ts b/packages/server/src/api/controllers/row/utils/basic.ts
index bca2494ac3..883ba5a806 100644
--- a/packages/server/src/api/controllers/row/utils/basic.ts
+++ b/packages/server/src/api/controllers/row/utils/basic.ts
@@ -1,8 +1,7 @@
 // need to handle table name + field or just field, depending on if relationships used
 import { FieldType, Row, Table } from "@budibase/types"
-import { helpers } from "@budibase/shared-core"
+import { helpers, PROTECTED_INTERNAL_COLUMNS } from "@budibase/shared-core"
 import { generateRowIdField } from "../../../../integrations/utils"
-import { CONSTANT_INTERNAL_ROW_COLS } from "../../../../db/utils"
 
 function extractFieldValue({
   row,
@@ -94,7 +93,7 @@ export function basicProcessing({
     thisRow._rev = "rev"
   } else {
     const columns = Object.keys(table.schema)
-    for (let internalColumn of [...CONSTANT_INTERNAL_ROW_COLS, ...columns]) {
+    for (let internalColumn of [...PROTECTED_INTERNAL_COLUMNS, ...columns]) {
       thisRow[internalColumn] = extractFieldValue({
         row,
         tableName: table._id!,
diff --git a/packages/server/src/api/controllers/rowAction/crud.ts b/packages/server/src/api/controllers/rowAction/crud.ts
index 640bc35378..bd5326d957 100644
--- a/packages/server/src/api/controllers/rowAction/crud.ts
+++ b/packages/server/src/api/controllers/rowAction/crud.ts
@@ -31,7 +31,12 @@ export async function find(ctx: Ctx<void, RowActionsResponse>) {
     actions: Object.entries(actions).reduce<Record<string, RowActionResponse>>(
       (acc, [key, action]) => ({
         ...acc,
-        [key]: { id: key, tableId: table._id!, ...action },
+        [key]: {
+          id: key,
+          tableId: table._id!,
+          name: action.name,
+          automationId: action.automationId,
+        },
       }),
       {}
     ),
@@ -50,7 +55,9 @@ export async function create(
 
   ctx.body = {
     tableId: table._id!,
-    ...createdAction,
+    id: createdAction.id,
+    name: createdAction.name,
+    automationId: createdAction.automationId,
   }
   ctx.status = 201
 }
@@ -61,13 +68,15 @@ export async function update(
   const table = await getTable(ctx)
   const { actionId } = ctx.params
 
-  const actions = await sdk.rowActions.update(table._id!, actionId, {
+  const action = await sdk.rowActions.update(table._id!, actionId, {
     name: ctx.request.body.name,
   })
 
   ctx.body = {
     tableId: table._id!,
-    ...actions,
+    id: action.id,
+    name: action.name,
+    automationId: action.automationId,
   }
 }
 
diff --git a/packages/server/src/api/controllers/rowAction/run.ts b/packages/server/src/api/controllers/rowAction/run.ts
index 06c4b36f86..c4b6a276bf 100644
--- a/packages/server/src/api/controllers/rowAction/run.ts
+++ b/packages/server/src/api/controllers/rowAction/run.ts
@@ -1,3 +1,10 @@
-export function run() {
-  throw new Error("Function not implemented.")
+import { RowActionTriggerRequest, Ctx } from "@budibase/types"
+import sdk from "../../../sdk"
+
+export async function run(ctx: Ctx<RowActionTriggerRequest, void>) {
+  const { tableId, actionId } = ctx.params
+  const { rowId } = ctx.request.body
+
+  await sdk.rowActions.run(tableId, actionId, rowId)
+  ctx.status = 200
 }
diff --git a/packages/server/src/api/controllers/table/internal.ts b/packages/server/src/api/controllers/table/internal.ts
index a06cc4dee3..4286d51d3e 100644
--- a/packages/server/src/api/controllers/table/internal.ts
+++ b/packages/server/src/api/controllers/table/internal.ts
@@ -25,6 +25,8 @@ export async function save(
     sourceType: rest.sourceType || TableSourceType.INTERNAL,
   }
 
+  const isImport = !!rows
+
   if (!tableToSave.views) {
     tableToSave.views = {}
   }
@@ -35,6 +37,7 @@ export async function save(
       rowsToImport: rows,
       tableId: ctx.request.body._id,
       renaming,
+      isImport,
     })
 
     return table
diff --git a/packages/server/src/api/routes/rowAction.ts b/packages/server/src/api/routes/rowAction.ts
index f4f20822d1..c84d94c007 100644
--- a/packages/server/src/api/routes/rowAction.ts
+++ b/packages/server/src/api/routes/rowAction.ts
@@ -1,13 +1,12 @@
 import Router from "@koa/router"
+import Joi from "joi"
+import { middleware, permissions } from "@budibase/backend-core"
 import * as rowActionController from "../controllers/rowAction"
 import { authorizedResource } from "../../middleware/authorized"
 
-import { middleware, permissions } from "@budibase/backend-core"
-import Joi from "joi"
-
 const { PermissionLevel, PermissionType } = permissions
 
-export function rowActionValidator() {
+function rowActionValidator() {
   return middleware.joiValidator.body(
     Joi.object({
       name: Joi.string().required(),
@@ -16,6 +15,15 @@ export function rowActionValidator() {
   )
 }
 
+function rowTriggerValidator() {
+  return middleware.joiValidator.body(
+    Joi.object({
+      rowId: Joi.string().required(),
+    }),
+    { allowUnknown: false }
+  )
+}
+
 const router: Router = new Router()
 
 // CRUD endpoints
@@ -45,7 +53,8 @@ router
 
   // Other endpoints
   .post(
-    "/api/tables/:tableId/actions/:actionId/run",
+    "/api/tables/:tableId/actions/:actionId/trigger",
+    rowTriggerValidator(),
     authorizedResource(PermissionType.TABLE, PermissionLevel.READ, "tableId"),
     rowActionController.run
   )
diff --git a/packages/server/src/api/routes/tests/automation.spec.ts b/packages/server/src/api/routes/tests/automation.spec.ts
index 98d38f4973..990828dcde 100644
--- a/packages/server/src/api/routes/tests/automation.spec.ts
+++ b/packages/server/src/api/routes/tests/automation.spec.ts
@@ -398,7 +398,9 @@ describe("/automations", () => {
         .expect("Content-Type", /json/)
         .expect(200)
 
-      expect(res.body[0]).toEqual(expect.objectContaining(autoConfig))
+      expect(res.body.automations[0]).toEqual(
+        expect.objectContaining(autoConfig)
+      )
     })
 
     it("should apply authorization to endpoint", async () => {
@@ -423,6 +425,22 @@ describe("/automations", () => {
       expect(events.automation.deleted).toHaveBeenCalledTimes(1)
     })
 
+    it("cannot delete a row action automation", async () => {
+      const automation = await config.createAutomation(
+        setup.structures.rowActionAutomation()
+      )
+      await request
+        .delete(`/api/automations/${automation._id}/${automation._rev}`)
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(422, {
+          message: "Row actions automations cannot be deleted",
+          status: 422,
+        })
+
+      expect(events.automation.deleted).not.toHaveBeenCalled()
+    })
+
     it("should apply authorization to endpoint", async () => {
       const automation = await config.createAutomation()
       await checkBuilderEndpoint({
diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index 7ed4c7d640..9cc53168d0 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -1,3 +1,5 @@
+import * as setup from "./utilities"
+
 import {
   DatabaseName,
   getDatasource,
@@ -7,7 +9,6 @@ import {
 import tk from "timekeeper"
 import emitter from "../../../../src/events"
 import { outputProcessing } from "../../../utilities/rowProcessor"
-import * as setup from "./utilities"
 import { context, InternalTable, tenancy } from "@budibase/backend-core"
 import { quotas } from "@budibase/pro"
 import {
diff --git a/packages/server/src/api/routes/tests/rowAction.spec.ts b/packages/server/src/api/routes/tests/rowAction.spec.ts
index efdfdd2392..5e043cb42c 100644
--- a/packages/server/src/api/routes/tests/rowAction.spec.ts
+++ b/packages/server/src/api/routes/tests/rowAction.spec.ts
@@ -1,10 +1,17 @@
 import _ from "lodash"
 import tk from "timekeeper"
 
-import { CreateRowActionRequest, RowActionResponse } from "@budibase/types"
+import {
+  CreateRowActionRequest,
+  DocumentType,
+  RowActionResponse,
+} from "@budibase/types"
 import * as setup from "./utilities"
 import { generator } from "@budibase/backend-core/tests"
 
+const expectAutomationId = () =>
+  expect.stringMatching(`^${DocumentType.AUTOMATION}_.+`)
+
 describe("/rowsActions", () => {
   const config = setup.getConfig()
 
@@ -79,17 +86,19 @@ describe("/rowsActions", () => {
       })
 
       expect(res).toEqual({
+        name: rowAction.name,
         id: expect.stringMatching(/^row_action_\w+/),
         tableId: tableId,
-        ...rowAction,
+        automationId: expectAutomationId(),
       })
 
       expect(await config.api.rowAction.find(tableId)).toEqual({
         actions: {
           [res.id]: {
-            ...rowAction,
+            name: rowAction.name,
             id: res.id,
             tableId: tableId,
+            automationId: expectAutomationId(),
           },
         },
       })
@@ -97,19 +106,13 @@ describe("/rowsActions", () => {
 
     it("trims row action names", async () => {
       const name = "   action  name  "
-      const res = await createRowAction(
-        tableId,
-        { name },
-        {
-          status: 201,
-        }
-      )
+      const res = await createRowAction(tableId, { name }, { status: 201 })
 
-      expect(res).toEqual({
-        id: expect.stringMatching(/^row_action_\w+/),
-        tableId: tableId,
-        name: "action  name",
-      })
+      expect(res).toEqual(
+        expect.objectContaining({
+          name: "action  name",
+        })
+      )
 
       expect(await config.api.rowAction.find(tableId)).toEqual({
         actions: {
@@ -129,9 +132,24 @@ describe("/rowsActions", () => {
 
       expect(await config.api.rowAction.find(tableId)).toEqual({
         actions: {
-          [responses[0].id]: { ...rowActions[0], id: responses[0].id, tableId },
-          [responses[1].id]: { ...rowActions[1], id: responses[1].id, tableId },
-          [responses[2].id]: { ...rowActions[2], id: responses[2].id, tableId },
+          [responses[0].id]: {
+            name: rowActions[0].name,
+            id: responses[0].id,
+            tableId,
+            automationId: expectAutomationId(),
+          },
+          [responses[1].id]: {
+            name: rowActions[1].name,
+            id: responses[1].id,
+            tableId,
+            automationId: expectAutomationId(),
+          },
+          [responses[2].id]: {
+            name: rowActions[2].name,
+            id: responses[2].id,
+            tableId,
+            automationId: expectAutomationId(),
+          },
         },
       })
     })
@@ -152,7 +170,7 @@ describe("/rowsActions", () => {
     it("ignores not valid row action data", async () => {
       const rowAction = createRowActionRequest()
       const dirtyRowAction = {
-        ...rowAction,
+        name: rowAction.name,
         id: generator.guid(),
         valueToIgnore: generator.string(),
       }
@@ -161,17 +179,19 @@ describe("/rowsActions", () => {
       })
 
       expect(res).toEqual({
+        name: rowAction.name,
         id: expect.any(String),
         tableId,
-        ...rowAction,
+        automationId: expectAutomationId(),
       })
 
       expect(await config.api.rowAction.find(tableId)).toEqual({
         actions: {
           [res.id]: {
+            name: rowAction.name,
             id: res.id,
             tableId: tableId,
-            ...rowAction,
+            automationId: expectAutomationId(),
           },
         },
       })
@@ -213,6 +233,17 @@ describe("/rowsActions", () => {
 
       await createRowAction(otherTable._id!, { name: action.name })
     })
+
+    it("an automation is created when creating a new row action", async () => {
+      const action1 = await createRowAction(tableId, createRowActionRequest())
+      const action2 = await createRowAction(tableId, createRowActionRequest())
+
+      for (const automationId of [action1.automationId, action2.automationId]) {
+        expect(
+          await config.api.automation.get(automationId, { status: 200 })
+        ).toEqual(expect.objectContaining({ _id: automationId }))
+      }
+    })
   })
 
   describe("find", () => {
@@ -264,7 +295,6 @@ describe("/rowsActions", () => {
       const updatedName = generator.string()
 
       const res = await config.api.rowAction.update(tableId, actionId, {
-        ...actionData,
         name: updatedName,
       })
 
@@ -272,14 +302,17 @@ describe("/rowsActions", () => {
         id: actionId,
         tableId,
         name: updatedName,
+        automationId: actionData.automationId,
       })
 
       expect(await config.api.rowAction.find(tableId)).toEqual(
         expect.objectContaining({
           actions: expect.objectContaining({
             [actionId]: {
-              ...actionData,
               name: updatedName,
+              id: actionData.id,
+              tableId: actionData.tableId,
+              automationId: actionData.automationId,
             },
           }),
         })
@@ -296,7 +329,6 @@ describe("/rowsActions", () => {
       )
 
       const res = await config.api.rowAction.update(tableId, rowAction.id, {
-        ...rowAction,
         name: "   action  name  ",
       })
 
@@ -408,5 +440,26 @@ describe("/rowsActions", () => {
         status: 400,
       })
     })
+
+    it("deletes the linked automation", async () => {
+      const actions: RowActionResponse[] = []
+      for (const rowAction of createRowActionRequests(3)) {
+        actions.push(await createRowAction(tableId, rowAction))
+      }
+
+      const actionToDelete = _.sample(actions)!
+      await config.api.rowAction.delete(tableId, actionToDelete.id, {
+        status: 204,
+      })
+
+      await config.api.automation.get(actionToDelete.automationId, {
+        status: 404,
+      })
+      for (const action of actions.filter(a => a.id !== actionToDelete.id)) {
+        await config.api.automation.get(action.automationId, {
+          status: 200,
+        })
+      }
+    })
   })
 })
diff --git a/packages/server/src/api/routes/tests/utilities/TestFunctions.ts b/packages/server/src/api/routes/tests/utilities/TestFunctions.ts
index 15a3ede39b..a9a8e7051b 100644
--- a/packages/server/src/api/routes/tests/utilities/TestFunctions.ts
+++ b/packages/server/src/api/routes/tests/utilities/TestFunctions.ts
@@ -54,7 +54,7 @@ export const clearAllApps = async (
 }
 
 export const clearAllAutomations = async (config: TestConfiguration) => {
-  const automations = await config.getAllAutomations()
+  const { automations } = await config.getAllAutomations()
   for (let auto of automations) {
     await context.doInAppContext(config.getAppId(), async () => {
       await config.deleteAutomation(auto)
diff --git a/packages/server/src/automations/triggerInfo/index.ts b/packages/server/src/automations/triggerInfo/index.ts
index b35d915ea8..58a6fea3ad 100644
--- a/packages/server/src/automations/triggerInfo/index.ts
+++ b/packages/server/src/automations/triggerInfo/index.ts
@@ -1,15 +1,24 @@
+import {
+  AutomationTriggerSchema,
+  AutomationTriggerStepId,
+} from "@budibase/types"
 import * as app from "./app"
 import * as cron from "./cron"
 import * as rowDeleted from "./rowDeleted"
 import * as rowSaved from "./rowSaved"
 import * as rowUpdated from "./rowUpdated"
 import * as webhook from "./webhook"
+import * as rowAction from "./rowAction"
 
-export const definitions = {
+export const definitions: Record<
+  keyof typeof AutomationTriggerStepId,
+  AutomationTriggerSchema
+> = {
   ROW_SAVED: rowSaved.definition,
   ROW_UPDATED: rowUpdated.definition,
   ROW_DELETED: rowDeleted.definition,
   WEBHOOK: webhook.definition,
   APP: app.definition,
   CRON: cron.definition,
+  ROW_ACTION: rowAction.definition,
 }
diff --git a/packages/server/src/automations/triggerInfo/rowAction.ts b/packages/server/src/automations/triggerInfo/rowAction.ts
new file mode 100644
index 0000000000..862812fe2c
--- /dev/null
+++ b/packages/server/src/automations/triggerInfo/rowAction.ts
@@ -0,0 +1,55 @@
+import {
+  AutomationCustomIOType,
+  AutomationIOType,
+  AutomationStepType,
+  AutomationTriggerSchema,
+  AutomationTriggerStepId,
+  AutomationEventType,
+} from "@budibase/types"
+
+export const definition: AutomationTriggerSchema = {
+  type: AutomationStepType.TRIGGER,
+  name: "Row Action",
+  event: AutomationEventType.ROW_ACTION, // TODO
+  icon: "Workflow", // TODO
+  tagline:
+    "Row action triggered in {{inputs.enriched.table.name}} by {{inputs.enriched.row._id}}",
+  description: "TODO description", // TODO
+  stepId: AutomationTriggerStepId.ROW_ACTION,
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        tableId: {
+          type: AutomationIOType.STRING,
+          customType: AutomationCustomIOType.TABLE,
+          title: "Table",
+          readonly: true,
+        },
+      },
+      required: ["tableId"],
+    },
+    outputs: {
+      properties: {
+        id: {
+          type: AutomationIOType.STRING,
+          description: "Row ID - can be used for updating",
+        },
+        revision: {
+          type: AutomationIOType.STRING,
+          description: "Revision of row",
+        },
+        table: {
+          type: AutomationIOType.OBJECT,
+          customType: AutomationCustomIOType.TABLE,
+          title: "The table linked to the row action",
+        },
+        row: {
+          type: AutomationIOType.OBJECT,
+          customType: AutomationCustomIOType.ROW,
+          description: "The row linked to the row action",
+        },
+      },
+    },
+  },
+}
diff --git a/packages/server/src/automations/triggers.ts b/packages/server/src/automations/triggers.ts
index 99fc7f02f2..febc8b6a56 100644
--- a/packages/server/src/automations/triggers.ts
+++ b/packages/server/src/automations/triggers.ts
@@ -20,7 +20,7 @@ import {
   AutomationStatus,
 } from "@budibase/types"
 import { executeInThread } from "../threads/automation"
-import { dataFilters } from "@budibase/shared-core"
+import { dataFilters, sdk } from "@budibase/shared-core"
 
 export const TRIGGER_DEFINITIONS = definitions
 const JOB_OPTS = {
@@ -121,17 +121,15 @@ function rowPassesFilters(row: Row, filters: SearchFilters) {
 
 export async function externalTrigger(
   automation: Automation,
-  params: { fields: Record<string, any>; timeout?: number },
+  params: { fields: Record<string, any>; timeout?: number; appId?: string },
   { getResponses }: { getResponses?: boolean } = {}
 ): Promise<any> {
   if (automation.disabled) {
     throw new Error("Automation is disabled")
   }
+
   if (
-    automation.definition != null &&
-    automation.definition.trigger != null &&
-    automation.definition.trigger.stepId === definitions.APP.stepId &&
-    automation.definition.trigger.stepId === "APP" &&
+    sdk.automations.isAppAction(automation) &&
     !(await checkTestFlag(automation._id!))
   ) {
     // values are likely to be submitted as strings, so we shall convert to correct type
@@ -141,6 +139,13 @@ export async function externalTrigger(
       coercedFields[key] = coerce(params.fields[key], fields[key])
     }
     params.fields = coercedFields
+  } else if (sdk.automations.isRowAction(automation)) {
+    params = {
+      ...params,
+      // Until we don't refactor all the types, we want to flatten the nested "fields" object
+      ...params.fields,
+      fields: {},
+    }
   }
   const data: AutomationData = { automation, event: params }
 
diff --git a/packages/server/src/db/linkedRows/LinkController.ts b/packages/server/src/db/linkedRows/LinkController.ts
index 7427c9a44d..85a160713b 100644
--- a/packages/server/src/db/linkedRows/LinkController.ts
+++ b/packages/server/src/db/linkedRows/LinkController.ts
@@ -6,7 +6,6 @@ import {
   Database,
   FieldSchema,
   FieldType,
-  LinkDocumentValue,
   RelationshipFieldMetadata,
   RelationshipType,
   Row,
@@ -213,11 +212,10 @@ class LinkController {
             linkedSchema?.relationshipType === RelationshipType.ONE_TO_MANY
           ) {
             let links = (
-              (await getLinkDocuments({
+              await getLinkDocuments({
                 tableId: field.tableId,
                 rowId: linkId,
-                includeDocs: IncludeDocs.EXCLUDE,
-              })) as LinkDocumentValue[]
+              })
             ).filter(
               link =>
                 link.id !== row._id && link.fieldName === linkedSchema.name
@@ -295,13 +293,7 @@ class LinkController {
     if (linkDocs.length === 0) {
       return null
     }
-    const toDelete = linkDocs.map(doc => {
-      return {
-        ...doc,
-        _deleted: true,
-      }
-    })
-    await this._db.bulkDocs(toDelete)
+    await this._db.bulkRemove(linkDocs, { silenceErrors: true })
     return row
   }
 
@@ -321,14 +313,8 @@ class LinkController {
           : linkDoc.doc2.fieldName
       return correctFieldName === fieldName
     })
-    await this._db.bulkDocs(
-      toDelete.map(doc => {
-        return {
-          ...doc,
-          _deleted: true,
-        }
-      })
-    )
+    await this._db.bulkRemove(toDelete, { silenceErrors: true })
+
     try {
       // remove schema from other table, if it exists
       let linkedTable = await this._db.get<Table>(field.tableId)
@@ -453,13 +439,7 @@ class LinkController {
       return null
     }
     // get link docs for this table and configure for deletion
-    const toDelete = linkDocs.map(doc => {
-      return {
-        ...doc,
-        _deleted: true,
-      }
-    })
-    await this._db.bulkDocs(toDelete)
+    await this._db.bulkRemove(linkDocs, { silenceErrors: true })
     return table
   }
 }
diff --git a/packages/server/src/db/linkedRows/index.ts b/packages/server/src/db/linkedRows/index.ts
index 1eb534a7f8..87f980600a 100644
--- a/packages/server/src/db/linkedRows/index.ts
+++ b/packages/server/src/db/linkedRows/index.ts
@@ -1,6 +1,5 @@
 import LinkController from "./LinkController"
 import {
-  IncludeDocs,
   getLinkDocuments,
   getUniqueByProp,
   getRelatedTableForField,
@@ -56,12 +55,9 @@ async function getLinksForRows(rows: Row[]): Promise<LinkDocumentValue[]> {
   const promises = tableIds.map(tableId =>
     getLinkDocuments({
       tableId: tableId,
-      includeDocs: IncludeDocs.EXCLUDE,
     })
   )
-  const responses = flatten(
-    (await Promise.all(promises)) as LinkDocumentValue[][]
-  )
+  const responses = flatten(await Promise.all(promises))
   // have to get unique as the previous table query can
   // return duplicates, could be querying for both tables in a relation
   return getUniqueByProp(
diff --git a/packages/server/src/db/linkedRows/linkUtils.ts b/packages/server/src/db/linkedRows/linkUtils.ts
index a999871939..c30d62ef35 100644
--- a/packages/server/src/db/linkedRows/linkUtils.ts
+++ b/packages/server/src/db/linkedRows/linkUtils.ts
@@ -34,6 +34,17 @@ export const IncludeDocs = {
  * @returns This will return an array of the linking documents that were found
  * (if any).
  */
+export function getLinkDocuments(args: {
+  tableId?: string
+  rowId?: string
+  fieldName?: string
+  includeDocs: boolean
+}): Promise<LinkDocument[]>
+export function getLinkDocuments(args: {
+  tableId?: string
+  rowId?: string
+  fieldName?: string
+}): Promise<LinkDocumentValue[]>
 export async function getLinkDocuments(args: {
   tableId?: string
   rowId?: string
diff --git a/packages/server/src/db/utils.ts b/packages/server/src/db/utils.ts
index e3fe945863..043394e7a6 100644
--- a/packages/server/src/db/utils.ts
+++ b/packages/server/src/db/utils.ts
@@ -57,14 +57,6 @@ export const getUserMetadataParams = dbCore.getUserMetadataParams
 export const generateUserMetadataID = dbCore.generateUserMetadataID
 export const getGlobalIDFromUserMetadataID =
   dbCore.getGlobalIDFromUserMetadataID
-export const CONSTANT_INTERNAL_ROW_COLS = [
-  "_id",
-  "_rev",
-  "type",
-  "createdAt",
-  "updatedAt",
-  "tableId",
-]
 
 /**
  * Gets parameters for retrieving tables, this is a utility function for the getDocParams function.
diff --git a/packages/server/src/sdk/app/automations/crud.ts b/packages/server/src/sdk/app/automations/crud.ts
index 418da02c1c..2b36e32397 100644
--- a/packages/server/src/sdk/app/automations/crud.ts
+++ b/packages/server/src/sdk/app/automations/crud.ts
@@ -1,3 +1,4 @@
+import { sdk } from "@budibase/shared-core"
 import {
   Automation,
   RequiredKeys,
@@ -16,6 +17,11 @@ import {
 import { definitions } from "../../../automations/triggerInfo"
 import automations from "."
 
+export interface PersistedAutomation extends Automation {
+  _id: string
+  _rev: string
+}
+
 function getDb() {
   return context.getAppDB()
 }
@@ -76,7 +82,7 @@ async function handleStepEvents(
 
 export async function fetch() {
   const db = getDb()
-  const response = await db.allDocs<Automation>(
+  const response = await db.allDocs<PersistedAutomation>(
     getAutomationParams(null, {
       include_docs: true,
     })
@@ -89,7 +95,7 @@ export async function fetch() {
 
 export async function get(automationId: string) {
   const db = getDb()
-  const result = await db.get<Automation>(automationId)
+  const result = await db.get<PersistedAutomation>(automationId)
   return trimUnexpectedObjectFields(result)
 }
 
@@ -127,6 +133,9 @@ export async function update(automation: Automation) {
   const db = getDb()
 
   const oldAutomation = await db.get<Automation>(automation._id)
+
+  guardInvalidUpdatesAndThrow(automation, oldAutomation)
+
   automation = cleanAutomationInputs(automation)
   automation = await checkForWebhooks({
     oldAuto: oldAutomation,
@@ -254,6 +263,41 @@ async function checkForWebhooks({ oldAuto, newAuto }: any) {
   return newAuto
 }
 
+function guardInvalidUpdatesAndThrow(
+  automation: Automation,
+  oldAutomation: Automation
+) {
+  const stepDefinitions = [
+    automation.definition.trigger,
+    ...automation.definition.steps,
+  ]
+  const oldStepDefinitions = [
+    oldAutomation.definition.trigger,
+    ...oldAutomation.definition.steps,
+  ]
+  for (const step of stepDefinitions) {
+    const readonlyFields = Object.keys(
+      step.schema.inputs.properties || {}
+    ).filter(k => step.schema.inputs.properties[k].readonly)
+    readonlyFields.forEach(readonlyField => {
+      const oldStep = oldStepDefinitions.find(i => i.id === step.id)
+      if (step.inputs[readonlyField] !== oldStep?.inputs[readonlyField]) {
+        throw new HTTPError(
+          `Field ${readonlyField} is readonly and it cannot be modified`,
+          400
+        )
+      }
+    })
+  }
+
+  if (
+    sdk.automations.isRowAction(automation) &&
+    automation.name !== oldAutomation.name
+  ) {
+    throw new Error("Row actions cannot be renamed")
+  }
+}
+
 function trimUnexpectedObjectFields<T extends Automation>(automation: T): T {
   // This will ensure all the automation fields (and nothing else) is mapped to the result
   const allRequired: RequiredKeys<Automation> = {
diff --git a/packages/server/src/sdk/app/automations/tests/index.spec.ts b/packages/server/src/sdk/app/automations/tests/index.spec.ts
new file mode 100644
index 0000000000..bf4c886cf0
--- /dev/null
+++ b/packages/server/src/sdk/app/automations/tests/index.spec.ts
@@ -0,0 +1,88 @@
+import { sample } from "lodash/fp"
+import { Automation, AutomationTriggerStepId } from "@budibase/types"
+import { generator } from "@budibase/backend-core/tests"
+import TestConfiguration from "../../../../tests/utilities/TestConfiguration"
+import automationSdk from "../"
+import { structures } from "../../../../api/routes/tests/utilities"
+
+describe("automation sdk", () => {
+  const config = new TestConfiguration()
+
+  beforeAll(async () => {
+    await config.init()
+  })
+
+  describe("update", () => {
+    it("can rename existing automations", async () => {
+      await config.doInContext(config.getAppId(), async () => {
+        const automation = structures.newAutomation()
+
+        const response = await automationSdk.create(automation)
+
+        const newName = generator.guid()
+        const update = { ...response, name: newName }
+        const result = await automationSdk.update(update)
+        expect(result.name).toEqual(newName)
+      })
+    })
+
+    it("cannot rename row action automations", async () => {
+      await config.doInContext(config.getAppId(), async () => {
+        const automation = structures.newAutomation({
+          trigger: {
+            ...structures.automationTrigger(),
+            stepId: AutomationTriggerStepId.ROW_ACTION,
+          },
+        })
+
+        const response = await automationSdk.create(automation)
+
+        const newName = generator.guid()
+        const update = { ...response, name: newName }
+        await expect(automationSdk.update(update)).rejects.toThrow(
+          "Row actions cannot be renamed"
+        )
+      })
+    })
+
+    it.each([
+      ["trigger", (a: Automation) => a.definition.trigger],
+      ["step", (a: Automation) => a.definition.steps[0]],
+    ])("can update input fields (for a %s)", async (_, getStep) => {
+      await config.doInContext(config.getAppId(), async () => {
+        const automation = structures.newAutomation()
+
+        const keyToUse = sample(Object.keys(getStep(automation).inputs))!
+        getStep(automation).inputs[keyToUse] = "anyValue"
+
+        const response = await automationSdk.create(automation)
+
+        const update = { ...response }
+        getStep(update).inputs[keyToUse] = "anyUpdatedValue"
+        const result = await automationSdk.update(update)
+        expect(getStep(result).inputs[keyToUse]).toEqual("anyUpdatedValue")
+      })
+    })
+
+    it.each([
+      ["trigger", (a: Automation) => a.definition.trigger],
+      ["step", (a: Automation) => a.definition.steps[0]],
+    ])("cannot update readonly fields (for a %s)", async (_, getStep) => {
+      await config.doInContext(config.getAppId(), async () => {
+        const automation = structures.newAutomation()
+        getStep(automation).schema.inputs.properties["readonlyProperty"] = {
+          readonly: true,
+        }
+        getStep(automation).inputs["readonlyProperty"] = "anyValue"
+
+        const response = await automationSdk.create(automation)
+
+        const update = { ...response }
+        getStep(update).inputs["readonlyProperty"] = "anyUpdatedValue"
+        await expect(automationSdk.update(update)).rejects.toThrow(
+          "Field readonlyProperty is readonly and it cannot be modified"
+        )
+      })
+    })
+  })
+})
diff --git a/packages/server/src/sdk/app/automations/utils.ts b/packages/server/src/sdk/app/automations/utils.ts
index 79e70923f1..e89006d618 100644
--- a/packages/server/src/sdk/app/automations/utils.ts
+++ b/packages/server/src/sdk/app/automations/utils.ts
@@ -1,7 +1,66 @@
-import { Automation, AutomationActionStepId } from "@budibase/types"
+import {
+  Automation,
+  AutomationActionStepId,
+  AutomationBuilderData,
+  TableRowActions,
+} from "@budibase/types"
+import { sdk as coreSdk } from "@budibase/shared-core"
+import sdk from "../../../sdk"
 
 export function checkForCollectStep(automation: Automation) {
   return automation.definition.steps.some(
     (step: any) => step.stepId === AutomationActionStepId.COLLECT
   )
 }
+
+export async function getBuilderData(
+  automations: Automation[]
+): Promise<Record<string, AutomationBuilderData>> {
+  const tableNameCache: Record<string, string> = {}
+  async function getTableName(tableId: string) {
+    if (!tableNameCache[tableId]) {
+      const table = await sdk.tables.getTable(tableId)
+      tableNameCache[tableId] = table.name
+    }
+
+    return tableNameCache[tableId]
+  }
+
+  const rowActionNameCache: Record<string, TableRowActions> = {}
+  async function getRowActionName(tableId: string, rowActionId: string) {
+    if (!rowActionNameCache[tableId]) {
+      const rowActions = await sdk.rowActions.get(tableId)
+      rowActionNameCache[tableId] = rowActions
+    }
+
+    return rowActionNameCache[tableId].actions[rowActionId]?.name
+  }
+
+  const result: Record<string, AutomationBuilderData> = {}
+  for (const automation of automations) {
+    const isRowAction = coreSdk.automations.isRowAction(automation)
+    if (!isRowAction) {
+      result[automation._id!] = { displayName: automation.name }
+      continue
+    }
+
+    const { tableId, rowActionId } = automation.definition.trigger.inputs
+
+    const tableName = await getTableName(tableId)
+
+    const rowActionName = await getRowActionName(tableId, rowActionId)
+
+    result[automation._id!] = {
+      displayName: `${tableName}: ${automation.name}`,
+      triggerInfo: {
+        type: "Automation trigger",
+        table: { id: tableId, name: tableName },
+        rowAction: {
+          id: rowActionId,
+          name: rowActionName,
+        },
+      },
+    }
+  }
+  return result
+}
diff --git a/packages/server/src/sdk/app/rowActions.ts b/packages/server/src/sdk/app/rowActions.ts
index 8bff216ab9..36d2ed7b92 100644
--- a/packages/server/src/sdk/app/rowActions.ts
+++ b/packages/server/src/sdk/app/rowActions.ts
@@ -1,11 +1,15 @@
 import { context, HTTPError, utils } from "@budibase/backend-core"
 
-import { generateRowActionsID } from "../../db/utils"
 import {
   SEPARATOR,
   TableRowActions,
   VirtualDocumentType,
 } from "@budibase/types"
+import { generateRowActionsID } from "../../db/utils"
+import automations from "./automations"
+import { definitions as TRIGGER_DEFINITIONS } from "../../automations/triggerInfo"
+import * as triggers from "../../automations/triggers"
+import sdk from ".."
 
 function ensureUniqueAndThrow(
   doc: TableRowActions,
@@ -41,13 +45,40 @@ export async function create(tableId: string, rowAction: { name: string }) {
 
   ensureUniqueAndThrow(doc, action.name)
 
-  const newId = `${VirtualDocumentType.ROW_ACTION}${SEPARATOR}${utils.newid()}`
-  doc.actions[newId] = action
+  const appId = context.getAppId()
+  if (!appId) {
+    throw new Error("Could not get the current appId")
+  }
+
+  const newRowActionId = `${
+    VirtualDocumentType.ROW_ACTION
+  }${SEPARATOR}${utils.newid()}`
+
+  const automation = await automations.create({
+    name: action.name,
+    appId,
+    definition: {
+      trigger: {
+        id: "trigger",
+        ...TRIGGER_DEFINITIONS.ROW_ACTION,
+        inputs: {
+          tableId,
+          rowActionId: newRowActionId,
+        },
+      },
+      steps: [],
+    },
+  })
+
+  doc.actions[newRowActionId] = {
+    name: action.name,
+    automationId: automation._id!,
+  }
   await db.put(doc)
 
   return {
-    id: newId,
-    ...action,
+    id: newRowActionId,
+    ...doc.actions[newRowActionId],
   }
 }
 
@@ -81,29 +112,61 @@ export async function update(
 
   ensureUniqueAndThrow(actionsDoc, action.name, rowActionId)
 
-  actionsDoc.actions[rowActionId] = action
+  actionsDoc.actions[rowActionId] = {
+    automationId: actionsDoc.actions[rowActionId].automationId,
+    ...action,
+  }
 
   const db = context.getAppDB()
   await db.put(actionsDoc)
 
   return {
     id: rowActionId,
-    ...action,
+    ...actionsDoc.actions[rowActionId],
   }
 }
 
 export async function remove(tableId: string, rowActionId: string) {
   const actionsDoc = await get(tableId)
 
-  if (!actionsDoc.actions[rowActionId]) {
+  const rowAction = actionsDoc.actions[rowActionId]
+  if (!rowAction) {
     throw new HTTPError(
       `Row action '${rowActionId}' not found in '${tableId}'`,
       400
     )
   }
 
+  const { automationId } = rowAction
+  const automation = await automations.get(automationId)
+  await automations.remove(automation._id, automation._rev)
   delete actionsDoc.actions[rowActionId]
 
   const db = context.getAppDB()
   await db.put(actionsDoc)
 }
+
+export async function run(tableId: any, rowActionId: any, rowId: string) {
+  const table = await sdk.tables.getTable(tableId)
+  if (!table) {
+    throw new HTTPError("Table not found", 404)
+  }
+
+  const { actions } = await get(tableId)
+
+  const rowAction = actions[rowActionId]
+  if (!rowAction) {
+    throw new HTTPError("Row action not found", 404)
+  }
+
+  const automation = await sdk.automations.get(rowAction.automationId)
+
+  const row = await sdk.rows.find(tableId, rowId)
+  await triggers.externalTrigger(automation, {
+    fields: {
+      row,
+      table,
+    },
+    appId: context.getAppId(),
+  })
+}
diff --git a/packages/server/src/sdk/app/rows/search/external.ts b/packages/server/src/sdk/app/rows/search/external.ts
index 815094eeeb..83b9a0b646 100644
--- a/packages/server/src/sdk/app/rows/search/external.ts
+++ b/packages/server/src/sdk/app/rows/search/external.ts
@@ -16,7 +16,7 @@ import {
   breakExternalTableId,
   breakRowIdField,
 } from "../../../../integrations/utils"
-import { utils, CONSTANT_EXTERNAL_ROW_COLS } from "@budibase/shared-core"
+import { utils, PROTECTED_EXTERNAL_COLUMNS } from "@budibase/shared-core"
 import { ExportRowsParams, ExportRowsResult } from "./types"
 import { HTTPError } from "@budibase/backend-core"
 import pick from "lodash/pick"
@@ -99,7 +99,7 @@ export async function search(
     }
 
     if (options.fields) {
-      const fields = [...options.fields, ...CONSTANT_EXTERNAL_ROW_COLS]
+      const fields = [...options.fields, ...PROTECTED_EXTERNAL_COLUMNS]
       rows = rows.map((r: any) => pick(r, fields))
     }
 
diff --git a/packages/server/src/sdk/app/rows/search/internal.ts b/packages/server/src/sdk/app/rows/search/internal.ts
index 097b16b104..46d2cd8c61 100644
--- a/packages/server/src/sdk/app/rows/search/internal.ts
+++ b/packages/server/src/sdk/app/rows/search/internal.ts
@@ -1,5 +1,5 @@
 import { context, HTTPError } from "@budibase/backend-core"
-import { CONSTANT_INTERNAL_ROW_COLS } from "@budibase/shared-core"
+import { PROTECTED_INTERNAL_COLUMNS } from "@budibase/shared-core"
 import env from "../../../../environment"
 import { fullSearch, paginatedSearch } from "./utils"
 import { getRowParams, InternalTables } from "../../../../db/utils"
@@ -75,7 +75,7 @@ export async function search(
     }
 
     if (options.fields) {
-      const fields = [...options.fields, ...CONSTANT_INTERNAL_ROW_COLS]
+      const fields = [...options.fields, ...PROTECTED_INTERNAL_COLUMNS]
       response.rows = response.rows.map((r: any) => pick(r, fields))
     }
 
diff --git a/packages/server/src/sdk/app/rows/search/sqs.ts b/packages/server/src/sdk/app/rows/search/sqs.ts
index 650321a9a7..03dba0cd92 100644
--- a/packages/server/src/sdk/app/rows/search/sqs.ts
+++ b/packages/server/src/sdk/app/rows/search/sqs.ts
@@ -27,10 +27,7 @@ import {
   SQLITE_DESIGN_DOC_ID,
   SQS_DATASOURCE_INTERNAL,
 } from "@budibase/backend-core"
-import {
-  CONSTANT_INTERNAL_ROW_COLS,
-  generateJunctionTableID,
-} from "../../../../db/utils"
+import { generateJunctionTableID } from "../../../../db/utils"
 import AliasTables from "../sqlAlias"
 import { outputProcessing } from "../../../../utilities/rowProcessor"
 import pick from "lodash/pick"
@@ -40,7 +37,11 @@ import {
   getRelationshipColumns,
   getTableIDList,
 } from "./filters"
-import { dataFilters, helpers } from "@budibase/shared-core"
+import {
+  dataFilters,
+  helpers,
+  PROTECTED_INTERNAL_COLUMNS,
+} from "@budibase/shared-core"
 
 const builder = new sql.Sql(SqlClient.SQL_LITE)
 const MISSING_COLUMN_REGEX = new RegExp(`no such column: .+`)
@@ -61,7 +62,7 @@ function buildInternalFieldList(
     })
   }
   fieldList = fieldList.concat(
-    CONSTANT_INTERNAL_ROW_COLS.map(col => `${table._id}.${col}`)
+    PROTECTED_INTERNAL_COLUMNS.map(col => `${table._id}.${col}`)
   )
   for (let col of Object.values(table.schema)) {
     const isRelationship = col.type === FieldType.LINK
@@ -351,7 +352,7 @@ export async function search(
 
     // check if we need to pick specific rows out
     if (options.fields) {
-      const fields = [...options.fields, ...CONSTANT_INTERNAL_ROW_COLS]
+      const fields = [...options.fields, ...PROTECTED_INTERNAL_COLUMNS]
       finalRows = finalRows.map((r: any) => pick(r, fields))
     }
 
diff --git a/packages/server/src/sdk/app/tables/internal/index.ts b/packages/server/src/sdk/app/tables/internal/index.ts
index fc32708708..58f172e016 100644
--- a/packages/server/src/sdk/app/tables/internal/index.ts
+++ b/packages/server/src/sdk/app/tables/internal/index.ts
@@ -31,6 +31,7 @@ export async function save(
     tableId?: string
     rowsToImport?: Row[]
     renaming?: RenameColumn
+    isImport?: boolean
   }
 ) {
   const db = context.getAppDB()
@@ -47,7 +48,9 @@ export async function save(
   }
 
   // check for case sensitivity - we don't want to allow duplicated columns
-  const duplicateColumn = findDuplicateInternalColumns(table)
+  const duplicateColumn = findDuplicateInternalColumns(table, {
+    ignoreProtectedColumnNames: !oldTable && !!opts?.isImport,
+  })
   if (duplicateColumn.length) {
     throw new Error(
       `Column(s) "${duplicateColumn.join(
diff --git a/packages/server/src/sdk/app/tables/internal/sqs.ts b/packages/server/src/sdk/app/tables/internal/sqs.ts
index 6199adcfba..bd71644537 100644
--- a/packages/server/src/sdk/app/tables/internal/sqs.ts
+++ b/packages/server/src/sdk/app/tables/internal/sqs.ts
@@ -10,13 +10,10 @@ import {
   Table,
 } from "@budibase/types"
 import tablesSdk from "../"
-import {
-  CONSTANT_INTERNAL_ROW_COLS,
-  generateJunctionTableID,
-} from "../../../../db/utils"
+import { generateJunctionTableID } from "../../../../db/utils"
 import { isEqual } from "lodash"
 import { DEFAULT_TABLES } from "../../../../db/defaultData/datasource_bb_default"
-import { helpers } from "@budibase/shared-core"
+import { helpers, PROTECTED_INTERNAL_COLUMNS } from "@budibase/shared-core"
 
 const FieldTypeMap: Record<FieldType, SQLiteType> = {
   [FieldType.BOOLEAN]: SQLiteType.NUMERIC,
@@ -104,7 +101,7 @@ function mapTable(table: Table): SQLiteTables {
   }
   // there are some extra columns to map - add these in
   const constantMap: Record<string, SQLiteType> = {}
-  CONSTANT_INTERNAL_ROW_COLS.forEach(col => {
+  PROTECTED_INTERNAL_COLUMNS.forEach(col => {
     constantMap[col] = SQLiteType.TEXT
   })
   const thisTable: SQLiteTable = {
diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index 3bdfec7448..1c09f710d7 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -10,8 +10,8 @@ import { HTTPError } from "@budibase/backend-core"
 import { features } from "@budibase/pro"
 import {
   helpers,
-  CONSTANT_EXTERNAL_ROW_COLS,
-  CONSTANT_INTERNAL_ROW_COLS,
+  PROTECTED_EXTERNAL_COLUMNS,
+  PROTECTED_INTERNAL_COLUMNS,
 } from "@budibase/shared-core"
 import { cloneDeep } from "lodash/fp"
 
@@ -148,8 +148,8 @@ export function allowedFields(view: View | ViewV2) {
       const fieldSchema = view.schema![key]
       return fieldSchema.visible && !fieldSchema.readonly
     }),
-    ...CONSTANT_EXTERNAL_ROW_COLS,
-    ...CONSTANT_INTERNAL_ROW_COLS,
+    ...PROTECTED_EXTERNAL_COLUMNS,
+    ...PROTECTED_INTERNAL_COLUMNS,
   ]
 }
 
diff --git a/packages/server/src/tests/utilities/api/automation.ts b/packages/server/src/tests/utilities/api/automation.ts
new file mode 100644
index 0000000000..9620e2011c
--- /dev/null
+++ b/packages/server/src/tests/utilities/api/automation.ts
@@ -0,0 +1,17 @@
+import { Automation } from "@budibase/types"
+import { Expectations, TestAPI } from "./base"
+
+export class AutomationAPI extends TestAPI {
+  get = async (
+    automationId: string,
+    expectations?: Expectations
+  ): Promise<Automation> => {
+    const result = await this._get<Automation>(
+      `/api/automations/${automationId}`,
+      {
+        expectations,
+      }
+    )
+    return result
+  }
+}
diff --git a/packages/server/src/tests/utilities/api/index.ts b/packages/server/src/tests/utilities/api/index.ts
index a19b68a872..36a6ed0222 100644
--- a/packages/server/src/tests/utilities/api/index.ts
+++ b/packages/server/src/tests/utilities/api/index.ts
@@ -14,6 +14,7 @@ import { QueryAPI } from "./query"
 import { RoleAPI } from "./role"
 import { TemplateAPI } from "./template"
 import { RowActionAPI } from "./rowAction"
+import { AutomationAPI } from "./automation"
 
 export default class API {
   table: TableAPI
@@ -31,6 +32,7 @@ export default class API {
   roles: RoleAPI
   templates: TemplateAPI
   rowAction: RowActionAPI
+  automation: AutomationAPI
 
   constructor(config: TestConfiguration) {
     this.table = new TableAPI(config)
@@ -48,5 +50,6 @@ export default class API {
     this.roles = new RoleAPI(config)
     this.templates = new TemplateAPI(config)
     this.rowAction = new RowActionAPI(config)
+    this.automation = new AutomationAPI(config)
   }
 }
diff --git a/packages/server/src/tests/utilities/structures.ts b/packages/server/src/tests/utilities/structures.ts
index 970df2e2c9..16ab049eb4 100644
--- a/packages/server/src/tests/utilities/structures.ts
+++ b/packages/server/src/tests/utilities/structures.ts
@@ -158,7 +158,10 @@ export function automationTrigger(
   }
 }
 
-export function newAutomation({ steps, trigger }: any = {}) {
+export function newAutomation({
+  steps,
+  trigger,
+}: { steps?: AutomationStep[]; trigger?: AutomationTrigger } = {}) {
   const automation = basicAutomation()
 
   if (trigger) {
@@ -176,6 +179,16 @@ export function newAutomation({ steps, trigger }: any = {}) {
   return automation
 }
 
+export function rowActionAutomation() {
+  const automation = newAutomation({
+    trigger: {
+      ...automationTrigger(),
+      stepId: AutomationTriggerStepId.ROW_ACTION,
+    },
+  })
+  return automation
+}
+
 export function basicAutomation(appId?: string): Automation {
   return {
     name: "My Automation",
diff --git a/packages/shared-core/src/constants/rows.ts b/packages/shared-core/src/constants/rows.ts
index bfa7595d62..03663a4014 100644
--- a/packages/shared-core/src/constants/rows.ts
+++ b/packages/shared-core/src/constants/rows.ts
@@ -1,4 +1,4 @@
-export const CONSTANT_INTERNAL_ROW_COLS = [
+export const PROTECTED_INTERNAL_COLUMNS = [
   "_id",
   "_rev",
   "type",
@@ -7,8 +7,8 @@ export const CONSTANT_INTERNAL_ROW_COLS = [
   "tableId",
 ] as const
 
-export const CONSTANT_EXTERNAL_ROW_COLS = ["_id", "_rev", "tableId"] as const
+export const PROTECTED_EXTERNAL_COLUMNS = ["_id", "_rev", "tableId"] as const
 
 export function isInternalColumnName(name: string): boolean {
-  return (CONSTANT_INTERNAL_ROW_COLS as readonly string[]).includes(name)
+  return (PROTECTED_INTERNAL_COLUMNS as readonly string[]).includes(name)
 }
diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 1c45cb4338..d30f591abc 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -594,7 +594,7 @@ export const runQuery = (docs: Record<string, any>[], query: SearchFilters) => {
     if (Array.isArray(docValue)) {
       return docValue.length === 0
     }
-    if (typeof docValue === "object") {
+    if (docValue && typeof docValue === "object") {
       return Object.keys(docValue).length === 0
     }
     return docValue == null
diff --git a/packages/shared-core/src/sdk/documents/automations.ts b/packages/shared-core/src/sdk/documents/automations.ts
new file mode 100644
index 0000000000..86cbee75f7
--- /dev/null
+++ b/packages/shared-core/src/sdk/documents/automations.ts
@@ -0,0 +1,13 @@
+import { Automation, AutomationTriggerStepId } from "@budibase/types"
+
+export function isRowAction(automation: Automation) {
+  const result =
+    automation.definition.trigger?.stepId === AutomationTriggerStepId.ROW_ACTION
+  return result
+}
+
+export function isAppAction(automation: Automation) {
+  const result =
+    automation.definition.trigger?.stepId === AutomationTriggerStepId.APP
+  return result
+}
diff --git a/packages/shared-core/src/sdk/documents/index.ts b/packages/shared-core/src/sdk/documents/index.ts
index d20631eef4..4b17c1ea08 100644
--- a/packages/shared-core/src/sdk/documents/index.ts
+++ b/packages/shared-core/src/sdk/documents/index.ts
@@ -1,2 +1,3 @@
 export * as applications from "./applications"
+export * as automations from "./automations"
 export * as users from "./users"
diff --git a/packages/shared-core/src/table.ts b/packages/shared-core/src/table.ts
index 8fd7909b18..d5fd1dec00 100644
--- a/packages/shared-core/src/table.ts
+++ b/packages/shared-core/src/table.ts
@@ -1,5 +1,5 @@
 import { FieldType, Table } from "@budibase/types"
-import { CONSTANT_INTERNAL_ROW_COLS } from "./constants"
+import { PROTECTED_INTERNAL_COLUMNS } from "./constants"
 
 const allowDisplayColumnByType: Record<FieldType, boolean> = {
   [FieldType.STRING]: true,
@@ -53,7 +53,10 @@ export function canBeSortColumn(type: FieldType): boolean {
   return !!allowSortColumnByType[type]
 }
 
-export function findDuplicateInternalColumns(table: Table): string[] {
+export function findDuplicateInternalColumns(
+  table: Table,
+  opts?: { ignoreProtectedColumnNames: boolean }
+): string[] {
   // maintains the case of keys
   const casedKeys = Object.keys(table.schema)
   // get the column names
@@ -69,9 +72,11 @@ export function findDuplicateInternalColumns(table: Table): string[] {
       }
     }
   }
-  for (let internalColumn of CONSTANT_INTERNAL_ROW_COLS) {
-    if (casedKeys.find(key => key === internalColumn)) {
-      duplicates.push(internalColumn)
+  if (!opts?.ignoreProtectedColumnNames) {
+    for (let internalColumn of PROTECTED_INTERNAL_COLUMNS) {
+      if (casedKeys.find(key => key === internalColumn)) {
+        duplicates.push(internalColumn)
+      }
     }
   }
   return duplicates
diff --git a/packages/types/src/api/web/app/rowAction.ts b/packages/types/src/api/web/app/rowAction.ts
index ba95ba6b95..2b2b6e1927 100644
--- a/packages/types/src/api/web/app/rowAction.ts
+++ b/packages/types/src/api/web/app/rowAction.ts
@@ -7,8 +7,13 @@ export interface UpdateRowActionRequest extends RowActionData {}
 export interface RowActionResponse extends RowActionData {
   id: string
   tableId: string
+  automationId: string
 }
 
 export interface RowActionsResponse {
   actions: Record<string, RowActionResponse>
 }
+
+export interface RowActionTriggerRequest {
+  rowId: string
+}
diff --git a/packages/types/src/api/web/automation.ts b/packages/types/src/api/web/automation.ts
index c1f3d01b2f..6c810d5e78 100644
--- a/packages/types/src/api/web/automation.ts
+++ b/packages/types/src/api/web/automation.ts
@@ -1,3 +1,24 @@
 import { DocumentDestroyResponse } from "@budibase/nano"
+import { Automation } from "../../documents"
 
 export interface DeleteAutomationResponse extends DocumentDestroyResponse {}
+
+export interface AutomationBuilderData {
+  displayName: string
+  triggerInfo?: {
+    type: string
+    table: {
+      id: string
+      name: string
+    }
+    rowAction: {
+      id: string
+      name: string
+    }
+  }
+}
+
+export interface FetchAutomationResponse {
+  automations: Automation[]
+  builderData?: Record<string, AutomationBuilderData> // The key will be the automationId
+}
diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts
index 0432c11851..b53895e57b 100644
--- a/packages/types/src/documents/app/automation.ts
+++ b/packages/types/src/documents/app/automation.ts
@@ -45,6 +45,7 @@ export enum AutomationTriggerStepId {
   WEBHOOK = "WEBHOOK",
   APP = "APP",
   CRON = "CRON",
+  ROW_ACTION = "ROW_ACTION",
 }
 
 export enum AutomationStepType {
@@ -152,6 +153,7 @@ interface BaseIOStructure {
     [key: string]: BaseIOStructure
   }
   required?: string[]
+  readonly?: true
 }
 
 export interface InputOutputBlock {
@@ -192,6 +194,7 @@ export interface AutomationStep extends AutomationStepSchema {
 }
 
 export interface AutomationTriggerSchema extends AutomationStepSchema {
+  type: AutomationStepType.TRIGGER
   event?: string
   cronJobId?: string
 }
@@ -276,6 +279,7 @@ export enum AutomationEventType {
   APP_TRIGGER = "app:trigger",
   CRON_TRIGGER = "cron:trigger",
   WEBHOOK_TRIGGER = "web:trigger",
+  ROW_ACTION = "row:action",
 }
 
 export type UpdatedRowEventEmitter = {
diff --git a/packages/types/src/documents/app/rowAction.ts b/packages/types/src/documents/app/rowAction.ts
index ea55d5dcd2..84fa0e7f00 100644
--- a/packages/types/src/documents/app/rowAction.ts
+++ b/packages/types/src/documents/app/rowAction.ts
@@ -6,6 +6,7 @@ export interface TableRowActions extends Document {
     string,
     {
       name: string
+      automationId: string
     }
   >
 }
diff --git a/packages/types/src/documents/platform/users.ts b/packages/types/src/documents/platform/users.ts
index 8f24329502..8882baab1c 100644
--- a/packages/types/src/documents/platform/users.ts
+++ b/packages/types/src/documents/platform/users.ts
@@ -13,6 +13,8 @@ export interface PlatformUserByEmail extends Document {
  */
 export interface PlatformUserById extends Document {
   tenantId: string
+  email?: string
+  ssoId?: string
 }
 
 /**
@@ -22,6 +24,7 @@ export interface PlatformUserBySsoId extends Document {
   tenantId: string
   userId: string
   email: string
+  ssoId?: string
 }
 
 export type PlatformUser =
diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts
index 63c37195b7..a081f4f1a2 100644
--- a/packages/types/src/sdk/db.ts
+++ b/packages/types/src/sdk/db.ts
@@ -137,6 +137,10 @@ export interface Database {
   ): Promise<T[]>
   remove(idOrDoc: Document): Promise<Nano.DocumentDestroyResponse>
   remove(idOrDoc: string, rev?: string): Promise<Nano.DocumentDestroyResponse>
+  bulkRemove(
+    documents: Document[],
+    opts?: { silenceErrors?: boolean }
+  ): Promise<void>
   put(
     document: AnyDocument,
     opts?: DatabasePutOpts
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index cd69281f56..273eec279c 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -62,7 +62,7 @@ export const addSsoSupport = async (ctx: Ctx<AddSSoUserRequest>) => {
   const { email, ssoId } = ctx.request.body
   try {
     // Status is changed to 404 from getUserDoc if user is not found
-    let userByEmail = (await platform.users.getUserDoc(
+    const userByEmail = (await platform.users.getUserDoc(
       email
     )) as PlatformUserByEmail
     await platform.users.addSsoUser(
@@ -71,6 +71,13 @@ export const addSsoSupport = async (ctx: Ctx<AddSSoUserRequest>) => {
       userByEmail.userId,
       userByEmail.tenantId
     )
+    // Need to get the _rev of the user doc to update
+    const userById = await platform.users.getUserDoc(userByEmail.userId)
+    await platform.users.updateUserDoc({
+      ...userById,
+      email,
+      ssoId,
+    })
     ctx.status = 200
   } catch (err: any) {
     ctx.throw(err.status || 400, err)
@@ -268,7 +275,7 @@ export const find = async (ctx: any) => {
 
 export const tenantUserLookup = async (ctx: any) => {
   const id = ctx.params.id
-  const user = await userSdk.core.getPlatformUser(id)
+  const user = await userSdk.core.getFirstPlatformUser(id)
   if (user) {
     ctx.body = user
   } else {
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
deleted file mode 100755
index a5a4fc0108..0000000000
--- a/scripts/bootstrap.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-if [ -d "packages/pro/src" ]; then
-  cd packages/pro
-
-  yarn
-  lerna bootstrap
-fi
\ No newline at end of file
diff --git a/scripts/build.js b/scripts/build.js
index 4383950f88..93a2a1e589 100755
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -51,20 +51,6 @@ async function runBuild(entry, outfile) {
     fs.readFileSync(tsconfig, "utf-8")
   )
 
-  if (
-    !fs.existsSync(path.join(__dirname, "../packages/pro/src")) &&
-    tsconfigPathPluginContent.compilerOptions?.paths
-  ) {
-    // If we don't have pro, we cannot bundle backend-core.
-    // Otherwise, the main context will not be shared between libraries
-    delete tsconfigPathPluginContent?.compilerOptions?.paths?.[
-      "@budibase/backend-core"
-    ]
-    delete tsconfigPathPluginContent?.compilerOptions?.paths?.[
-      "@budibase/backend-core/*"
-    ]
-  }
-
   const sharedConfig = {
     entryPoints: [entry],
     bundle: true,
@@ -75,7 +61,7 @@ async function runBuild(entry, outfile) {
       svelteCompilePlugin,
       TsconfigPathsPlugin({ tsconfig: tsconfigPathPluginContent }),
       nodeExternalsPlugin({
-        allowList: ["@budibase/frontend-core", "svelte"],
+        allowList: ["@budibase/frontend-core", "@budibase/pro", "svelte"],
       }),
     ],
     preserveSymlinks: true,
diff --git a/scripts/devDocker.sh b/scripts/devDocker.sh
index e25819d514..3c327c0b21 100755
--- a/scripts/devDocker.sh
+++ b/scripts/devDocker.sh
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-# Check if the pro submodule is loaded
-if [ ! -d "./packages/pro/src" ]; then
-  echo "[ERROR] Submodule is not loaded. This is only allowed with loaded submodules."
-  exit 1
-fi
-
 yarn build:apps
 docker compose -f hosting/docker-compose.build.yaml -f hosting/docker-compose.dev.yaml --env-file hosting/.env up --build --scale proxy-service=0
 
diff --git a/yarn.lock b/yarn.lock
index d43d77f6f5..d99c8ec30f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8005,7 +8005,20 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
-chai@^4.3.10, chai@^4.3.7:
+chai@^4.3.10:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.5.0.tgz#707e49923afdd9b13a8b0b47d33d732d13812fd8"
+  integrity sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==
+  dependencies:
+    assertion-error "^1.1.0"
+    check-error "^1.0.3"
+    deep-eql "^4.1.3"
+    get-func-name "^2.0.2"
+    loupe "^2.3.6"
+    pathval "^1.1.1"
+    type-detect "^4.1.0"
+
+chai@^4.3.7:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/chai/-/chai-4.4.1.tgz#3603fa6eba35425b0f2ac91a009fe924106e50d1"
   integrity sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==
@@ -10319,10 +10332,10 @@ es6-promise@^4.2.4:
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
   integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
-esbuild-node-externals@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/esbuild-node-externals/-/esbuild-node-externals-1.8.0.tgz#878fbe458d4e58337753c2eacfd7200dc1077bd1"
-  integrity sha512-pYslmT8Bl383UnfxzHQQRpCgBNIOwAzDaYheuIeI4CODxelsN/eQroVn5STDow5QOpRalMgWUR+R8LfSgUROcw==
+esbuild-node-externals@^1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/esbuild-node-externals/-/esbuild-node-externals-1.14.0.tgz#fc2950c67a068dc2b538fd1381ad7d8e20a6f54d"
+  integrity sha512-jMWnTlCII3cLEjR5+u0JRSTJuP+MgbjEHKfwSIAI41NgLQ0ZjfzjchlbEn0r7v2u5gCBMSEYvYlkO7GDG8gG3A==
   dependencies:
     find-up "^5.0.0"
     tslib "^2.4.1"
@@ -21204,6 +21217,11 @@ type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.8:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
+type-detect@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.1.0.tgz#deb2453e8f08dcae7ae98c626b13dddb0155906c"
+  integrity sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==
+
 type-fest@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"