diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 1a2e74f863..d095e3c2a4 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -56,7 +56,6 @@ jobs:
         run: yarn install:pro $BRANCH $BASE_BRANCH
       - run: yarn
       - run: yarn bootstrap
-      - run: yarn build:client
       - run: yarn test
       - uses: codecov/codecov-action@v3
         with:
@@ -78,28 +77,28 @@ jobs:
       - run: yarn bootstrap
       - run: yarn test:pro
 
-  integration-test:
-    runs-on: ubuntu-latest
-    services:
-      couchdb:
-        image: ibmcom/couchdb3
-        env:
-          COUCHDB_PASSWORD: budibase
-          COUCHDB_USER: budibase
-        ports:
-          - 4567:5984
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 14.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 14.x
-      - name: Install Pro
-        run: yarn install:pro $BRANCH $BASE_BRANCH
-      - run: yarn
-      - run: yarn bootstrap
-      - run: yarn build
-      - run: |
-          cd qa-core
-          yarn
-          yarn api:test:ci
+#  integration-test:
+#    runs-on: ubuntu-latest
+#    services:
+#      couchdb:
+#        image: ibmcom/couchdb3
+#        env:
+#          COUCHDB_PASSWORD: budibase
+#          COUCHDB_USER: budibase
+#        ports:
+#          - 4567:5984
+#    steps:
+#      - uses: actions/checkout@v2
+#      - name: Use Node.js 14.x
+#        uses: actions/setup-node@v1
+#        with:
+#          node-version: 14.x
+#      - name: Install Pro
+#        run: yarn install:pro $BRANCH $BASE_BRANCH
+#      - run: yarn
+#      - run: yarn bootstrap
+#      - run: yarn build
+#      - run: |
+#          cd qa-core
+#          yarn
+#          yarn api:test:ci
diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml
index a1eee2c465..57e2504ded 100644
--- a/.github/workflows/deploy-preprod.yml
+++ b/.github/workflows/deploy-preprod.yml
@@ -17,6 +17,7 @@ jobs:
         id: version
         run: |
           if [ -z "${{ github.event.inputs.version }}" ]; then
+            git pull
             release_version=$(cat lerna.json | jq -r '.version')
           else
             release_version=${{ github.event.inputs.version }}
diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml
index 20a48f5802..41af142bfc 100644
--- a/.github/workflows/release-master.yml
+++ b/.github/workflows/release-master.yml
@@ -134,6 +134,7 @@ jobs:
       - name: Get the latest budibase release version
         id: version
         run: |
+          git pull
           release_version=$(cat lerna.json | jq -r '.version')
           echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
 
diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index 9ff7dc1ddc..df4070806f 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -212,11 +212,24 @@ spec:
         image: budibase/apps:{{ .Values.globals.appVersion }}
         imagePullPolicy: Always
         livenessProbe:
+          httpGet:
+            path: /health
+            port: {{ .Values.services.apps.port }}
+          initialDelaySeconds: 10
+          periodSeconds: 5
+          successThreshold: 1
+          failureThreshold: 3
+          timeoutSeconds: 3
+        readinessProbe:
           httpGet:
             path: /health
             port: {{ .Values.services.apps.port }}
           initialDelaySeconds: 5
           periodSeconds: 5
+          successThreshold: 1
+          failureThreshold: 3
+          timeoutSeconds: 3
+
         name: bbapps
         ports:
         - containerPort: {{ .Values.services.apps.port }}
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index f998e5dfb9..f48d19689b 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -202,11 +202,23 @@ spec:
         image: budibase/worker:{{ .Values.globals.appVersion }}
         imagePullPolicy: Always
         livenessProbe:
+          httpGet:
+            path: /health
+            port: {{ .Values.services.worker.port }}
+          initialDelaySeconds: 10
+          periodSeconds: 5
+          successThreshold: 1
+          failureThreshold: 3
+          timeoutSeconds: 3
+        readinessProbe:
           httpGet:
             path: /health
             port: {{ .Values.services.worker.port }}
           initialDelaySeconds: 5
           periodSeconds: 5
+          successThreshold: 1
+          failureThreshold: 3
+          timeoutSeconds: 3
         name: bbworker
         ports:
         - containerPort: {{ .Values.services.worker.port }}
diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml
index ed4ff014a9..ccbbf9878e 100644
--- a/charts/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@@ -343,6 +343,7 @@ couchdb:
 
   ## Configure liveness and readiness probe values
   ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
+  # FOR COUCHDB
   livenessProbe:
     enabled: true
     failureThreshold: 3
diff --git a/lerna.json b/lerna.json
index 7575b73237..7db5c851c2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.4.27-alpha.8",
+  "version": "2.4.43",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/package.json b/package.json
index 592d389dec..1ae713f96c 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,6 @@
     "setup": "node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev",
     "bootstrap": "lerna bootstrap && lerna link && ./scripts/link-dependencies.sh",
     "build": "lerna run build",
-    "build:client": "lerna run build --ignore @budibase/backend-core --ignore @budibase/worker --ignore @budibase/server --ignore @budibase/builder --ignore @budibase/cli --ignore @budibase/sdk",
     "build:dev": "lerna run prebuild && tsc --build --watch --preserveWatchOutput",
     "build:backend": "lerna run build --ignore @budibase/client --ignore @budibase/bbui --ignore @budibase/builder --ignore @budibase/cli",
     "build:sdk": "lerna run build:sdk",
@@ -45,7 +44,7 @@
     "dev": "yarn run kill-all && lerna link && lerna run --parallel dev:builder --concurrency 1",
     "dev:noserver": "yarn run kill-builder && lerna link && lerna run dev:stack:up && lerna run --parallel dev:builder --concurrency 1 --ignore @budibase/backend-core --ignore @budibase/server --ignore @budibase/worker",
     "dev:server": "yarn run kill-server && lerna run --parallel dev:builder --concurrency 1 --scope @budibase/backend-core --scope @budibase/worker --scope @budibase/server",
-    "test": "lerna run test",
+    "test": "lerna run test --stream",
     "test:pro": "bash scripts/pro/test.sh",
     "lint:eslint": "eslint packages && eslint qa-core",
     "lint:prettier": "prettier --check \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\" && prettier --check \"qa-core/**/*.{js,ts,svelte}\"",
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index af82a2dad8..fcc5acd8d3 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.4.27-alpha.8",
+  "version": "2.4.43",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.4.27-alpha.8",
+    "@budibase/types": "^2.4.43",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/backend-core/scripts/test.sh b/packages/backend-core/scripts/test.sh
index 2965134399..3d8240e65a 100644
--- a/packages/backend-core/scripts/test.sh
+++ b/packages/backend-core/scripts/test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 if [[ -n $CI ]]
 then
@@ -7,6 +8,6 @@ then
   jest --coverage --runInBand --forceExit
 else
   # --maxWorkers performs better in development
-  echo "jest --coverage"
-  jest --coverage
-fi
+  echo "jest --coverage --forceExit"
+  jest --coverage --forceExit
+fi
\ No newline at end of file
diff --git a/packages/backend-core/src/auth/auth.ts b/packages/backend-core/src/auth/auth.ts
index 26c7cd4e26..fb2fd2cf51 100644
--- a/packages/backend-core/src/auth/auth.ts
+++ b/packages/backend-core/src/auth/auth.ts
@@ -199,7 +199,6 @@ export async function platformLogout(opts: PlatformLogoutOpts) {
   } else {
     // clear cookies
     clearCookie(ctx, Cookie.Auth)
-    clearCookie(ctx, Cookie.CurrentApp)
   }
 
   const sessionIds = sessions.map(({ sessionId }) => sessionId)
diff --git a/packages/backend-core/src/blacklist/blacklist.ts b/packages/backend-core/src/blacklist/blacklist.ts
new file mode 100644
index 0000000000..1fbb4683f9
--- /dev/null
+++ b/packages/backend-core/src/blacklist/blacklist.ts
@@ -0,0 +1,54 @@
+import dns from "dns"
+import net from "net"
+import env from "../environment"
+import { promisify } from "util"
+
+let blackListArray: string[] | undefined
+const performLookup = promisify(dns.lookup)
+
+async function lookup(address: string): Promise<string[]> {
+  if (!net.isIP(address)) {
+    // need this for URL parsing simply
+    if (!address.startsWith("http")) {
+      address = `https://${address}`
+    }
+    address = new URL(address).hostname
+  }
+  const addresses = await performLookup(address, {
+    all: true,
+  })
+  return addresses.map(addr => addr.address)
+}
+
+export async function refreshBlacklist() {
+  const blacklist = env.BLACKLIST_IPS
+  const list = blacklist?.split(",") || []
+  let final: string[] = []
+  for (let addr of list) {
+    const trimmed = addr.trim()
+    if (!net.isIP(trimmed)) {
+      const addresses = await lookup(trimmed)
+      final = final.concat(addresses)
+    } else {
+      final.push(trimmed)
+    }
+  }
+  blackListArray = final
+}
+
+export async function isBlacklisted(address: string): Promise<boolean> {
+  if (!blackListArray) {
+    await refreshBlacklist()
+  }
+  if (blackListArray?.length === 0) {
+    return false
+  }
+  // no need for DNS
+  let ips: string[]
+  if (!net.isIP(address)) {
+    ips = await lookup(address)
+  } else {
+    ips = [address]
+  }
+  return !!blackListArray?.find(addr => ips.includes(addr))
+}
diff --git a/packages/backend-core/src/blacklist/index.ts b/packages/backend-core/src/blacklist/index.ts
new file mode 100644
index 0000000000..b5123eed3e
--- /dev/null
+++ b/packages/backend-core/src/blacklist/index.ts
@@ -0,0 +1 @@
+export * from "./blacklist"
diff --git a/packages/backend-core/src/blacklist/tests/blacklist.spec.ts b/packages/backend-core/src/blacklist/tests/blacklist.spec.ts
new file mode 100644
index 0000000000..23a8dd1454
--- /dev/null
+++ b/packages/backend-core/src/blacklist/tests/blacklist.spec.ts
@@ -0,0 +1,46 @@
+import { refreshBlacklist, isBlacklisted } from ".."
+import env from "../../environment"
+
+describe("blacklist", () => {
+  beforeAll(async () => {
+    env._set(
+      "BLACKLIST_IPS",
+      "www.google.com,192.168.1.1, 1.1.1.1,2.2.2.2/something"
+    )
+    await refreshBlacklist()
+  })
+
+  it("should blacklist 192.168.1.1", async () => {
+    expect(await isBlacklisted("192.168.1.1")).toBe(true)
+  })
+
+  it("should allow 192.168.1.2", async () => {
+    expect(await isBlacklisted("192.168.1.2")).toBe(false)
+  })
+
+  it("should blacklist www.google.com", async () => {
+    expect(await isBlacklisted("www.google.com")).toBe(true)
+  })
+
+  it("should handle a complex domain", async () => {
+    expect(
+      await isBlacklisted("https://www.google.com/derp/?something=1")
+    ).toBe(true)
+  })
+
+  it("should allow www.microsoft.com", async () => {
+    expect(await isBlacklisted("www.microsoft.com")).toBe(false)
+  })
+
+  it("should blacklist an IP that needed trimming", async () => {
+    expect(await isBlacklisted("1.1.1.1")).toBe(true)
+  })
+
+  it("should blacklist 1.1.1.1/something", async () => {
+    expect(await isBlacklisted("1.1.1.1/something")).toBe(true)
+  })
+
+  it("should blacklist 2.2.2.2", async () => {
+    expect(await isBlacklisted("2.2.2.2")).toBe(true)
+  })
+})
diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts
index b461497747..c279babb71 100644
--- a/packages/backend-core/src/configs/configs.ts
+++ b/packages/backend-core/src/configs/configs.ts
@@ -32,8 +32,7 @@ export async function getConfig<T extends Config>(
   const db = context.getGlobalDB()
   try {
     // await to catch error
-    const config = (await db.get(generateConfigID(type))) as T
-    return config
+    return (await db.get(generateConfigID(type))) as T
   } catch (e: any) {
     if (e.status === 404) {
       return
diff --git a/packages/backend-core/src/configs/tests/configs.spec.ts b/packages/backend-core/src/configs/tests/configs.spec.ts
index 079f2ab681..45e56a2581 100644
--- a/packages/backend-core/src/configs/tests/configs.spec.ts
+++ b/packages/backend-core/src/configs/tests/configs.spec.ts
@@ -1,4 +1,9 @@
-import { DBTestConfiguration, generator, testEnv } from "../../../tests"
+import {
+  DBTestConfiguration,
+  generator,
+  testEnv,
+  structures,
+} from "../../../tests"
 import { ConfigType } from "@budibase/types"
 import env from "../../environment"
 import * as configs from "../configs"
@@ -113,4 +118,71 @@ describe("configs", () => {
       })
     })
   })
+
+  describe("getGoogleDatasourceConfig", () => {
+    function setEnvVars() {
+      env.GOOGLE_CLIENT_SECRET = "test"
+      env.GOOGLE_CLIENT_ID = "test"
+    }
+
+    function unsetEnvVars() {
+      env.GOOGLE_CLIENT_SECRET = undefined
+      env.GOOGLE_CLIENT_ID = undefined
+    }
+
+    describe("cloud", () => {
+      beforeEach(() => {
+        testEnv.cloudHosted()
+      })
+
+      it("returns from env vars", async () => {
+        await config.doInTenant(async () => {
+          setEnvVars()
+          const config = await configs.getGoogleDatasourceConfig()
+          unsetEnvVars()
+
+          expect(config).toEqual({
+            activated: true,
+            clientID: "test",
+            clientSecret: "test",
+          })
+        })
+      })
+
+      it("returns undefined when no env vars are configured", async () => {
+        await config.doInTenant(async () => {
+          const config = await configs.getGoogleDatasourceConfig()
+          expect(config).toBeUndefined()
+        })
+      })
+    })
+
+    describe("self host", () => {
+      beforeEach(() => {
+        testEnv.selfHosted()
+      })
+
+      it("returns from config", async () => {
+        await config.doInTenant(async () => {
+          const googleDoc = structures.sso.googleConfigDoc()
+          await configs.save(googleDoc)
+          const config = await configs.getGoogleDatasourceConfig()
+          expect(config).toEqual(googleDoc.config)
+        })
+      })
+
+      it("falls back to env vars when config is disabled", async () => {
+        await config.doInTenant(async () => {
+          setEnvVars()
+          const config = await configs.getGoogleDatasourceConfig()
+          unsetEnvVars()
+          expect(config).toEqual({
+            activated: true,
+            clientID: "test",
+            clientSecret: "test",
+          })
+        })
+      })
+    })
+  })
 })
diff --git a/packages/backend-core/src/constants/misc.ts b/packages/backend-core/src/constants/misc.ts
index e25c90575f..15cec7a6b9 100644
--- a/packages/backend-core/src/constants/misc.ts
+++ b/packages/backend-core/src/constants/misc.ts
@@ -4,7 +4,6 @@ export enum UserStatus {
 }
 
 export enum Cookie {
-  CurrentApp = "budibase:currentapp",
   Auth = "budibase:auth",
   Init = "budibase:init",
   ACCOUNT_RETURN_URL = "budibase:account:returnurl",
diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index f1c96c7fec..5718494fc4 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -104,6 +104,7 @@ const environment = {
   SMTP_PORT: parseInt(process.env.SMTP_PORT || ""),
   SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
   DISABLE_JWT_WARNING: process.env.DISABLE_JWT_WARNING,
+  BLACKLIST_IPS: process.env.BLACKLIST_IPS,
   /**
    * Enable to allow an admin user to login using a password.
    * This can be useful to prevent lockout when configuring SSO.
diff --git a/packages/backend-core/src/index.ts b/packages/backend-core/src/index.ts
index a6d5423756..30072196ba 100644
--- a/packages/backend-core/src/index.ts
+++ b/packages/backend-core/src/index.ts
@@ -26,6 +26,7 @@ export * as utils from "./utils"
 export * as errors from "./errors"
 export * as timers from "./timers"
 export { default as env } from "./environment"
+export * as blacklist from "./blacklist"
 export { SearchParams } from "./db"
 // Add context to tenancy for backwards compatibility
 // only do this for external usages to prevent internal
diff --git a/packages/backend-core/src/middleware/passport/datasource/google.ts b/packages/backend-core/src/middleware/passport/datasource/google.ts
index 32451cb8d2..6fd4e9ff32 100644
--- a/packages/backend-core/src/middleware/passport/datasource/google.ts
+++ b/packages/backend-core/src/middleware/passport/datasource/google.ts
@@ -78,17 +78,23 @@ export async function postAuth(
     ),
     { successRedirect: "/", failureRedirect: "/error" },
     async (err: any, tokens: string[]) => {
+      const baseUrl = `/builder/app/${authStateCookie.appId}/data`
       // update the DB for the datasource with all the user info
       await doWithDB(authStateCookie.appId, async (db: Database) => {
-        const datasource = await db.get(authStateCookie.datasourceId)
+        let datasource
+        try {
+          datasource = await db.get(authStateCookie.datasourceId)
+        } catch (err: any) {
+          if (err.status === 404) {
+            ctx.redirect(baseUrl)
+          }
+        }
         if (!datasource.config) {
           datasource.config = {}
         }
         datasource.config.auth = { type: "google", ...tokens }
         await db.put(datasource)
-        ctx.redirect(
-          `/builder/app/${authStateCookie.appId}/data/datasource/${authStateCookie.datasourceId}`
-        )
+        ctx.redirect(`${baseUrl}/datasource/${authStateCookie.datasourceId}`)
       })
     }
   )(ctx, next)
diff --git a/packages/backend-core/tests/utilities/structures/index.ts b/packages/backend-core/tests/utilities/structures/index.ts
index ca77f476d0..ff2e5b147f 100644
--- a/packages/backend-core/tests/utilities/structures/index.ts
+++ b/packages/backend-core/tests/utilities/structures/index.ts
@@ -8,4 +8,5 @@ export * as plugins from "./plugins"
 export * as sso from "./sso"
 export * as tenant from "./tenants"
 export * as users from "./users"
+export * as userGroups from "./userGroups"
 export { generator } from "./generator"
diff --git a/packages/backend-core/tests/utilities/structures/sso.ts b/packages/backend-core/tests/utilities/structures/sso.ts
index 7413fa3c09..9da9c82223 100644
--- a/packages/backend-core/tests/utilities/structures/sso.ts
+++ b/packages/backend-core/tests/utilities/structures/sso.ts
@@ -1,4 +1,6 @@
 import {
+  ConfigType,
+  GoogleConfig,
   GoogleInnerConfig,
   JwtClaims,
   OAuth2,
@@ -10,10 +12,10 @@ import {
   User,
 } from "@budibase/types"
 import { generator } from "./generator"
-import { uuid, email } from "./common"
+import { email, uuid } from "./common"
 import * as shared from "./shared"
-import _ from "lodash"
 import { user } from "./shared"
+import _ from "lodash"
 
 export function OAuth(): OAuth2 {
   return {
@@ -107,3 +109,11 @@ export function googleConfig(): GoogleInnerConfig {
     clientSecret: generator.string(),
   }
 }
+
+export function googleConfigDoc(): GoogleConfig {
+  return {
+    _id: "config_google",
+    type: ConfigType.GOOGLE,
+    config: googleConfig(),
+  }
+}
diff --git a/packages/backend-core/tests/utilities/structures/userGroups.ts b/packages/backend-core/tests/utilities/structures/userGroups.ts
new file mode 100644
index 0000000000..4dc870a00a
--- /dev/null
+++ b/packages/backend-core/tests/utilities/structures/userGroups.ts
@@ -0,0 +1,10 @@
+import { UserGroup } from "@budibase/types"
+import { generator } from "./generator"
+
+export function userGroup(): UserGroup {
+  return {
+    name: generator.word(),
+    icon: generator.word(),
+    color: generator.word(),
+  }
+}
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 2e3a5cf3f2..c4cf512fce 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "2.4.27-alpha.8",
+  "version": "2.4.43",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "2.4.27-alpha.8",
-    "@budibase/string-templates": "2.4.27-alpha.8",
+    "@budibase/shared-core": "^2.4.43",
+    "@budibase/string-templates": "^2.4.43",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/bbui/src/Drawer/Drawer.svelte b/packages/bbui/src/Drawer/Drawer.svelte
index 43729cd794..932236bc0c 100644
--- a/packages/bbui/src/Drawer/Drawer.svelte
+++ b/packages/bbui/src/Drawer/Drawer.svelte
@@ -7,7 +7,7 @@
   export let title
   export let fillWidth
   export let left = "314px"
-  export let width = "calc(100% - 576px)"
+  export let width = "calc(100% - 626px)"
 
   let visible = false
 
diff --git a/packages/bbui/src/Form/Core/File.svelte b/packages/bbui/src/Form/Core/File.svelte
new file mode 100644
index 0000000000..618cccd941
--- /dev/null
+++ b/packages/bbui/src/Form/Core/File.svelte
@@ -0,0 +1,115 @@
+<script>
+  import ActionButton from "../../ActionButton/ActionButton.svelte"
+  import { uuid } from "../../helpers"
+  import Icon from "../../Icon/Icon.svelte"
+  import { createEventDispatcher } from "svelte"
+
+  export let value = null
+  export let title = "Upload file"
+  export let disabled = false
+  export let allowClear = null
+  export let extensions = null
+  export let handleFileTooLarge = null
+  export let fileSizeLimit = BYTES_IN_MB * 20
+  export let id = null
+  export let previewUrl = null
+
+  const fieldId = id || uuid()
+  const BYTES_IN_KB = 1000
+  const BYTES_IN_MB = 1000000
+
+  const dispatch = createEventDispatcher()
+
+  let fileInput
+
+  $: inputAccept = Array.isArray(extensions) ? extensions.join(",") : "*"
+
+  async function processFile(targetFile) {
+    if (handleFileTooLarge && targetFile?.size >= fileSizeLimit) {
+      handleFileTooLarge(targetFile)
+      return
+    }
+    dispatch("change", targetFile)
+  }
+
+  function handleFile(evt) {
+    processFile(evt.target.files[0])
+  }
+
+  function clearFile() {
+    dispatch("change", null)
+  }
+</script>
+
+<input
+  id={fieldId}
+  {disabled}
+  type="file"
+  accept={inputAccept}
+  bind:this={fileInput}
+  on:change={handleFile}
+/>
+
+<div class="field">
+  {#if value}
+    <div class="file-view">
+      {#if previewUrl}
+        <img class="preview" alt="" src={previewUrl} />
+      {/if}
+      <div class="filename">{value.name}</div>
+      {#if value.size}
+        <div class="filesize">
+          {#if value.size <= BYTES_IN_MB}
+            {`${value.size / BYTES_IN_KB} KB`}
+          {:else}
+            {`${value.size / BYTES_IN_MB} MB`}
+          {/if}
+        </div>
+      {/if}
+      {#if !disabled || (allowClear === true && disabled)}
+        <div class="delete-button" on:click={clearFile}>
+          <Icon name="Close" size="XS" />
+        </div>
+      {/if}
+    </div>
+  {/if}
+  <ActionButton {disabled} on:click={fileInput.click()}>{title}</ActionButton>
+</div>
+
+<style>
+  .field {
+    display: flex;
+    gap: var(--spacing-m);
+  }
+  .file-view {
+    display: flex;
+    gap: var(--spacing-l);
+    align-items: center;
+    border: 1px solid var(--spectrum-alias-border-color);
+    border-radius: var(--spectrum-global-dimension-size-50);
+    padding: 0px var(--spectrum-alias-item-padding-m);
+  }
+  input[type="file"] {
+    display: none;
+  }
+  .delete-button {
+    transition: all 0.3s;
+    margin-left: 10px;
+    display: flex;
+  }
+  .delete-button:hover {
+    cursor: pointer;
+    color: var(--red);
+  }
+  .filesize {
+    white-space: nowrap;
+  }
+  .filename {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+  .preview {
+    height: 1.5em;
+  }
+</style>
diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index af45c1d9ff..2fad886910 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -42,9 +42,13 @@
   }
 
   const getFieldText = (value, options, placeholder) => {
-    // Always use placeholder if no value
     if (value == null || value === "") {
-      return placeholder !== false ? "Choose an option" : ""
+      // Explicit false means use no placeholder and allow an empty fields
+      if (placeholder === false) {
+        return ""
+      }
+      // Otherwise we use the placeholder if possible
+      return placeholder || "Choose an option"
     }
 
     return getFieldAttribute(getOptionLabel, value, options)
diff --git a/packages/bbui/src/Form/Core/index.js b/packages/bbui/src/Form/Core/index.js
index 7c81cfd70b..b0edf52748 100644
--- a/packages/bbui/src/Form/Core/index.js
+++ b/packages/bbui/src/Form/Core/index.js
@@ -13,3 +13,4 @@ export { default as CoreDropzone } from "./Dropzone.svelte"
 export { default as CoreStepper } from "./Stepper.svelte"
 export { default as CoreRichTextField } from "./RichTextField.svelte"
 export { default as CoreSlider } from "./Slider.svelte"
+export { default as CoreFile } from "./File.svelte"
diff --git a/packages/bbui/src/Form/File.svelte b/packages/bbui/src/Form/File.svelte
new file mode 100644
index 0000000000..03cacea814
--- /dev/null
+++ b/packages/bbui/src/Form/File.svelte
@@ -0,0 +1,37 @@
+<script>
+  import Field from "./Field.svelte"
+  import { CoreFile } from "./Core"
+  import { createEventDispatcher } from "svelte"
+
+  export let label = null
+  export let labelPosition = "above"
+  export let disabled = false
+  export let allowClear = null
+  export let handleFileTooLarge = () => {}
+  export let previewUrl = null
+  export let extensions = null
+  export let error = null
+  export let title = null
+  export let value = null
+  export let tooltip = null
+
+  const dispatch = createEventDispatcher()
+  const onChange = e => {
+    value = e.detail
+    dispatch("change", e.detail)
+  }
+</script>
+
+<Field {label} {labelPosition} {error} {tooltip}>
+  <CoreFile
+    {error}
+    {disabled}
+    {allowClear}
+    {title}
+    {value}
+    {previewUrl}
+    {handleFileTooLarge}
+    {extensions}
+    on:change={onChange}
+  />
+</Field>
diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js
index 0c18156052..d26b938dd5 100644
--- a/packages/bbui/src/index.js
+++ b/packages/bbui/src/index.js
@@ -77,6 +77,7 @@ export { default as IconSideNav } from "./IconSideNav/IconSideNav.svelte"
 export { default as IconSideNavItem } from "./IconSideNav/IconSideNavItem.svelte"
 export { default as Slider } from "./Form/Slider.svelte"
 export { default as Accordion } from "./Accordion/Accordion.svelte"
+export { default as File } from "./Form/File.svelte"
 
 // Renderers
 export { default as BoldRenderer } from "./Table/BoldRenderer.svelte"
diff --git a/packages/builder/index.html b/packages/builder/index.html
index e3383cda39..96abc8e582 100644
--- a/packages/builder/index.html
+++ b/packages/builder/index.html
@@ -1,17 +1,17 @@
 <!doctype html>
 <html class="spectrum spectrum--medium spectrum--darkest" lang="en" dir="ltr">
+
 <head>
 	<meta charset='utf8'>
 	<meta name='viewport' content='width=device-width'>
 	<title>Budibase</title>
-	<link rel='icon' href='/src/favicon.png'>
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
-	<link
-		href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
-		rel="stylesheet"
-	/>
+	<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
+		rel="stylesheet" />
 </head>
+
 <body id="app">
 	<script type="module" src='/src/main.js'></script>
 </body>
+
 </html>
\ No newline at end of file
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 7dec7b4e5f..51bce9ab4a 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.4.27-alpha.8",
+  "version": "2.4.43",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,11 +58,11 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.4.27-alpha.8",
-    "@budibase/client": "2.4.27-alpha.8",
-    "@budibase/frontend-core": "2.4.27-alpha.8",
-    "@budibase/shared-core": "2.4.27-alpha.8",
-    "@budibase/string-templates": "2.4.27-alpha.8",
+    "@budibase/bbui": "^2.4.43",
+    "@budibase/client": "^2.4.43",
+    "@budibase/frontend-core": "^2.4.43",
+    "@budibase/shared-core": "^2.4.43",
+    "@budibase/string-templates": "^2.4.43",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/builder/src/builderStore/componentUtils.js b/packages/builder/src/builderStore/componentUtils.js
index a9425da742..16b972058e 100644
--- a/packages/builder/src/builderStore/componentUtils.js
+++ b/packages/builder/src/builderStore/componentUtils.js
@@ -163,7 +163,12 @@ export const getComponentSettings = componentType => {
     def.settings
       ?.filter(setting => setting.section)
       .forEach(section => {
-        settings = settings.concat(section.settings || [])
+        settings = settings.concat(
+          (section.settings || []).map(setting => ({
+            ...setting,
+            section: section.name,
+          }))
+        )
       })
   }
   componentSettingCache[componentType] = settings
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index 51f88add27..3fc0eb769e 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -22,6 +22,7 @@ import {
   findComponent,
   getComponentSettings,
   makeComponentUnique,
+  findComponentPath,
 } from "../componentUtils"
 import { Helpers } from "@budibase/bbui"
 import { Utils } from "@budibase/frontend-core"
@@ -30,7 +31,12 @@ import {
   DB_TYPE_INTERNAL,
   DB_TYPE_EXTERNAL,
 } from "constants/backend"
-import { getSchemaForDatasource } from "builderStore/dataBinding"
+import {
+  buildFormSchema,
+  getSchemaForDatasource,
+} from "builderStore/dataBinding"
+import { makePropSafe as safe } from "@budibase/string-templates"
+import { getComponentFieldOptions } from "helpers/formFields"
 
 const INITIAL_FRONTEND_STATE = {
   apps: [],
@@ -63,17 +69,19 @@ const INITIAL_FRONTEND_STATE = {
   customTheme: {},
   previewDevice: "desktop",
   highlightedSettingKey: null,
+  builderSidePanel: false,
 
   // URL params
   selectedScreenId: null,
   selectedComponentId: null,
   selectedLayoutId: null,
 
-  // onboarding
+  // Client state
+  selectedComponentInstance: null,
+
+  // Onboarding
   onboarding: false,
   tourNodes: null,
-
-  builderSidePanel: false,
 }
 
 export const getFrontendStore = () => {
@@ -262,22 +270,27 @@ export const getFrontendStore = () => {
         }
       },
       save: async screen => {
-        /*
-          Temporarily disabled to accomodate migration issues.
-          store.actions.screens.validate(screen)
-        */
-        const state = get(store)
+        // Validate screen structure
+        // Temporarily disabled to accommodate migration issues
+        // store.actions.screens.validate(screen)
+
+        // Check screen definition for any component settings which need updated
+        store.actions.screens.enrichEmptySettings(screen)
+
+        // Save screen
         const creatingNewScreen = screen._id === undefined
         const savedScreen = await API.saveScreen(screen)
         const routesResponse = await API.fetchAppRoutes()
-        let usedPlugins = state.usedPlugins
 
         // If plugins changed we need to fetch the latest app metadata
+        const state = get(store)
+        let usedPlugins = state.usedPlugins
         if (savedScreen.pluginAdded) {
           const { application } = await API.fetchAppPackage(state.appId)
           usedPlugins = application.usedPlugins || []
         }
 
+        // Update state
         store.update(state => {
           // Update screen object
           const idx = state.screens.findIndex(x => x._id === savedScreen._id)
@@ -298,7 +311,6 @@ export const getFrontendStore = () => {
 
           // Update used plugins
           state.usedPlugins = usedPlugins
-
           return state
         })
         return savedScreen
@@ -406,6 +418,17 @@ export const getFrontendStore = () => {
         }
         await store.actions.screens.patch(patch, screen._id)
       },
+      enrichEmptySettings: screen => {
+        // Flatten the recursive component tree
+        const components = findAllMatchingComponents(screen.props, x => x)
+
+        // Iterate over all components and run checks
+        components.forEach(component => {
+          store.actions.components.enrichEmptySettings(component, {
+            screen,
+          })
+        })
+      },
     },
     preview: {
       setDevice: device => {
@@ -493,65 +516,155 @@ export const getFrontendStore = () => {
         }
         return get(store).components[componentName]
       },
-      createInstance: (componentName, presetProps) => {
+      getDefaultDatasource: () => {
+        // Ignore users table
+        const validTables = get(tables).list.filter(x => x._id !== "ta_users")
+
+        // Try to use their own internal table first
+        let table = validTables.find(table => {
+          return (
+            table.sourceId !== BUDIBASE_INTERNAL_DB_ID &&
+            table.type === DB_TYPE_INTERNAL
+          )
+        })
+        if (table) {
+          return table
+        }
+
+        // Then try sample data
+        table = validTables.find(table => {
+          return (
+            table.sourceId === BUDIBASE_INTERNAL_DB_ID &&
+            table.type === DB_TYPE_INTERNAL
+          )
+        })
+        if (table) {
+          return table
+        }
+
+        // Finally try an external table
+        return validTables.find(table => table.type === DB_TYPE_EXTERNAL)
+      },
+      enrichEmptySettings: (component, opts) => {
+        if (!component?._component) {
+          return
+        }
+        const defaultDS = store.actions.components.getDefaultDatasource()
+        const settings = getComponentSettings(component._component)
+        const { parent, screen, useDefaultValues } = opts || {}
+        const treeId = parent?._id || component._id
+        if (!screen) {
+          return
+        }
+        settings.forEach(setting => {
+          const value = component[setting.key]
+
+          // Fill empty settings
+          if (value == null || value === "") {
+            if (setting.type === "multifield" && setting.selectAllFields) {
+              // Select all schema fields where required
+              component[setting.key] = Object.keys(defaultDS?.schema || {})
+            } else if (
+              (setting.type === "dataSource" || setting.type === "table") &&
+              defaultDS
+            ) {
+              // Select default datasource where required
+              component[setting.key] = {
+                label: defaultDS.name,
+                tableId: defaultDS._id,
+                type: "table",
+              }
+            } else if (setting.type === "dataProvider") {
+              // Pick closest data provider where required
+              const path = findComponentPath(screen.props, treeId)
+              const providers = path.filter(component =>
+                component._component?.endsWith("/dataprovider")
+              )
+              if (providers.length) {
+                const id = providers[providers.length - 1]?._id
+                component[setting.key] = `{{ literal ${safe(id)} }}`
+              }
+            } else if (setting.type.startsWith("field/")) {
+              // Autofill form field names
+              // Get all available field names in this form schema
+              let fieldOptions = getComponentFieldOptions(
+                screen.props,
+                treeId,
+                setting.type,
+                false
+              )
+
+              // Get all currently used fields
+              const form = findClosestMatchingComponent(
+                screen.props,
+                treeId,
+                x => x._component === "@budibase/standard-components/form"
+              )
+              const usedFields = Object.keys(buildFormSchema(form) || {})
+
+              // Filter out already used fields
+              fieldOptions = fieldOptions.filter(x => !usedFields.includes(x))
+
+              // Set field name and also assume we have a label setting
+              if (fieldOptions[0]) {
+                component[setting.key] = fieldOptions[0]
+                component.label = fieldOptions[0]
+              }
+            } else if (useDefaultValues && setting.defaultValue !== undefined) {
+              // Use default value where required
+              component[setting.key] = setting.defaultValue
+            }
+          }
+
+          // Validate non-empty settings
+          else {
+            if (setting.type === "dataProvider") {
+              // Validate data provider exists, or else clear it
+              const treeId = parent?._id || component._id
+              const path = findComponentPath(screen?.props, treeId)
+              const providers = path.filter(component =>
+                component._component?.endsWith("/dataprovider")
+              )
+              // Validate non-empty values
+              const valid = providers?.some(dp => value.includes?.(dp._id))
+              if (!valid) {
+                if (providers.length) {
+                  const id = providers[providers.length - 1]?._id
+                  component[setting.key] = `{{ literal ${safe(id)} }}`
+                } else {
+                  delete component[setting.key]
+                }
+              }
+            }
+          }
+        })
+      },
+      createInstance: (componentName, presetProps, parent) => {
         const definition = store.actions.components.getDefinition(componentName)
         if (!definition) {
           return null
         }
 
-        // Flattened settings
-        const settings = getComponentSettings(componentName)
-
-        let dataSourceField = settings.find(
-          setting => setting.type == "dataSource" || setting.type == "table"
-        )
-
-        let defaultDatasource
-        if (dataSourceField) {
-          const _tables = get(tables)
-          const filteredTables = _tables.list.filter(
-            table => table._id != "ta_users"
-          )
-
-          const internalTable = filteredTables.find(
-            table =>
-              table.sourceId === BUDIBASE_INTERNAL_DB_ID &&
-              table.type == DB_TYPE_INTERNAL
-          )
-
-          const defaultSourceTable = filteredTables.find(
-            table =>
-              table.sourceId !== BUDIBASE_INTERNAL_DB_ID &&
-              table.type == DB_TYPE_INTERNAL
-          )
-
-          const defaultExternalTable = filteredTables.find(
-            table => table.type == DB_TYPE_EXTERNAL
-          )
-
-          defaultDatasource =
-            defaultSourceTable || internalTable || defaultExternalTable
+        // Generate basic component structure
+        let instance = {
+          _id: Helpers.uuid(),
+          _component: definition.component,
+          _styles: {
+            normal: {},
+            hover: {},
+            active: {},
+          },
+          _instanceName: `New ${definition.friendlyName || definition.name}`,
+          ...presetProps,
         }
 
-        // Generate default props
-        let props = { ...presetProps }
-        settings.forEach(setting => {
-          if (setting.type === "multifield" && setting.selectAllFields) {
-            props[setting.key] = Object.keys(defaultDatasource.schema || {})
-          } else if (setting.defaultValue !== undefined) {
-            props[setting.key] = setting.defaultValue
-          }
+        // Enrich empty settings
+        store.actions.components.enrichEmptySettings(instance, {
+          parent,
+          screen: get(selectedScreen),
+          useDefaultValues: true,
         })
 
-        // Set a default datasource
-        if (dataSourceField && defaultDatasource) {
-          props[dataSourceField.key] = {
-            label: defaultDatasource.name,
-            tableId: defaultDatasource._id,
-            type: "table",
-          }
-        }
-
         // Add any extra properties the component needs
         let extras = {}
         if (definition.hasChildren) {
@@ -569,17 +682,8 @@ export const getFrontendStore = () => {
           extras.step = formSteps.length + 1
           extras._instanceName = `Step ${formSteps.length + 1}`
         }
-
         return {
-          _id: Helpers.uuid(),
-          _component: definition.component,
-          _styles: {
-            normal: {},
-            hover: {},
-            active: {},
-          },
-          _instanceName: `New ${definition.friendlyName || definition.name}`,
-          ...cloneDeep(props),
+          ...cloneDeep(instance),
           ...extras,
         }
       },
@@ -587,7 +691,8 @@ export const getFrontendStore = () => {
         const state = get(store)
         const componentInstance = store.actions.components.createInstance(
           componentName,
-          presetProps
+          presetProps,
+          parent
         )
         if (!componentInstance) {
           return
@@ -1123,6 +1228,52 @@ export const getFrontendStore = () => {
           })
         }
       },
+      addParent: async (componentId, parentType) => {
+        if (!componentId || !parentType) {
+          return
+        }
+
+        // Create new parent instance
+        const newParentDefinition = store.actions.components.createInstance(
+          parentType,
+          null,
+          parent
+        )
+        if (!newParentDefinition) {
+          return
+        }
+
+        // Replace component with a version wrapped in a new parent
+        await store.actions.screens.patch(screen => {
+          // Get this component definition and parent definition
+          let definition = findComponent(screen.props, componentId)
+          let oldParentDefinition = findComponentParent(
+            screen.props,
+            componentId
+          )
+          if (!definition || !oldParentDefinition) {
+            return false
+          }
+
+          // Replace component with parent
+          const index = oldParentDefinition._children.findIndex(
+            component => component._id === componentId
+          )
+          if (index === -1) {
+            return false
+          }
+          oldParentDefinition._children[index] = {
+            ...newParentDefinition,
+            _children: [definition],
+          }
+        })
+
+        // Select the new parent
+        store.update(state => {
+          state.selectedComponentId = newParentDefinition._id
+          return state
+        })
+      },
     },
     links: {
       save: async (url, title) => {
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index f47fb8a086..eb9c618c24 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -32,8 +32,8 @@
   import { getSchemaForTable } from "builderStore/dataBinding"
   import { Utils } from "@budibase/frontend-core"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"
-  import { cloneDeep } from "lodash/fp"
   import { onMount } from "svelte"
+  import { cloneDeep } from "lodash/fp"
 
   export let block
   export let testData
@@ -214,8 +214,6 @@
   function saveFilters(key) {
     const filters = LuceneUtils.buildLuceneQuery(tempFilters)
     const defKey = `${key}-def`
-    inputData[key] = filters
-    inputData[defKey] = tempFilters
     onChange({ detail: filters }, key)
     // need to store the builder definition in the automation
     onChange({ detail: tempFilters }, defKey)
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index c14455b7fc..1080fc7305 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -95,8 +95,11 @@
   }
 
   const onChange = (e, field, type) => {
-    value[field] = coerce(e.detail, type)
-    dispatch("change", value)
+    let newValue = {
+      ...value,
+      [field]: coerce(e.detail, type),
+    }
+    dispatch("change", newValue)
   }
 
   const onChangeSetting = (e, field) => {
diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte
index 162240e12c..0c5adfc18c 100644
--- a/packages/builder/src/components/backend/DataTable/DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte
@@ -136,6 +136,7 @@
   const onUpdateColumns = () => {
     selectedRows = []
     fetch.refresh()
+    tables.fetchTable(id)
   }
 
   // Fetch data whenever rows are modified. Unfortunately we have to lose
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
index 4622bd7b19..0cf92dde2b 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
@@ -5,18 +5,28 @@
 
   export let preAuthStep
   export let datasource
+  export let disabled
 
   $: tenantId = $auth.tenantId
 </script>
 
 <button
+  class:disabled
+  {disabled}
   on:click={async () => {
     let ds = datasource
+    let appId = $store.appId
     if (!ds) {
-      ds = await preAuthStep()
+      const resp = await preAuthStep()
+      if (resp.datasource && resp.appId) {
+        ds = resp.datasource
+        appId = resp.appId
+      } else {
+        ds = resp
+      }
     }
     window.open(
-      `/api/global/auth/${tenantId}/datasource/google?datasourceId=${ds._id}&appId=${$store.appId}`,
+      `/api/global/auth/${tenantId}/datasource/google?datasourceId=${ds._id}&appId=${appId}`,
       "_blank"
     )
   }}
@@ -26,6 +36,10 @@
 </button>
 
 <style>
+  .disabled {
+    opacity: 0.5;
+  }
+
   button {
     width: 195px;
     height: 40px;
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte
index c12ddab78d..de9ecce778 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte
@@ -12,7 +12,7 @@
 
   // kill the reference so the input isn't saved
   let datasource = cloneDeep(integration)
-  $: isGoogleConfigured = !!$organisation.google
+  $: isGoogleConfigured = !!$organisation.googleDatasourceConfigured
 
   onMount(async () => {
     await organisation.init()
diff --git a/packages/builder/src/components/design/Panel.svelte b/packages/builder/src/components/design/Panel.svelte
index 6c8753a99e..dbf42c51a5 100644
--- a/packages/builder/src/components/design/Panel.svelte
+++ b/packages/builder/src/components/design/Panel.svelte
@@ -3,7 +3,6 @@
 
   export let title
   export let icon
-  export let expandable = false
   export let showAddButton = false
   export let showBackButton = false
   export let showCloseButton = false
@@ -12,8 +11,8 @@
   export let onClickCloseButton
   export let borderLeft = false
   export let borderRight = false
+  export let wide = false
 
-  let wide = false
   $: customHeaderContent = $$slots["panel-header-content"]
 </script>
 
@@ -28,13 +27,6 @@
     <div class="title">
       <Heading size="XXS">{title || ""}</Heading>
     </div>
-    {#if expandable}
-      <Icon
-        name={wide ? "Minimize" : "Maximize"}
-        hoverable
-        on:click={() => (wide = !wide)}
-      />
-    {/if}
     {#if showAddButton}
       <div class="add-button" on:click={onClickAddButton}>
         <Icon name="Add" />
@@ -74,8 +66,8 @@
     border-right: var(--border-light);
   }
   .panel.wide {
-    width: 420px;
-    flex: 0 0 420px;
+    width: 310px;
+    flex: 0 0 310px;
   }
   .header {
     flex: 0 0 48px;
diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
index 098a8f7ed7..59340d4898 100644
--- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
@@ -27,7 +27,7 @@
     : enrichedSchemaFields?.map(field => field.name)
   $: sanitisedValue = getValidColumns(value, options)
   $: updateBoundValue(sanitisedValue)
-  $: enrichedSchemaFields = getFields(Object.values(schema) || [], {
+  $: enrichedSchemaFields = getFields(Object.values(schema || {}), {
     allowLinks: true,
   })
 
diff --git a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
index a5b7a08255..83255ec325 100644
--- a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
@@ -3,23 +3,13 @@
   import { makePropSafe } from "@budibase/string-templates"
   import { currentAsset, store } from "builderStore"
   import { findComponentPath } from "builderStore/componentUtils"
-  import { createEventDispatcher, onMount } from "svelte"
 
   export let value
 
-  const dispatch = createEventDispatcher()
   const getValue = component => `{{ literal ${makePropSafe(component._id)} }}`
 
   $: path = findComponentPath($currentAsset?.props, $store.selectedComponentId)
   $: providers = path.filter(c => c._component?.endsWith("/dataprovider"))
-
-  // Set initial value to closest data provider
-  onMount(() => {
-    const valid = value && providers.find(x => getValue(x) === value) != null
-    if (!valid && providers.length) {
-      dispatch("change", getValue(providers[providers.length - 1]))
-    }
-  })
 </script>
 
 <Select
diff --git a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
index b7b9f87bb4..7ed81cf3f2 100644
--- a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
@@ -1,43 +1,17 @@
 <script>
   import { Combobox } from "@budibase/bbui"
-  import {
-    getDatasourceForProvider,
-    getSchemaForDatasource,
-  } from "builderStore/dataBinding"
   import { currentAsset } from "builderStore"
-  import { findClosestMatchingComponent } from "builderStore/componentUtils"
+  import { getComponentFieldOptions } from "helpers/formFields"
 
   export let componentInstance
   export let value
   export let type
 
-  $: form = findClosestMatchingComponent(
+  $: options = getComponentFieldOptions(
     $currentAsset?.props,
-    componentInstance._id,
-    component => component._component === "@budibase/standard-components/form"
+    componentInstance?._id,
+    type
   )
-  $: datasource = getDatasourceForProvider($currentAsset, form)
-  $: schema = getSchemaForDatasource($currentAsset, datasource, {
-    formSchema: true,
-  }).schema
-  $: options = getOptions(schema, type)
-
-  const getOptions = (schema, type) => {
-    let entries = Object.entries(schema ?? {})
-    let types = []
-    if (type === "field/options" || type === "field/longform") {
-      // allow options and longform to be used on string fields as well
-      types = [type, "field/string"]
-    } else {
-      types = [type]
-    }
-
-    types = types.map(type => type.slice(type.indexOf("/") + 1))
-
-    entries = entries.filter(entry => types.includes(entry[1].type))
-
-    return entries.map(entry => entry[0])
-  }
 </script>
 
 <Combobox on:change {value} {options} />
diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
index ab448b850c..3fb3e13a94 100644
--- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
@@ -8,6 +8,7 @@
   import { onDestroy } from "svelte"
 
   export let label = ""
+  export let labelHidden = false
   export let componentInstance = {}
   export let control = null
   export let key = ""
@@ -74,11 +75,13 @@
   })
 </script>
 
-<div class="property-control" class:highlighted={highlighted && nullishValue}>
-  {#if type !== "boolean" && label}
-    <div class="label">
-      <Label>{label}</Label>
-    </div>
+<div
+  class="property-control"
+  class:wide={!label || labelHidden}
+  class:highlighted={highlighted && nullishValue}
+>
+  {#if label && !labelHidden}
+    <Label size="M">{label}</Label>
   {/if}
   <div id={`${key}-prop-control`} class="control">
     <svelte:component
@@ -90,7 +93,6 @@
       onChange={handleChange}
       bindings={allBindings}
       name={key}
-      text={label}
       {nested}
       {key}
       {type}
@@ -105,28 +107,34 @@
 <style>
   .property-control {
     position: relative;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-    align-items: stretch;
+    display: grid;
+    grid-template-columns: 90px 1fr;
+    align-items: center;
     transition: background 130ms ease-out, border-color 130ms ease-out;
     border-left: 4px solid transparent;
-    margin: -6px calc(-1 * var(--spacing-xl));
-    padding: 6px var(--spacing-xl) 6px calc(var(--spacing-xl) - 4px);
+    margin: 0 calc(-1 * var(--spacing-xl));
+    padding: 0 var(--spacing-xl) 0 calc(var(--spacing-xl) - 4px);
+    gap: 8px;
+  }
+  .property-control :global(.spectrum-FieldLabel) {
+    white-space: normal;
   }
   .property-control.highlighted {
     background: var(--spectrum-global-color-gray-300);
-    border-color: var(--spectrum-global-color-blue-400);
-  }
-  .label {
-    padding-bottom: var(--spectrum-global-dimension-size-65);
+    border-color: var(--spectrum-global-color-static-red-600);
   }
   .control {
     position: relative;
   }
+  .property-control.wide .control {
+    grid-column: 1 / -1;
+  }
   .text {
-    margin-top: var(--spectrum-global-dimension-size-65);
     font-size: var(--spectrum-global-dimension-font-size-75);
     color: var(--grey-6);
+    grid-column: 2 / 2;
+  }
+  .property-control.wide .text {
+    grid-column: 1 / -1;
   }
 </style>
diff --git a/packages/builder/src/helpers/formFields.js b/packages/builder/src/helpers/formFields.js
new file mode 100644
index 0000000000..eaf260a9b6
--- /dev/null
+++ b/packages/builder/src/helpers/formFields.js
@@ -0,0 +1,32 @@
+import { findClosestMatchingComponent } from "builderStore/componentUtils"
+import {
+  getDatasourceForProvider,
+  getSchemaForDatasource,
+} from "builderStore/dataBinding"
+
+export const getComponentFieldOptions = (asset, id, type, loose = true) => {
+  const form = findClosestMatchingComponent(
+    asset,
+    id,
+    component => component._component === "@budibase/standard-components/form"
+  )
+  const datasource = getDatasourceForProvider(asset, form)
+  const schema = getSchemaForDatasource(asset, datasource, {
+    formSchema: true,
+  }).schema
+
+  // Get valid types for this field
+  let types = [type]
+  if (loose) {
+    if (type === "field/options" || type === "field/longform") {
+      // Allow options and longform to be used on string fields as well
+      types = [type, "field/string"]
+    }
+  }
+  types = types.map(type => type.slice(type.indexOf("/") + 1))
+
+  // Find fields of valid types
+  return Object.entries(schema || {})
+    .filter(entry => types.includes(entry[1].type))
+    .map(entry => entry[0])
+}
diff --git a/packages/builder/src/pages/builder/Branding.svelte b/packages/builder/src/pages/builder/Branding.svelte
new file mode 100644
index 0000000000..142473abb8
--- /dev/null
+++ b/packages/builder/src/pages/builder/Branding.svelte
@@ -0,0 +1,32 @@
+<script>
+  import { organisation, auth } from "stores/portal"
+  import { onMount } from "svelte"
+
+  let loaded = false
+
+  $: platformTitleText = $organisation.platformTitle
+  $: platformTitle =
+    !$auth.user && platformTitleText ? platformTitleText : "Budibase"
+
+  $: faviconUrl = $organisation.faviconUrl || "https://i.imgur.com/Xhdt1YP.png"
+
+  onMount(async () => {
+    await organisation.init()
+    loaded = true
+  })
+</script>
+
+<!--
+  In order to update the org elements, an update will have to be made to clear them.
+-->
+
+<svelte:head>
+  <title>{platformTitle}</title>
+
+  {#if loaded && !$auth.user && faviconUrl}
+    <link rel="icon" href={faviconUrl} />
+  {:else}
+    <!-- A default must be set or the browser defaults to favicon.ico behaviour -->
+    <link rel="icon" href={"https://i.imgur.com/Xhdt1YP.png"} />
+  {/if}
+</svelte:head>
diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
index 8d604e8790..b216958045 100644
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@@ -4,29 +4,33 @@
   import { onMount } from "svelte"
   import { CookieUtils, Constants } from "@budibase/frontend-core"
   import { API } from "api"
+  import Branding from "./Branding.svelte"
 
   let loaded = false
 
   $: multiTenancyEnabled = $admin.multiTenancy
   $: hasAdminUser = $admin?.checklist?.adminUser?.checked
+  $: baseUrl = $admin?.baseUrl
   $: tenantSet = $auth.tenantSet
-  $: cloud = $admin.cloud
+  $: cloud = $admin?.cloud
   $: user = $auth.user
 
   $: useAccountPortal = cloud && !$admin.disableAccountPortal
 
   const validateTenantId = async () => {
     const host = window.location.host
-    if (host.includes("localhost:")) {
+    if (host.includes("localhost:") || !baseUrl) {
       // ignore local dev
       return
     }
 
-    // e.g. ['tenant', 'budibase', 'app'] vs ['budibase', 'app']
+    const mainHost = new URL(baseUrl).host
     let urlTenantId
-    const hostParts = host.split(".")
-    if (hostParts.length > 2) {
-      urlTenantId = hostParts[0]
+    // remove the main host part
+    const hostParts = host.split(mainHost).filter(part => part !== "")
+    // if there is a part left, it has to be the tenant ID subdomain
+    if (hostParts.length === 1) {
+      urlTenantId = hostParts[0].replace(/\./g, "")
     }
 
     if (user && user.tenantId) {
@@ -40,13 +44,15 @@
         return
       }
 
-      if (user.tenantId !== urlTenantId) {
+      if (urlTenantId && user.tenantId !== urlTenantId) {
         // user should not be here - play it safe and log them out
         try {
           await auth.logout()
           await auth.setOrganisation(null)
         } catch (error) {
-          // Swallow error and do nothing
+          console.error(
+            `Tenant mis-match - "${urlTenantId}" and "${user.tenantId}" - logout`
+          )
         }
       }
     } else {
@@ -73,7 +79,7 @@
       }
 
       // Validate tenant if in a multi-tenant env
-      if (useAccountPortal && multiTenancyEnabled) {
+      if (multiTenancyEnabled) {
         await validateTenantId()
       }
     } catch (error) {
@@ -146,6 +152,9 @@
   }
 </script>
 
+<!--Portal branding overrides -->
+<Branding />
+
 {#if loaded}
   <slot />
 {/if}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 9534df5f10..cf109d63b5 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -220,6 +220,9 @@
     } else if (type === "drop-new-component") {
       const { component, parent, index } = data
       await store.actions.components.create(component, null, parent, index)
+    } else if (type === "add-parent-component") {
+      const { componentId, parentType } = data
+      await store.actions.components.addParent(componentId, parentType)
     } else {
       console.warn(`Client sent unknown event type: ${type}`)
     }
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte
index 1e889ffe93..2ff605cc77 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte
@@ -37,7 +37,7 @@
 
 {#if $selectedComponent}
   {#key $selectedComponent._id}
-    <Panel {title} icon={componentDefinition?.icon} borderLeft>
+    <Panel {title} icon={componentDefinition?.icon} borderLeft wide>
       <span slot="panel-header-content">
         <div class="settings-tabs">
           {#each tabs as tab}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte
index 21bed847f5..8fa0af45ed 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte
@@ -117,49 +117,52 @@
 {#each sections as section, idx (section.name)}
   {#if section.visible}
     <DetailSummary name={section.name} collapsible={false}>
-      {#if idx === 0 && !componentInstance._component.endsWith("/layout") && !isScreen}
-        <PropertyControl
-          control={Input}
-          label="Name"
-          key="_instanceName"
-          value={componentInstance._instanceName}
-          onChange={val => updateSetting({ key: "_instanceName" }, val)}
-        />
-      {/if}
-      {#each section.settings as setting (setting.key)}
-        {#if setting.visible}
+      <div class="settings">
+        {#if idx === 0 && !componentInstance._component.endsWith("/layout") && !isScreen}
           <PropertyControl
-            type={setting.type}
-            control={getComponentForSetting(setting)}
-            label={setting.label}
-            key={setting.key}
-            value={componentInstance[setting.key]}
-            defaultValue={setting.defaultValue}
-            nested={setting.nested}
-            onChange={val => updateSetting(setting, val)}
-            highlighted={$store.highlightedSettingKey === setting.key}
-            info={setting.info}
-            props={{
-              // Generic settings
-              placeholder: setting.placeholder || null,
-
-              // Select settings
-              options: setting.options || [],
-
-              // Number fields
-              min: setting.min ?? null,
-              max: setting.max ?? null,
-            }}
-            {bindings}
-            {componentBindings}
-            {componentInstance}
-            {componentDefinition}
+            control={Input}
+            label="Name"
+            key="_instanceName"
+            value={componentInstance._instanceName}
+            onChange={val => updateSetting({ key: "_instanceName" }, val)}
           />
         {/if}
-      {/each}
-      {#if idx === 0 && componentDefinition?.component?.endsWith("/fieldgroup")}
-        <ResetFieldsButton {componentInstance} />
-      {/if}
+        {#each section.settings as setting (setting.key)}
+          {#if setting.visible}
+            <PropertyControl
+              type={setting.type}
+              control={getComponentForSetting(setting)}
+              label={setting.label}
+              labelHidden={setting.labelHidden}
+              key={setting.key}
+              value={componentInstance[setting.key]}
+              defaultValue={setting.defaultValue}
+              nested={setting.nested}
+              onChange={val => updateSetting(setting, val)}
+              highlighted={$store.highlightedSettingKey === setting.key}
+              info={setting.info}
+              props={{
+                // Generic settings
+                placeholder: setting.placeholder || null,
+
+                // Select settings
+                options: setting.options || [],
+
+                // Number fields
+                min: setting.min ?? null,
+                max: setting.max ?? null,
+              }}
+              {bindings}
+              {componentBindings}
+              {componentInstance}
+              {componentDefinition}
+            />
+          {/if}
+        {/each}
+        {#if idx === 0 && componentDefinition?.component?.endsWith("/fieldgroup")}
+          <ResetFieldsButton {componentInstance} />
+        {/if}
+      </div>
     </DetailSummary>
   {/if}
 {/each}
@@ -168,3 +171,13 @@
     <EjectBlockButton />
   </DetailSummary>
 {/if}
+
+<style>
+  .settings {
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: stretch;
+    gap: 8px;
+  }
+</style>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte
index 855c42173b..db6e66b87b 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte
@@ -62,7 +62,7 @@
     type: "text",
   })
   $: settingOptions = settings.map(setting => ({
-    label: setting.label,
+    label: makeLabel(setting),
     value: setting.key,
   }))
   $: conditions.forEach(link => {
@@ -71,6 +71,15 @@
     }
   })
 
+  const makeLabel = setting => {
+    const { section, label } = setting
+    if (section) {
+      return label ? `${section} - ${label}` : section
+    } else {
+      return label
+    }
+  }
+
   const getSettingDefinition = key => {
     return settings.find(setting => setting.key === key)
   }
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/DesignSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/DesignSection.svelte
index fa1a357f38..444ded7e1f 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/DesignSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/DesignSection.svelte
@@ -27,7 +27,6 @@
     <StyleSection
       {style}
       name={style.label}
-      columns={style.columns}
       properties={style.settings}
       {componentInstance}
       {bindings}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/StyleSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/StyleSection.svelte
index e34ea1019a..4bd9ba539b 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/StyleSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/StyleSection.svelte
@@ -4,7 +4,6 @@
   import { store } from "builderStore"
 
   export let name
-  export let columns
   export let properties
   export let componentInstance
   export let bindings = []
@@ -34,27 +33,27 @@
 </script>
 
 <DetailSummary collapsible={false} name={`${name}${changed ? " *" : ""}`}>
-  <div class="group-content" style="grid-template-columns: {columns || '1fr'}">
+  <div class="styles">
     {#each properties as prop (`${componentInstance._id}-${prop.key}-${prop.label}`)}
-      <div style="grid-column: {prop.column || 'auto'}">
-        <PropertyControl
-          label={`${prop.label}${hasPropChanged(style, prop) ? " *" : ""}`}
-          control={prop.control}
-          key={prop.key}
-          value={style[prop.key]}
-          onChange={val => updateStyle(prop.key, val)}
-          props={getControlProps(prop)}
-          {bindings}
-        />
-      </div>
+      <PropertyControl
+        label={`${prop.label}${hasPropChanged(style, prop) ? " *" : ""}`}
+        control={prop.control}
+        key={prop.key}
+        value={style[prop.key]}
+        onChange={val => updateStyle(prop.key, val)}
+        props={getControlProps(prop)}
+        {bindings}
+      />
     {/each}
   </div>
 </DetailSummary>
 
 <style>
-  .group-content {
-    display: grid;
+  .styles {
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
     align-items: stretch;
-    gap: var(--spacing-l);
+    gap: 8px;
   }
 </style>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/componentStyles.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/componentStyles.js
index d4912241b3..7c65b6e6ec 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/componentStyles.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/componentStyles.js
@@ -3,7 +3,6 @@ import ColorPicker from "components/design/settings/controls/ColorPicker.svelte"
 
 export const margin = {
   label: "Margin",
-  columns: "1fr 1fr",
   settings: [
     {
       label: "Top",
@@ -90,7 +89,6 @@ export const margin = {
 
 export const padding = {
   label: "Padding",
-  columns: "1fr 1fr",
   settings: [
     {
       label: "Top",
@@ -177,7 +175,6 @@ export const padding = {
 
 export const size = {
   label: "Size",
-  columns: "1fr 1fr",
   settings: [
     {
       label: "Width",
@@ -196,7 +193,6 @@ export const size = {
 
 export const background = {
   label: "Background",
-  columns: "auto 1fr",
   settings: [
     {
       label: "Color",
@@ -285,7 +281,6 @@ export const background = {
 
 export const border = {
   label: "Border",
-  columns: "1fr 1fr",
   settings: [
     {
       label: "Color",
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte
index 092e429515..6372ceeed0 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte
@@ -1,22 +1,13 @@
 <script>
   import Panel from "components/design/Panel.svelte"
   import { goto } from "@roxi/routify"
-  import {
-    Layout,
-    ActionGroup,
-    ActionButton,
-    Search,
-    Icon,
-    Body,
-    notifications,
-  } from "@budibase/bbui"
+  import { Layout, Search, Icon, Body, notifications } from "@budibase/bbui"
   import structure from "./componentStructure.json"
   import { store, selectedComponent, selectedScreen } from "builderStore"
   import { onMount } from "svelte"
   import { fly } from "svelte/transition"
   import { findComponentPath } from "builderStore/componentUtils"
 
-  let section = "components"
   let searchString
   let searchRef
   let selectedIndex
@@ -37,7 +28,6 @@
     allowedComponents,
     searchString
   )
-  $: blocks = enrichedStructure.find(x => x.name === "Blocks").children
   $: orderMap = createComponentOrderMap(componentList)
 
   const getAllowedComponents = (allComponents, screen, component) => {
@@ -127,6 +117,11 @@
       }
     })
 
+    // Swap blocks and plugins
+    let tmp = enrichedStructure[1]
+    enrichedStructure[1] = enrichedStructure[0]
+    enrichedStructure[0] = tmp
+
     return enrichedStructure
   }
 
@@ -137,11 +132,6 @@
       return []
     }
 
-    // Remove blocks if there is no search string
-    if (!search) {
-      structure = structure.filter(category => category.name !== "Blocks")
-    }
-
     // Return only items which match the search string
     let filteredStructure = []
     structure.forEach(category => {
@@ -225,6 +215,7 @@
     showCloseButton
     onClickCloseButton={() => $goto("../")}
     borderLeft
+    wide
   >
     <Layout paddingX="L" paddingY="XL" gap="S">
       <Search
@@ -233,64 +224,31 @@
         on:change={e => (searchString = e.detail)}
         bind:inputRef={searchRef}
       />
-      {#if !searchString}
-        <ActionGroup compact justified>
-          <ActionButton
-            fullWidth
-            selected={section === "components"}
-            on:click={() => (section = "components")}>Components</ActionButton
-          >
-          <ActionButton
-            fullWidth
-            selected={section === "blocks"}
-            on:click={() => (section = "blocks")}>Blocks</ActionButton
-          >
-        </ActionGroup>
-      {/if}
-      {#if searchString || section === "components"}
-        {#if filteredStructure.length}
-          {#each filteredStructure as category}
-            <Layout noPadding gap="XS">
-              <div class="category-label">{category.name}</div>
-              {#each category.children as component}
-                <div
-                  draggable="true"
-                  on:dragstart={() => onDragStart(component.component)}
-                  on:dragend={onDragEnd}
-                  class="component"
-                  class:selected={selectedIndex ===
-                    orderMap[component.component]}
-                  on:click={() => addComponent(component.component)}
-                  on:mouseover={() => (selectedIndex = null)}
-                  on:focus
-                >
-                  <Icon name={component.icon} />
-                  <Body size="XS">{component.name}</Body>
-                </div>
-              {/each}
-            </Layout>
-          {/each}
-        {:else}
-          <Body size="S">
-            There aren't any components matching the current filter
-          </Body>
-        {/if}
+      {#if filteredStructure.length}
+        {#each filteredStructure as category}
+          <Layout noPadding gap="XS">
+            <div class="category-label">{category.name}</div>
+            {#each category.children as component}
+              <div
+                draggable="true"
+                on:dragstart={() => onDragStart(component.component)}
+                on:dragend={onDragEnd}
+                class="component"
+                class:selected={selectedIndex === orderMap[component.component]}
+                on:click={() => addComponent(component.component)}
+                on:mouseover={() => (selectedIndex = null)}
+                on:focus
+              >
+                <Icon name={component.icon} />
+                <Body size="XS">{component.name}</Body>
+              </div>
+            {/each}
+          </Layout>
+        {/each}
       {:else}
-        <Body size="S">Blocks are collections of pre-built components</Body>
-        <Layout noPadding gap="XS">
-          {#each blocks as block}
-            <div
-              draggable="true"
-              class="component"
-              on:click={() => addComponent(block.component)}
-              on:dragstart={() => onDragStart(block.component)}
-              on:dragend={onDragEnd}
-            >
-              <Icon name={block.icon} />
-              <Body size="XS">{block.name}</Body>
-            </div>
-          {/each}
-        </Layout>
+        <Body size="S">
+          There aren't any components matching the current filter
+        </Body>
       {/if}
     </Layout>
   </Panel>
diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte
index 06e09e4fee..547c914621 100644
--- a/packages/builder/src/pages/builder/auth/login.svelte
+++ b/packages/builder/src/pages/builder/auth/login.svelte
@@ -30,7 +30,7 @@
   async function login() {
     form.validate()
     if (Object.keys(errors).length > 0) {
-      console.log("errors")
+      console.log("errors", errors)
       return
     }
     try {
@@ -64,99 +64,106 @@
 </script>
 
 <svelte:window on:keydown={handleKeydown} />
-
-<TestimonialPage>
-  <Layout gap="L" noPadding>
-    <Layout justifyItems="center" noPadding>
-      {#if loaded}
-        <img alt="logo" src={$organisation.logoUrl || Logo} />
-      {/if}
-      <Heading size="M">Log in to Budibase</Heading>
-    </Layout>
-    <Layout gap="S" noPadding>
-      {#if loaded && ($organisation.google || $organisation.oidc)}
-        <FancyForm>
-          <OIDCButton oidcIcon={$oidc.logo} oidcName={$oidc.name} />
-          <GoogleButton />
-        </FancyForm>
-      {/if}
+{#if loaded}
+  <TestimonialPage enabled={$organisation.testimonialsEnabled}>
+    <Layout gap="L" noPadding>
+      <Layout justifyItems="center" noPadding>
+        {#if loaded}
+          <img alt="logo" src={$organisation.logoUrl || Logo} />
+        {/if}
+        <Heading size="M">
+          {$organisation.loginHeading || "Log in to Budibase"}
+        </Heading>
+      </Layout>
+      <Layout gap="S" noPadding>
+        {#if loaded && ($organisation.google || $organisation.oidc)}
+          <FancyForm>
+            <OIDCButton oidcIcon={$oidc.logo} oidcName={$oidc.name} />
+            <GoogleButton />
+          </FancyForm>
+        {/if}
+        {#if !$organisation.isSSOEnforced}
+          <Divider />
+          <FancyForm bind:this={form}>
+            <FancyInput
+              label="Your work email"
+              value={formData.username}
+              on:change={e => {
+                formData = {
+                  ...formData,
+                  username: e.detail,
+                }
+              }}
+              validate={() => {
+                let fieldError = {
+                  username: !formData.username
+                    ? "Please enter a valid email"
+                    : undefined,
+                }
+                errors = handleError({ ...errors, ...fieldError })
+              }}
+              error={errors.username}
+            />
+            <FancyInput
+              label="Password"
+              value={formData.password}
+              type="password"
+              on:change={e => {
+                formData = {
+                  ...formData,
+                  password: e.detail,
+                }
+              }}
+              validate={() => {
+                let fieldError = {
+                  password: !formData.password
+                    ? "Please enter your password"
+                    : undefined,
+                }
+                errors = handleError({ ...errors, ...fieldError })
+              }}
+              error={errors.password}
+            />
+          </FancyForm>
+        {/if}
+      </Layout>
       {#if !$organisation.isSSOEnforced}
-        <Divider />
-        <FancyForm bind:this={form}>
-          <FancyInput
-            label="Your work email"
-            value={formData.username}
-            on:change={e => {
-              formData = {
-                ...formData,
-                username: e.detail,
-              }
-            }}
-            validate={() => {
-              let fieldError = {
-                username: !formData.username
-                  ? "Please enter a valid email"
-                  : undefined,
-              }
-              errors = handleError({ ...errors, ...fieldError })
-            }}
-            error={errors.username}
-          />
-          <FancyInput
-            label="Password"
-            value={formData.password}
-            type="password"
-            on:change={e => {
-              formData = {
-                ...formData,
-                password: e.detail,
-              }
-            }}
-            validate={() => {
-              let fieldError = {
-                password: !formData.password
-                  ? "Please enter your password"
-                  : undefined,
-              }
-              errors = handleError({ ...errors, ...fieldError })
-            }}
-            error={errors.password}
-          />
-        </FancyForm>
+        <Layout gap="XS" noPadding justifyItems="center">
+          <Button
+            size="L"
+            cta
+            disabled={Object.keys(errors).length > 0}
+            on:click={login}
+          >
+            {$organisation.loginButton || `Log in to ${company}`}
+          </Button>
+        </Layout>
+        <Layout gap="XS" noPadding justifyItems="center">
+          <div class="user-actions">
+            <ActionButton size="L" quiet on:click={() => $goto("./forgot")}>
+              Forgot password?
+            </ActionButton>
+          </div>
+        </Layout>
+      {/if}
+
+      {#if cloud}
+        <Body size="xs" textAlign="center">
+          By using Budibase Cloud
+          <br />
+          you are agreeing to our
+          <Link
+            href="https://budibase.com/eula"
+            target="_blank"
+            secondary={true}
+          >
+            License Agreement
+          </Link>
+        </Body>
       {/if}
     </Layout>
-    {#if !$organisation.isSSOEnforced}
-      <Layout gap="XS" noPadding justifyItems="center">
-        <Button
-          size="L"
-          cta
-          disabled={Object.keys(errors).length > 0}
-          on:click={login}
-        >
-          Log in to {company}
-        </Button>
-      </Layout>
-      <Layout gap="XS" noPadding justifyItems="center">
-        <div class="user-actions">
-          <ActionButton size="L" quiet on:click={() => $goto("./forgot")}>
-            Forgot password?
-          </ActionButton>
-        </div>
-      </Layout>
-    {/if}
-
-    {#if cloud}
-      <Body size="xs" textAlign="center">
-        By using Budibase Cloud
-        <br />
-        you are agreeing to our
-        <Link href="https://budibase.com/eula" target="_blank" secondary={true}>
-          License Agreement
-        </Link>
-      </Body>
-    {/if}
-  </Layout>
-</TestimonialPage>
+  </TestimonialPage>
+{/if}
 
 <style>
   .user-actions {
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte
index a5f0fc138d..333cfdb0c6 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte
@@ -1,12 +1,15 @@
 <script>
   import { Button, FancyForm, FancyInput, FancyCheckbox } from "@budibase/bbui"
+  import GoogleButton from "components/backend/DatasourceNavigator/_components/GoogleButton.svelte"
   import { capitalise } from "helpers/helpers"
   import PanelHeader from "./PanelHeader.svelte"
+  import { helpers } from "@budibase/shared-core"
 
   export let title = ""
   export let onBack = null
   export let onNext = () => {}
   export let fields = {}
+  export let type = ""
 
   let errors = {}
 
@@ -57,8 +60,9 @@
   }
 
   $: isValid = getIsValid(fields, errors, values)
+  $: isGoogle = helpers.isGoogleSheets(type)
 
-  const handleNext = () => {
+  const handleNext = async () => {
     const parsedValues = {}
 
     Object.entries(values).forEach(([name, value]) => {
@@ -69,7 +73,10 @@
       }
     })
 
-    return onNext(parsedValues)
+    if (isGoogle) {
+      parsedValues.isGoogle = isGoogle
+    }
+    return await onNext(parsedValues)
   }
 </script>
 
@@ -99,7 +106,11 @@
       {/each}
     </FancyForm>
   </div>
-  <Button cta disabled={!isValid} on:click={handleNext}>Connect</Button>
+  {#if isGoogle}
+    <GoogleButton disabled={!isValid} preAuthStep={handleNext} />
+  {:else}
+    <Button cta disabled={!isValid} on:click={handleNext}>Connect</Button>
+  {/if}
 </div>
 
 <style>
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
index 1fa64526da..8e018ae907 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
@@ -4,19 +4,20 @@
   import DataPanel from "./_components/DataPanel.svelte"
   import DatasourceConfigPanel from "./_components/DatasourceConfigPanel.svelte"
   import ExampleApp from "./_components/ExampleApp.svelte"
-  import { FancyButton, notifications, Modal } from "@budibase/bbui"
+  import { FancyButton, notifications, Modal, Body } from "@budibase/bbui"
   import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte"
   import { SplitPage } from "@budibase/frontend-core"
   import { API } from "api"
   import { store, automationStore } from "builderStore"
   import { saveDatasource } from "builderStore/datasource"
   import { integrations } from "stores/backend"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin, organisation } from "stores/portal"
   import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
   import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
   import createFromScratchScreen from "builderStore/store/screenTemplates/createFromScratchScreen"
   import { Roles } from "constants/backend"
   import Spinner from "components/common/Spinner.svelte"
+  import { helpers } from "@budibase/shared-core"
 
   let name = "My first app"
   let url = "my-first-app"
@@ -25,10 +26,11 @@
 
   let plusIntegrations = {}
   let integrationsLoading = true
-  $: getIntegrations()
   let creationLoading = false
-
   let uploadModal
+  let googleComplete = false
+
+  $: getIntegrations()
 
   const createApp = async useSampleData => {
     creationLoading = true
@@ -62,6 +64,7 @@
       await store.actions.screens.save(defaultScreenTemplate)
 
       appId = createdApp.instance._id
+      return createdApp
     } catch (e) {
       creationLoading = false
       throw e
@@ -74,6 +77,13 @@
       const newPlusIntegrations = {}
 
       Object.entries($integrations).forEach(([integrationType, schema]) => {
+        // google sheets not available in self-host
+        if (
+          helpers.isGoogleSheets(integrationType) &&
+          !$organisation.googleDatasourceConfigured
+        ) {
+          return
+        }
         if (schema?.plus) {
           newPlusIntegrations[integrationType] = schema
         }
@@ -92,12 +102,17 @@
     notifications.success(`App created successfully`)
   }
 
-  const handleCreateApp = async ({ datasourceConfig, useSampleData }) => {
+  const handleCreateApp = async ({
+    datasourceConfig,
+    useSampleData,
+    isGoogle,
+  }) => {
     try {
-      await createApp(useSampleData)
+      const app = await createApp(useSampleData)
 
+      let datasource
       if (datasourceConfig) {
-        await saveDatasource({
+        datasource = await saveDatasource({
           plus: true,
           auth: undefined,
           name: plusIntegrations[stage].friendlyName,
@@ -107,7 +122,14 @@
         })
       }
 
-      goToApp()
+      store.set()
+
+      if (isGoogle) {
+        googleComplete = true
+        return { datasource, appId: app.appId }
+      } else {
+        goToApp()
+      }
     } catch (e) {
       console.log(e)
       creationLoading = false
@@ -127,8 +149,15 @@
 <SplitPage>
   {#if stage === "name"}
     <NamePanel bind:name bind:url onNext={() => (stage = "data")} />
+  {:else if googleComplete}
+    <div class="centered">
+      <Body
+        >Please login to your Google account in the new tab which as opened to
+        continue.</Body
+      >
+    </div>
   {:else if integrationsLoading || creationLoading}
-    <div class="spinner">
+    <div class="centered">
       <Spinner />
     </div>
   {:else if stage === "data"}
@@ -174,8 +203,13 @@
     <DatasourceConfigPanel
       title={plusIntegrations[stage].friendlyName}
       fields={plusIntegrations[stage].datasource}
+      type={stage}
       onBack={() => (stage = "data")}
-      onNext={data => handleCreateApp({ datasourceConfig: data })}
+      onNext={data => {
+        const isGoogle = data.isGoogle
+        delete data.isGoogle
+        return handleCreateApp({ datasourceConfig: data, isGoogle })
+      }}
     />
   {:else}
     <p>There was an problem. Please refresh the page and try again.</p>
@@ -186,7 +220,7 @@
 </SplitPage>
 
 <style>
-  .spinner {
+  .centered {
     display: flex;
     justify-content: center;
     align-items: center;
diff --git a/packages/builder/src/pages/builder/portal/settings/branding.svelte b/packages/builder/src/pages/builder/portal/settings/branding.svelte
new file mode 100644
index 0000000000..2184280e89
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/settings/branding.svelte
@@ -0,0 +1,446 @@
+<script>
+  import {
+    Layout,
+    Heading,
+    Body,
+    Divider,
+    File,
+    notifications,
+    Tags,
+    Tag,
+    Button,
+    Toggle,
+    Input,
+    Label,
+    TextArea,
+  } from "@budibase/bbui"
+  import { auth, organisation, licensing, admin } from "stores/portal"
+  import { API } from "api"
+  import { onMount } from "svelte"
+  import { goto } from "@roxi/routify"
+
+  const imageExtensions = [
+    ".png",
+    ".tiff",
+    ".gif",
+    ".raw",
+    ".jpg",
+    ".jpeg",
+    ".svg",
+    ".bmp",
+    ".jfif",
+  ]
+
+  const faviconExtensions = [".png", ".ico", ".gif"]
+
+  let mounted = false
+  let saving = false
+
+  let logoFile = null
+  let logoPreview = null
+  let faviconFile = null
+  let faviconPreview = null
+
+  let config = {}
+  let updated = false
+
+  $: onConfigUpdate(config, mounted)
+  $: init = Object.keys(config).length > 0
+
+  $: isCloud = $admin.cloud
+  $: brandingEnabled = $licensing.brandingEnabled
+
+  const onConfigUpdate = () => {
+    if (!mounted || updated || !init) {
+      return
+    }
+    updated = true
+  }
+
+  $: logo = config.logoUrl
+    ? { url: config.logoUrl, type: "image", name: "Logo" }
+    : null
+
+  $: favicon = config.faviconUrl
+    ? { url: config.faviconUrl, type: "image", name: "Favicon" }
+    : null
+
+  const previewUrl = async localFile => {
+    if (!localFile) {
+      return Promise.resolve(null)
+    }
+
+    return new Promise(resolve => {
+      let reader = new FileReader()
+      try {
+        reader.onload = e => {
+          resolve({
+            result: e.target.result,
+          })
+        }
+        reader.readAsDataURL(localFile)
+      } catch (error) {
+        console.error(error)
+        resolve(null)
+      }
+    })
+  }
+
+  $: previewUrl(logoFile).then(response => {
+    if (response) {
+      logoPreview = response.result
+    }
+  })
+
+  $: previewUrl(faviconFile).then(response => {
+    if (response) {
+      faviconPreview = response.result
+    }
+  })
+
+  async function uploadLogo(file) {
+    let response = {}
+    try {
+      let data = new FormData()
+      data.append("file", file)
+      response = await API.uploadLogo(data)
+    } catch (error) {
+      notifications.error("Error uploading logo")
+    }
+    return response
+  }
+
+  async function uploadFavicon(file) {
+    let response = {}
+    try {
+      let data = new FormData()
+      data.append("file", file)
+      response = await API.uploadFavicon(data)
+    } catch (error) {
+      notifications.error("Error uploading favicon")
+    }
+    return response
+  }
+
+  async function saveConfig() {
+    saving = true
+
+    if (logoFile) {
+      const logoResp = await uploadLogo(logoFile)
+      if (logoResp.url) {
+        config = {
+          ...config,
+          logoUrl: logoResp.url,
+        }
+        logoFile = null
+        logoPreview = null
+      }
+    }
+
+    if (faviconFile) {
+      const faviconResp = await uploadFavicon(faviconFile)
+      if (faviconResp.url) {
+        config = {
+          ...config,
+          faviconUrl: faviconResp.url,
+        }
+        faviconFile = null
+        faviconPreview = null
+      }
+    }
+
+    // Trim
+    const userStrings = [
+      "metaTitle",
+      "platformTitle",
+      "loginButton",
+      "loginHeading",
+      "metaDescription",
+      "metaImageUrl",
+    ]
+
+    const trimmed = userStrings.reduce((acc, fieldName) => {
+      acc[fieldName] = config[fieldName] ? config[fieldName].trim() : undefined
+      return acc
+    }, {})
+
+    config = {
+      ...config,
+      ...trimmed,
+    }
+
+    try {
+      // Update settings
+      await organisation.save(config)
+      await organisation.init()
+      notifications.success("Branding settings updated")
+    } catch (e) {
+      console.error("Branding updated failed", e)
+      notifications.error("Branding updated failed")
+    }
+    updated = false
+    saving = false
+  }
+
+  onMount(async () => {
+    await organisation.init()
+
+    config = {
+      faviconUrl: $organisation.faviconUrl,
+      logoUrl: $organisation.logoUrl,
+      platformTitle: $organisation.platformTitle,
+      emailBrandingEnabled: $organisation.emailBrandingEnabled,
+      loginHeading: $organisation.loginHeading,
+      loginButton: $organisation.loginButton,
+      testimonialsEnabled: $organisation.testimonialsEnabled,
+      metaDescription: $organisation.metaDescription,
+      metaImageUrl: $organisation.metaImageUrl,
+      metaTitle: $organisation.metaTitle,
+    }
+    mounted = true
+  })
+</script>
+
+{#if $auth.isAdmin && mounted}
+  <Layout noPadding>
+    <Layout gap="XS" noPadding>
+      <div class="title">
+        <Heading size="M">Branding</Heading>
+        {#if !isCloud && !brandingEnabled}
+          <Tags>
+            <Tag icon="LockClosed">Business</Tag>
+          </Tags>
+        {/if}
+        {#if isCloud && !brandingEnabled}
+          <Tags>
+            <Tag icon="LockClosed">Pro</Tag>
+          </Tags>
+        {/if}
+      </div>
+      <Body>Remove all Budibase branding and use your own.</Body>
+    </Layout>
+    <Divider />
+    <div class="branding fields">
+      <div class="field">
+        <Label size="L">Logo</Label>
+        <File
+          title="Upload image"
+          handleFileTooLarge={() => {
+            notifications.warn("File too large. 20mb limit")
+          }}
+          extensions={imageExtensions}
+          previewUrl={logoPreview || logo?.url}
+          on:change={e => {
+            let clone = { ...config }
+            if (e.detail) {
+              logoFile = e.detail
+              logoPreview = null
+            } else {
+              logoFile = null
+              clone.logoUrl = ""
+            }
+            config = clone
+          }}
+          value={logoFile || logo}
+          disabled={!brandingEnabled || saving}
+          allowClear={true}
+        />
+      </div>
+
+      <div class="field">
+        <Label size="L">Favicon</Label>
+        <File
+          title="Upload image"
+          handleFileTooLarge={() => {
+            notifications.warn("File too large. 20mb limit")
+          }}
+          extensions={faviconExtensions}
+          previewUrl={faviconPreview || favicon?.url}
+          on:change={e => {
+            let clone = { ...config }
+            if (e.detail) {
+              faviconFile = e.detail
+              faviconPreview = null
+            } else {
+              clone.faviconUrl = ""
+            }
+            config = clone
+          }}
+          value={faviconFile || favicon}
+          disabled={!brandingEnabled || saving}
+          allowClear={true}
+        />
+      </div>
+      {#if !isCloud}
+        <div class="field">
+          <Label size="L">Title</Label>
+          <Input
+            on:change={e => {
+              let clone = { ...config }
+              clone.platformTitle = e.detail ? e.detail : ""
+              config = clone
+            }}
+            value={config.platformTitle || ""}
+            disabled={!brandingEnabled || saving}
+          />
+        </div>
+      {/if}
+      <div>
+        <Toggle
+          text={"Remove Budibase brand from emails"}
+          on:change={e => {
+            let clone = { ...config }
+            clone.emailBrandingEnabled = !e.detail
+            config = clone
+          }}
+          value={!config.emailBrandingEnabled}
+          disabled={!brandingEnabled || saving}
+        />
+      </div>
+    </div>
+
+    {#if !isCloud}
+      <Divider />
+      <Layout gap="XS" noPadding>
+        <Heading size="S">Login page</Heading>
+        <Body />
+      </Layout>
+      <div class="login">
+        <div class="fields">
+          <div class="field">
+            <Label size="L">Header</Label>
+            <Input
+              on:change={e => {
+                let clone = { ...config }
+                clone.loginHeading = e.detail ? e.detail : ""
+                config = clone
+              }}
+              value={config.loginHeading || ""}
+              disabled={!brandingEnabled || saving}
+            />
+          </div>
+
+          <div class="field">
+            <Label size="L">Button</Label>
+            <Input
+              on:change={e => {
+                let clone = { ...config }
+                clone.loginButton = e.detail ? e.detail : ""
+                config = clone
+              }}
+              value={config.loginButton || ""}
+              disabled={!brandingEnabled || saving}
+            />
+          </div>
+          <div>
+            <Toggle
+              text={"Remove customer testimonials"}
+              on:change={e => {
+                let clone = { ...config }
+                clone.testimonialsEnabled = !e.detail
+                config = clone
+              }}
+              value={!config.testimonialsEnabled}
+              disabled={!brandingEnabled || saving}
+            />
+          </div>
+        </div>
+      </div>
+    {/if}
+    <Divider />
+    <Layout gap="XS" noPadding>
+      <Heading size="S">Application previews</Heading>
+      <Body>Customise the meta tags on your app preview</Body>
+    </Layout>
+    <div class="app-previews">
+      <div class="fields">
+        <div class="field">
+          <Label size="L">Image URL</Label>
+          <Input
+            on:change={e => {
+              let clone = { ...config }
+              clone.metaImageUrl = e.detail ? e.detail : ""
+              config = clone
+            }}
+            value={config.metaImageUrl}
+            disabled={!brandingEnabled || saving}
+          />
+        </div>
+        <div class="field">
+          <Label size="L">Title</Label>
+          <Input
+            on:change={e => {
+              let clone = { ...config }
+              clone.metaTitle = e.detail ? e.detail : ""
+              config = clone
+            }}
+            value={config.metaTitle}
+            disabled={!brandingEnabled || saving}
+          />
+        </div>
+        <div class="field">
+          <Label size="L">Description</Label>
+          <TextArea
+            on:change={e => {
+              let clone = { ...config }
+              clone.metaDescription = e.detail ? e.detail : ""
+              config = clone
+            }}
+            value={config.metaDescription}
+            disabled={!brandingEnabled || saving}
+          />
+        </div>
+      </div>
+    </div>
+    <div class="buttons">
+      {#if !brandingEnabled}
+        <Button
+          on:click={() => {
+            if (isCloud && $auth?.user?.accountPortalAccess) {
+              window.open($admin.accountPortalUrl + "/portal/upgrade", "_blank")
+            } else if ($auth.isAdmin) {
+              $goto("/builder/portal/account/upgrade")
+            }
+          }}
+          secondary
+          disabled={saving}
+        >
+          Upgrade
+        </Button>
+      {/if}
+      <Button on:click={saveConfig} cta disabled={saving || !updated || !init}>
+        Save
+      </Button>
+    </div>
+  </Layout>
+{/if}
+
+<style>
+  .buttons {
+    display: flex;
+    gap: var(--spacing-m);
+  }
+  .title {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+    gap: var(--spacing-m);
+  }
+
+  .branding,
+  .login {
+    width: 70%;
+    max-width: 70%;
+  }
+  .fields {
+    display: grid;
+    grid-gap: var(--spacing-m);
+  }
+  .field {
+    display: grid;
+    grid-template-columns: 80px auto;
+    grid-gap: var(--spacing-l);
+    align-items: center;
+  }
+</style>
diff --git a/packages/builder/src/pages/builder/portal/settings/organisation.svelte b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
index bba046ce10..d2af329cb9 100644
--- a/packages/builder/src/pages/builder/portal/settings/organisation.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
@@ -7,12 +7,10 @@
     Divider,
     Label,
     Input,
-    Dropzone,
     notifications,
     Toggle,
   } from "@budibase/bbui"
   import { auth, organisation, admin } from "stores/portal"
-  import { API } from "api"
   import { writable } from "svelte/store"
   import { redirect } from "@roxi/routify"
 
@@ -28,32 +26,14 @@
     company: $organisation.company,
     platformUrl: $organisation.platformUrl,
     analyticsEnabled: $organisation.analyticsEnabled,
-    logo: $organisation.logoUrl
-      ? { url: $organisation.logoUrl, type: "image", name: "Logo" }
-      : null,
   })
-  let loading = false
 
-  async function uploadLogo(file) {
-    try {
-      let data = new FormData()
-      data.append("file", file)
-      await API.uploadLogo(data)
-    } catch (error) {
-      notifications.error("Error uploading logo")
-    }
-  }
+  let loading = false
 
   async function saveConfig() {
     loading = true
 
     try {
-      // Upload logo if required
-      if ($values.logo && !$values.logo.url) {
-        await uploadLogo($values.logo)
-        await organisation.init()
-      }
-
       const config = {
         isSSOEnforced: $values.isSSOEnforced,
         company: $values.company ?? "",
@@ -61,11 +41,6 @@
         analyticsEnabled: $values.analyticsEnabled,
       }
 
-      // Remove logo if required
-      if (!$values.logo) {
-        config.logoUrl = ""
-      }
-
       // Update settings
       await organisation.save(config)
     } catch (error) {
@@ -87,21 +62,7 @@
         <Label size="L">Org. name</Label>
         <Input thin bind:value={$values.company} />
       </div>
-      <div class="field logo">
-        <Label size="L">Logo</Label>
-        <div class="file">
-          <Dropzone
-            value={[$values.logo]}
-            on:change={e => {
-              if (!e.detail || e.detail.length === 0) {
-                $values.logo = null
-              } else {
-                $values.logo = e.detail[0]
-              }
-            }}
-          />
-        </div>
-      </div>
+
       {#if !$admin.cloud}
         <div class="field">
           <Label
@@ -137,10 +98,4 @@
     grid-gap: var(--spacing-l);
     align-items: center;
   }
-  .file {
-    max-width: 30ch;
-  }
-  .logo {
-    align-items: start;
-  }
 </style>
diff --git a/packages/builder/src/stores/backend/tables.js b/packages/builder/src/stores/backend/tables.js
index ee38504dd1..3b7ce35dde 100644
--- a/packages/builder/src/stores/backend/tables.js
+++ b/packages/builder/src/stores/backend/tables.js
@@ -22,6 +22,18 @@ export function createTablesStore() {
     }))
   }
 
+  const fetchTable = async tableId => {
+    const table = await API.fetchTableDefinition(tableId)
+
+    store.update(state => {
+      const indexToUpdate = state.list.findIndex(t => t._id === table._id)
+      state.list[indexToUpdate] = table
+      return {
+        ...state,
+      }
+    })
+  }
+
   const select = tableId => {
     store.update(state => ({
       ...state,
@@ -126,6 +138,7 @@ export function createTablesStore() {
   return {
     subscribe: derivedStore.subscribe,
     fetch,
+    fetchTable,
     init: fetch,
     select,
     save,
diff --git a/packages/builder/src/stores/portal/admin.js b/packages/builder/src/stores/portal/admin.js
index ba95db64b7..273d92f463 100644
--- a/packages/builder/src/stores/portal/admin.js
+++ b/packages/builder/src/stores/portal/admin.js
@@ -53,6 +53,7 @@ export function createAdminStore() {
       store.disableAccountPortal = environment.disableAccountPortal
       store.accountPortalUrl = environment.accountPortalUrl
       store.isDev = environment.isDev
+      store.baseUrl = environment.baseUrl
       return store
     })
   }
diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
index cf04eed9e6..8640df5ef6 100644
--- a/packages/builder/src/stores/portal/licensing.js
+++ b/packages/builder/src/stores/portal/licensing.js
@@ -13,9 +13,11 @@ export const createLicensingStore = () => {
     license: undefined,
     isFreePlan: true,
     isEnterprisePlan: true,
+    isBusinessPlan: true,
     // features
     groupsEnabled: false,
     backupsEnabled: false,
+    brandingEnabled: false,
     // the currently used quotas from the db
     quotaUsage: undefined,
     // derived quota metrics for percentages used
@@ -57,6 +59,7 @@ export const createLicensingStore = () => {
       const planType = license?.plan.type
       const isEnterprisePlan = planType === Constants.PlanType.ENTERPRISE
       const isFreePlan = planType === Constants.PlanType.FREE
+      const isBusinessPlan = planType === Constants.PlanType.BUSINESS
       const groupsEnabled = license.features.includes(
         Constants.Features.USER_GROUPS
       )
@@ -69,7 +72,9 @@ export const createLicensingStore = () => {
       const enforceableSSO = license.features.includes(
         Constants.Features.ENFORCEABLE_SSO
       )
-
+      const brandingEnabled = license.features.includes(
+        Constants.Features.BRANDING
+      )
       const auditLogsEnabled = license.features.includes(
         Constants.Features.AUDIT_LOGS
       )
@@ -79,8 +84,10 @@ export const createLicensingStore = () => {
           license,
           isEnterprisePlan,
           isFreePlan,
+          isBusinessPlan,
           groupsEnabled,
           backupsEnabled,
+          brandingEnabled,
           environmentVariablesEnabled,
           auditLogsEnabled,
           enforceableSSO,
diff --git a/packages/builder/src/stores/portal/menu.js b/packages/builder/src/stores/portal/menu.js
index d791a4ac91..40580cd0ec 100644
--- a/packages/builder/src/stores/portal/menu.js
+++ b/packages/builder/src/stores/portal/menu.js
@@ -50,6 +50,10 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => {
         title: "Organisation",
         href: "/builder/portal/settings/organisation",
       },
+      {
+        title: "Branding",
+        href: "/builder/portal/settings/branding",
+      },
       {
         title: "Environment",
         href: "/builder/portal/settings/environment",
diff --git a/packages/builder/src/stores/portal/organisation.js b/packages/builder/src/stores/portal/organisation.js
index 36bf98b0ba..ed7dd36636 100644
--- a/packages/builder/src/stores/portal/organisation.js
+++ b/packages/builder/src/stores/portal/organisation.js
@@ -6,10 +6,20 @@ import _ from "lodash"
 const DEFAULT_CONFIG = {
   platformUrl: "",
   logoUrl: undefined,
+  faviconUrl: undefined,
+  emailBrandingEnabled: true,
+  testimonialsEnabled: true,
+  platformTitle: "Budibase",
+  loginHeading: undefined,
+  loginButton: undefined,
+  metaDescription: undefined,
+  metaImageUrl: undefined,
+  metaTitle: undefined,
   docsUrl: undefined,
   company: "Budibase",
   oidc: undefined,
   google: undefined,
+  googleDatasourceConfigured: undefined,
   oidcCallbackUrl: "",
   googleCallbackUrl: "",
   isSSOEnforced: false,
@@ -30,6 +40,7 @@ export function createOrganisationStore() {
     const storeConfig = _.cloneDeep(get(store))
     delete storeConfig.oidc
     delete storeConfig.google
+    delete storeConfig.googleDatasourceConfigured
     delete storeConfig.oidcCallbackUrl
     delete storeConfig.googleCallbackUrl
     await API.saveConfig({
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 0c265ee059..a2ee6f127b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.4.27-alpha.8",
+  "version": "2.4.43",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "2.4.27-alpha.8",
-    "@budibase/string-templates": "2.4.27-alpha.8",
-    "@budibase/types": "2.4.27-alpha.8",
+    "@budibase/backend-core": "^2.4.43",
+    "@budibase/string-templates": "^2.4.43",
+    "@budibase/types": "^2.4.43",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 0ac7f6808f..786220d31c 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -103,7 +103,7 @@
       },
       {
         "type": "select",
-        "label": "Horiz. Align",
+        "label": "Horiz. align",
         "key": "hAlign",
         "showInBar": true,
         "barStyle": "buttons",
@@ -137,7 +137,7 @@
       },
       {
         "type": "select",
-        "label": "Vert. Align",
+        "label": "Vert. align",
         "key": "vAlign",
         "showInBar": true,
         "barStyle": "buttons",
@@ -227,7 +227,7 @@
       },
       {
         "type": "event",
-        "label": "On Click",
+        "label": "On click",
         "key": "onClick"
       }
     ]
@@ -297,7 +297,7 @@
             "value": "warning"
           },
           {
-            "label": "Over Background",
+            "label": "Over background",
             "value": "overBackground"
           }
         ],
@@ -347,7 +347,7 @@
       },
       {
         "type": "event",
-        "label": "On Click",
+        "label": "On click",
         "key": "onClick"
       }
     ]
@@ -394,6 +394,7 @@
     "description": "A configurable data list that attaches to your backend tables.",
     "icon": "JourneyData",
     "illegalChildren": ["section"],
+    "requiredAncestors": ["dataprovider"],
     "hasChildren": true,
     "size": {
       "width": 400,
@@ -408,7 +409,7 @@
       },
       {
         "type": "text",
-        "label": "Empty Text",
+        "label": "Empty text",
         "key": "noRowsMessage",
         "defaultValue": "No rows found"
       },
@@ -436,7 +437,7 @@
       },
       {
         "type": "select",
-        "label": "Horiz. Align",
+        "label": "Horiz. align",
         "key": "hAlign",
         "showInBar": true,
         "barStyle": "buttons",
@@ -470,7 +471,7 @@
       },
       {
         "type": "select",
-        "label": "Vert. Align",
+        "label": "Vert. align",
         "key": "vAlign",
         "showInBar": true,
         "barStyle": "buttons",
@@ -537,7 +538,7 @@
         "type": "static",
         "values": [
           {
-            "label": "Row Index",
+            "label": "Row index",
             "key": "index",
             "type": "number"
           }
@@ -599,7 +600,7 @@
       },
       {
         "type": "text",
-        "label": "Link Text",
+        "label": "Link text",
         "key": "linkText"
       },
       {
@@ -610,26 +611,26 @@
       },
       {
         "type": "color",
-        "label": "Link Color",
+        "label": "Link color",
         "key": "linkColor",
         "defaultValue": "#000"
       },
       {
         "type": "color",
-        "label": "Hover Color",
+        "label": "Hover color",
         "key": "linkHoverColor",
         "defaultValue": "#222"
       },
       {
         "type": "select",
-        "label": "Image Height",
+        "label": "Image height",
         "key": "imageHeight",
         "options": ["auto", "12rem", "16rem", "20rem", "24rem"],
         "defaultValue": "auto"
       },
       {
         "type": "select",
-        "label": "Card Width",
+        "label": "Card width",
         "key": "cardWidth",
         "options": ["16rem", "20rem", "24rem"],
         "defaultValue": "20rem"
@@ -661,7 +662,7 @@
         "barStyle": "picker",
         "options": [
           {
-            "label": "Extra Small",
+            "label": "Extra small",
             "value": "XS"
           },
           {
@@ -677,7 +678,7 @@
             "value": "L"
           },
           {
-            "label": "Extra Large",
+            "label": "Extra large",
             "value": "XL"
           },
           {
@@ -784,7 +785,7 @@
         "barStyle": "picker",
         "options": [
           {
-            "label": "Extra Small",
+            "label": "Extra amall",
             "value": "XS"
           },
           {
@@ -800,7 +801,7 @@
             "value": "L"
           },
           {
-            "label": "Extra Large",
+            "label": "Extra large",
             "value": "XL"
           },
           {
@@ -925,12 +926,12 @@
       },
       {
         "type": "boolean",
-        "label": "Show delete icon",
+        "label": "Allow delete",
         "key": "closable"
       },
       {
         "type": "event",
-        "label": "On click delete icon",
+        "label": "On click delete",
         "key": "onClick",
         "dependsOn": "closable"
       }
@@ -978,7 +979,7 @@
         "defaultValue": "center center",
         "options": [
           {
-            "label": "Center Top",
+            "label": "Center top",
             "value": "center top"
           },
           {
@@ -986,31 +987,31 @@
             "value": "center center"
           },
           {
-            "label": "Center Bottom",
+            "label": "Center bottom",
             "value": "center bottom"
           },
           {
-            "label": "Left Top",
+            "label": "Left top",
             "value": "left top"
           },
           {
-            "label": "Left Center",
+            "label": "Left center",
             "value": "left center"
           },
           {
-            "label": "Left Bottom",
+            "label": "Left bottom",
             "value": "left bottom"
           },
           {
-            "label": "Right Top",
+            "label": "Right top",
             "value": "right top"
           },
           {
-            "label": "Right Center",
+            "label": "Right center",
             "value": "right center"
           },
           {
-            "label": "Right Bottom",
+            "label": "Right bottom",
             "value": "right bottom"
           }
         ]
@@ -1107,7 +1108,7 @@
       },
       {
         "type": "event",
-        "label": "On Click",
+        "label": "On click",
         "key": "onClick"
       }
     ]
@@ -1156,7 +1157,7 @@
       },
       {
         "type": "boolean",
-        "label": "New Tab",
+        "label": "New tab",
         "key": "openInNewTab"
       },
       {
@@ -1278,7 +1279,7 @@
       },
       {
         "type": "text",
-        "label": "Link Text",
+        "label": "Link text",
         "key": "linkText"
       },
       {
@@ -1289,19 +1290,19 @@
       },
       {
         "type": "color",
-        "label": "Link Color",
+        "label": "Link color",
         "key": "linkColor",
         "defaultValue": "#000"
       },
       {
         "type": "color",
-        "label": "Hover Color",
+        "label": "Hover color",
         "key": "linkHoverColor",
         "defaultValue": "#222"
       },
       {
         "type": "select",
-        "label": "Card Width",
+        "label": "Card width",
         "key": "cardWidth",
         "options": [
           "24rem",
@@ -1316,14 +1317,14 @@
       },
       {
         "type": "select",
-        "label": "Image Width",
+        "label": "Image width",
         "key": "imageWidth",
         "options": ["auto", "8rem", "12rem", "16rem"],
         "defaultValue": "8rem"
       },
       {
         "type": "select",
-        "label": "Image Height",
+        "label": "Image height",
         "key": "imageHeight",
         "options": ["auto", "8rem", "12rem", "16rem", "auto"],
         "defaultValue": "auto"
@@ -1384,6 +1385,7 @@
     "name": "Bar Chart",
     "description": "Bar chart",
     "icon": "GraphBarVertical",
+    "requiredAncestors": ["dataprovider"],
     "size": {
       "width": 600,
       "height": 400
@@ -1402,14 +1404,14 @@
       },
       {
         "type": "field",
-        "label": "Label Col.",
+        "label": "Label column",
         "key": "labelColumn",
         "dependsOn": "dataProvider",
         "required": true
       },
       {
         "type": "multifield",
-        "label": "Data Cols.",
+        "label": "Data columns",
         "key": "valueColumns",
         "dependsOn": "dataProvider",
         "required": true
@@ -1423,12 +1425,12 @@
       },
       {
         "type": "text",
-        "label": "Y Axis Label",
+        "label": "Y axis label",
         "key": "yAxisLabel"
       },
       {
         "type": "text",
-        "label": "X Axis Label",
+        "label": "X axis label",
         "key": "xAxisLabel"
       },
       {
@@ -1520,7 +1522,7 @@
       },
       {
         "type": "boolean",
-        "label": "Data Labels",
+        "label": "Data labels",
         "key": "dataLabels",
         "defaultValue": false
       },
@@ -1546,6 +1548,7 @@
       "width": 600,
       "height": 400
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "text",
@@ -1560,14 +1563,14 @@
       },
       {
         "type": "field",
-        "label": "Label Col.",
+        "label": "Label column",
         "key": "labelColumn",
         "dependsOn": "dataProvider",
         "required": true
       },
       {
         "type": "multifield",
-        "label": "Data Cols.",
+        "label": "Data columns",
         "key": "valueColumns",
         "dependsOn": "dataProvider",
         "required": true
@@ -1581,12 +1584,12 @@
       },
       {
         "type": "text",
-        "label": "Y Axis Label",
+        "label": "Y axis label",
         "key": "yAxisLabel"
       },
       {
         "type": "text",
-        "label": "X Axis Label",
+        "label": "X axis label",
         "key": "xAxisLabel"
       },
       {
@@ -1673,7 +1676,7 @@
       },
       {
         "type": "boolean",
-        "label": "Data Labels",
+        "label": "Data labels",
         "key": "dataLabels",
         "defaultValue": false
       },
@@ -1699,6 +1702,7 @@
       "width": 600,
       "height": 400
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "text",
@@ -1713,14 +1717,14 @@
       },
       {
         "type": "field",
-        "label": "Label Col.",
+        "label": "Label column",
         "key": "labelColumn",
         "dependsOn": "dataProvider",
         "required": true
       },
       {
         "type": "multifield",
-        "label": "Data Cols.",
+        "label": "Data columns",
         "key": "valueColumns",
         "dependsOn": "dataProvider",
         "required": true
@@ -1734,12 +1738,12 @@
       },
       {
         "type": "text",
-        "label": "Y Axis Label",
+        "label": "Y axis label",
         "key": "yAxisLabel"
       },
       {
         "type": "text",
-        "label": "X Axis Label",
+        "label": "X axis label",
         "key": "xAxisLabel"
       },
       {
@@ -1826,7 +1830,7 @@
       },
       {
         "type": "boolean",
-        "label": "Data Labels",
+        "label": "Data labels",
         "key": "dataLabels",
         "defaultValue": false
       },
@@ -1864,6 +1868,7 @@
       "width": 600,
       "height": 400
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "text",
@@ -1878,14 +1883,14 @@
       },
       {
         "type": "field",
-        "label": "Label Col.",
+        "label": "Label column",
         "key": "labelColumn",
         "dependsOn": "dataProvider",
         "required": true
       },
       {
         "type": "field",
-        "label": "Data Col.",
+        "label": "Data columns",
         "key": "valueColumn",
         "dependsOn": "dataProvider",
         "required": true
@@ -1967,7 +1972,7 @@
       },
       {
         "type": "boolean",
-        "label": "Data Labels",
+        "label": "Data labels",
         "key": "dataLabels",
         "defaultValue": false
       },
@@ -1993,6 +1998,7 @@
       "width": 600,
       "height": 400
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "text",
@@ -2007,14 +2013,14 @@
       },
       {
         "type": "field",
-        "label": "Label Col.",
+        "label": "Label column",
         "key": "labelColumn",
         "dependsOn": "dataProvider",
         "required": true
       },
       {
         "type": "field",
-        "label": "Data Col.",
+        "label": "Data columns",
         "key": "valueColumn",
         "dependsOn": "dataProvider",
         "required": true
@@ -2096,7 +2102,7 @@
       },
       {
         "type": "boolean",
-        "label": "Data Labels",
+        "label": "Data labels",
         "key": "dataLabels",
         "defaultValue": false
       },
@@ -2122,6 +2128,7 @@
       "width": 600,
       "height": 400
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "text",
@@ -2136,35 +2143,35 @@
       },
       {
         "type": "field",
-        "label": "Date Col.",
+        "label": "Date column",
         "key": "dateColumn",
         "dependsOn": "dataProvider",
         "required": true
       },
       {
         "type": "field",
-        "label": "Open Col.",
+        "label": "Open column",
         "key": "openColumn",
         "dependsOn": "dataProvider",
         "required": true
       },
       {
         "type": "field",
-        "label": "Close Col.",
+        "label": "Close column",
         "key": "closeColumn",
         "dependsOn": "dataProvider",
         "required": true
       },
       {
         "type": "field",
-        "label": "High Col.",
+        "label": "High column",
         "key": "highColumn",
         "dependsOn": "dataProvider",
         "required": true
       },
       {
         "type": "field",
-        "label": "Low Col.",
+        "label": "Low column",
         "key": "lowColumn",
         "dependsOn": "dataProvider",
         "required": true
@@ -2178,12 +2185,12 @@
       },
       {
         "type": "text",
-        "label": "Y Axis Label",
+        "label": "Y axis label",
         "key": "yAxisLabel"
       },
       {
         "type": "text",
-        "label": "X Axis Label",
+        "label": "X axis label",
         "key": "xAxisLabel"
       },
       {
@@ -2349,6 +2356,7 @@
     "name": "Text Field",
     "icon": "Text",
     "styles": ["size"],
+    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -2378,7 +2386,7 @@
       },
       {
         "type": "event",
-        "label": "On Change",
+        "label": "On change",
         "key": "onChange",
         "context": [
           {
@@ -2438,6 +2446,7 @@
     "name": "Number Field",
     "icon": "123",
     "styles": ["size"],
+    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -2467,7 +2476,7 @@
       },
       {
         "type": "event",
-        "label": "On Change",
+        "label": "On change",
         "key": "onChange",
         "context": [
           {
@@ -2493,6 +2502,7 @@
     "name": "Password Field",
     "icon": "LockClosed",
     "styles": ["size"],
+    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -2522,7 +2532,7 @@
       },
       {
         "type": "event",
-        "label": "On Change",
+        "label": "On change",
         "key": "onChange",
         "context": [
           {
@@ -2548,6 +2558,7 @@
     "name": "Options Picker",
     "icon": "Menu",
     "styles": ["size"],
+    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -2573,7 +2584,7 @@
       },
       {
         "type": "event",
-        "label": "On Change",
+        "label": "On change",
         "key": "onChange",
         "context": [
           {
@@ -2636,7 +2647,7 @@
       },
       {
         "type": "boolean",
-        "label": "Sort in alphabetical order",
+        "label": "Alphabetical",
         "key": "sort",
         "defaultValue": true
       },
@@ -2669,7 +2680,7 @@
       },
       {
         "type": "dataProvider",
-        "label": "Options Provider",
+        "label": "Options provider",
         "key": "dataProvider",
         "required": true,
         "dependsOn": {
@@ -2679,7 +2690,7 @@
       },
       {
         "type": "field",
-        "label": "Label Column",
+        "label": "Label column",
         "key": "labelColumn",
         "dependsOn": {
           "setting": "optionsSource",
@@ -2688,7 +2699,7 @@
       },
       {
         "type": "field",
-        "label": "Value Column",
+        "label": "Value column",
         "key": "valueColumn",
         "dependsOn": {
           "setting": "optionsSource",
@@ -2714,6 +2725,7 @@
     "name": "Multi-select Picker",
     "icon": "ViewList",
     "styles": ["size"],
+    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -2744,7 +2756,7 @@
       },
       {
         "type": "event",
-        "label": "On Change",
+        "label": "On change",
         "key": "onChange",
         "context": [
           {
@@ -2829,7 +2841,7 @@
       },
       {
         "type": "dataProvider",
-        "label": "Options Provider",
+        "label": "Options provider",
         "key": "dataProvider",
         "required": true,
         "dependsOn": {
@@ -2839,7 +2851,7 @@
       },
       {
         "type": "field",
-        "label": "Label Column",
+        "label": "Label column",
         "key": "labelColumn",
         "dependsOn": {
           "setting": "optionsSource",
@@ -2848,7 +2860,7 @@
       },
       {
         "type": "field",
-        "label": "Value Column",
+        "label": "Value column",
         "key": "valueColumn",
         "dependsOn": {
           "setting": "optionsSource",
@@ -2874,6 +2886,7 @@
     "name": "Checkbox",
     "icon": "SelectBox",
     "editable": true,
+    "requiredAncestors": ["form"],
     "size": {
       "width": 20,
       "height": 20
@@ -2926,7 +2939,7 @@
       },
       {
         "type": "event",
-        "label": "On Change",
+        "label": "On change",
         "key": "onChange",
         "context": [
           {
@@ -2952,6 +2965,7 @@
     "name": "Long Form Field",
     "icon": "TextAlignLeft",
     "styles": ["size"],
+    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -2982,7 +2996,7 @@
       },
       {
         "type": "event",
-        "label": "On Change",
+        "label": "On change",
         "key": "onChange",
         "context": [
           {
@@ -3029,6 +3043,7 @@
     "name": "Date Picker",
     "icon": "Date",
     "styles": ["size"],
+    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3065,7 +3080,7 @@
       },
       {
         "type": "boolean",
-        "label": "24-Hour time",
+        "label": "24-hour time",
         "key": "time24hr",
         "defaultValue": false
       },
@@ -3082,7 +3097,7 @@
       },
       {
         "type": "event",
-        "label": "On Change",
+        "label": "On change",
         "key": "onChange",
         "context": [
           {
@@ -3142,7 +3157,7 @@
       },
       {
         "type": "boolean",
-        "label": "Allow manual entry",
+        "label": "Manual entry",
         "key": "allowManualEntry",
         "defaultValue": false
       },
@@ -3162,6 +3177,7 @@
       "width": 400,
       "height": 320
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "dataProvider",
@@ -3170,25 +3186,25 @@
       },
       {
         "type": "field",
-        "label": "Latitude Key",
+        "label": "Latitude key",
         "key": "latitudeKey",
         "dependsOn": "dataProvider"
       },
       {
         "type": "field",
-        "label": "Longitude Key",
+        "label": "Longitude key",
         "key": "longitudeKey",
         "dependsOn": "dataProvider"
       },
       {
         "type": "field",
-        "label": "Title Key",
+        "label": "Title key",
         "key": "titleKey",
         "dependsOn": "dataProvider"
       },
       {
         "type": "event",
-        "label": "On Click Marker",
+        "label": "On click marker",
         "key": "onClickMarker",
         "context": [
           {
@@ -3199,13 +3215,13 @@
       },
       {
         "type": "boolean",
-        "label": "Enable creating markers",
+        "label": "Enable adding",
         "key": "creationEnabled",
         "defaultValue": false
       },
       {
         "type": "event",
-        "label": "On Create Marker",
+        "label": "On create marker",
         "key": "onCreateMarker",
         "dependsOn": "creationEnabled",
         "context": [
@@ -3245,13 +3261,13 @@
       },
       {
         "type": "text",
-        "label": "Default Location (when empty)",
+        "label": "Default location",
         "key": "defaultLocation",
         "placeholder": "51.5072,-0.1276"
       },
       {
         "type": "number",
-        "label": "Default Location Zoom Level (0-100)",
+        "label": "Default zoom (0-100)",
         "key": "zoomLevel",
         "placeholder": 50,
         "max": 100,
@@ -3259,7 +3275,7 @@
       },
       {
         "type": "text",
-        "label": "Map Attribution",
+        "label": "Map attribution",
         "key": "mapAttribution",
         "defaultValue": "OpenStreetMap contributors"
       }
@@ -3269,6 +3285,7 @@
     "name": "Attachment",
     "icon": "Attach",
     "styles": ["size"],
+    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3293,13 +3310,13 @@
       },
       {
         "type": "number",
-        "label": "No. of attachment",
+        "label": "Max attachments",
         "key": "maximum",
         "min": 1
       },
       {
         "type": "event",
-        "label": "On Change",
+        "label": "On change",
         "key": "onChange",
         "context": [
           {
@@ -3331,6 +3348,7 @@
     "name": "Relationship Picker",
     "icon": "TaskList",
     "styles": ["size"],
+    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3360,7 +3378,7 @@
       },
       {
         "type": "event",
-        "label": "On Change",
+        "label": "On change",
         "key": "onChange",
         "context": [
           {
@@ -3393,6 +3411,7 @@
     "icon": "Brackets",
     "styles": ["size"],
     "editable": true,
+    "requiredAncestors": ["form"],
     "size": {
       "width": 400,
       "height": 100
@@ -3421,7 +3440,7 @@
       },
       {
         "type": "event",
-        "label": "On Change",
+        "label": "On change",
         "key": "onChange",
         "context": [
           {
@@ -3461,7 +3480,7 @@
       },
       {
         "type": "dataSource/s3",
-        "label": "S3 Datasource",
+        "label": "S3 datasource",
         "key": "datasourceId",
         "info": "This component can't be used with S3 datasources that use custom endpoints"
       },
@@ -3472,12 +3491,12 @@
       },
       {
         "type": "text",
-        "label": "File Name",
+        "label": "File name",
         "key": "key"
       },
       {
         "type": "event",
-        "label": "On Change",
+        "label": "On change",
         "key": "onChange",
         "context": [
           {
@@ -3523,12 +3542,12 @@
       },
       {
         "type": "field/sortable",
-        "label": "Sort Column",
+        "label": "Sort column",
         "key": "sortColumn"
       },
       {
         "type": "select",
-        "label": "Sort Order",
+        "label": "Sort order",
         "key": "sortOrder",
         "options": ["Ascending", "Descending"],
         "defaultValue": "Ascending"
@@ -3582,6 +3601,7 @@
     "name": "Table",
     "icon": "Table",
     "illegalChildren": ["section"],
+    "requiredAncestors": ["dataprovider"],
     "hasChildren": true,
     "showEmptyState": false,
     "size": {
@@ -3636,7 +3656,7 @@
       },
       {
         "type": "boolean",
-        "label": "Allow row selection",
+        "label": "Row selection",
         "key": "allowSelectRows",
         "defaultValue": false,
         "info": "Row selection is only compatible with internal or SQL tables"
@@ -3666,6 +3686,7 @@
     "name": "Date Range",
     "icon": "Calendar",
     "styles": ["size"],
+    "requiredAncestors": ["dataprovider"],
     "hasChildren": false,
     "size": {
       "width": 200,
@@ -3741,7 +3762,7 @@
       {
         "type": "boolean",
         "key": "linkPeek",
-        "label": "Open link in modal"
+        "label": "Open in modal"
       },
       {
         "type": "boolean",
@@ -3750,7 +3771,7 @@
       },
       {
         "type": "boolean",
-        "label": "Use button for click action",
+        "label": "Show button",
         "key": "showButton"
       },
       {
@@ -3773,6 +3794,7 @@
       "width": 100,
       "height": 35
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "dataProvider",
@@ -3821,7 +3843,7 @@
     "settings": [
       {
         "type": "select",
-        "label": "Chart Type",
+        "label": "Chart type",
         "key": "chartType",
         "required": true,
         "options": [
@@ -3870,12 +3892,12 @@
       },
       {
         "type": "field",
-        "label": "Sort Column",
+        "label": "Sort column",
         "key": "sortColumn"
       },
       {
         "type": "select",
-        "label": "Sort Order",
+        "label": "Sort order",
         "key": "sortOrder",
         "options": ["Ascending", "Descending"],
         "defaultValue": "Ascending"
@@ -3963,7 +3985,7 @@
       },
       {
         "type": "boolean",
-        "label": "Data Labels",
+        "label": "Data labels",
         "key": "dataLabels",
         "defaultValue": false
       },
@@ -3990,14 +4012,14 @@
         "settings": [
           {
             "type": "field",
-            "label": "Label Col.",
+            "label": "Label column",
             "key": "labelColumn",
             "dependsOn": "dataSource",
             "required": true
           },
           {
             "type": "field",
-            "label": "Data Col.",
+            "label": "Data column",
             "key": "valueColumn",
             "dependsOn": "dataSource",
             "required": true
@@ -4015,14 +4037,14 @@
         "settings": [
           {
             "type": "field",
-            "label": "Label Col.",
+            "label": "Label column",
             "key": "labelColumn",
             "dependsOn": "dataSource",
             "required": true
           },
           {
             "type": "field",
-            "label": "Data Col.",
+            "label": "Data column",
             "key": "valueColumn",
             "dependsOn": "dataSource",
             "required": true
@@ -4040,14 +4062,14 @@
         "settings": [
           {
             "type": "field",
-            "label": "Label Col.",
+            "label": "Label column",
             "key": "labelColumn",
             "dependsOn": "dataSource",
             "required": true
           },
           {
             "type": "multifield",
-            "label": "Data Cols.",
+            "label": "Data columns",
             "key": "valueColumns",
             "dependsOn": "dataSource",
             "required": true
@@ -4061,12 +4083,12 @@
           },
           {
             "type": "text",
-            "label": "Y Axis Label",
+            "label": "Y axis label",
             "key": "yAxisLabel"
           },
           {
             "type": "text",
-            "label": "X Axis Label",
+            "label": "X axis label",
             "key": "xAxisLabel"
           },
           {
@@ -4094,14 +4116,14 @@
         "settings": [
           {
             "type": "field",
-            "label": "Label Col.",
+            "label": "Label column",
             "key": "labelColumn",
             "dependsOn": "dataSource",
             "required": true
           },
           {
             "type": "multifield",
-            "label": "Data Cols.",
+            "label": "Data columns",
             "key": "valueColumns",
             "dependsOn": "dataSource",
             "required": true
@@ -4115,12 +4137,12 @@
           },
           {
             "type": "text",
-            "label": "Y Axis Label",
+            "label": "Y axis label",
             "key": "yAxisLabel"
           },
           {
             "type": "text",
-            "label": "X Axis Label",
+            "label": "X axis label",
             "key": "xAxisLabel"
           },
           {
@@ -4143,14 +4165,14 @@
         "settings": [
           {
             "type": "field",
-            "label": "Label Col.",
+            "label": "Label columns",
             "key": "labelColumn",
             "dependsOn": "dataSource",
             "required": true
           },
           {
             "type": "multifield",
-            "label": "Data Cols.",
+            "label": "Data columns",
             "key": "valueColumns",
             "dependsOn": "dataSource",
             "required": true
@@ -4164,12 +4186,12 @@
           },
           {
             "type": "text",
-            "label": "Y Axis Label",
+            "label": "Y axis label",
             "key": "yAxisLabel"
           },
           {
             "type": "text",
-            "label": "X Axis Label",
+            "label": "X axis label",
             "key": "xAxisLabel"
           },
           {
@@ -4204,35 +4226,35 @@
         "settings": [
           {
             "type": "field",
-            "label": "Date Col.",
+            "label": "Date column",
             "key": "dateColumn",
             "dependsOn": "dataSource",
             "required": true
           },
           {
             "type": "field",
-            "label": "Open Col.",
+            "label": "Open column",
             "key": "openColumn",
             "dependsOn": "dataSource",
             "required": true
           },
           {
             "type": "field",
-            "label": "Close Col.",
+            "label": "Close column",
             "key": "closeColumn",
             "dependsOn": "dataSource",
             "required": true
           },
           {
             "type": "field",
-            "label": "High Col.",
+            "label": "High column",
             "key": "highColumn",
             "dependsOn": "dataSource",
             "required": true
           },
           {
             "type": "field",
-            "label": "Low Col.",
+            "label": "Low column",
             "key": "lowColumn",
             "dependsOn": "dataSource",
             "required": true
@@ -4246,12 +4268,12 @@
           },
           {
             "type": "text",
-            "label": "Y Axis Label",
+            "label": "Y axis label",
             "key": "yAxisLabel"
           },
           {
             "type": "text",
-            "label": "X Axis Label",
+            "label": "X axis label",
             "key": "xAxisLabel"
           }
         ]
@@ -4285,7 +4307,7 @@
           },
           {
             "type": "columns",
-            "label": "Table Columns",
+            "label": "Columns",
             "key": "tableColumns",
             "dependsOn": "dataSource",
             "placeholder": "All columns",
@@ -4293,12 +4315,12 @@
           },
           {
             "type": "field/sortable",
-            "label": "Sort By",
+            "label": "Sort by",
             "key": "sortColumn"
           },
           {
             "type": "select",
-            "label": "Sort Order",
+            "label": "Sort order",
             "key": "sortOrder",
             "options": ["Ascending", "Descending"],
             "defaultValue": "Ascending"
@@ -4321,7 +4343,7 @@
           },
           {
             "type": "number",
-            "label": "Scroll Limit",
+            "label": "Scroll limit",
             "key": "rowCount",
             "defaultValue": 8
           },
@@ -4343,7 +4365,7 @@
           },
           {
             "type": "boolean",
-            "label": "Allow row selection",
+            "label": "Row selection",
             "key": "allowSelectRows",
             "info": "Row selection is only compatible with internal or SQL tables"
           },
@@ -4355,10 +4377,10 @@
           },
           {
             "type": "searchfield",
-            "label": "Search Fields",
+            "label": "Search fields",
             "key": "searchColumns",
             "placeholder": "Choose search fields",
-            "info": "Only the first 5 search fields will be used"
+            "info": "Only the first 5 fields will be used"
           }
         ]
       },
@@ -4367,6 +4389,8 @@
         "name": "On row click",
         "settings": [
           {
+            "label": "Behaviour",
+            "labelHidden": true,
             "type": "radio",
             "key": "clickBehaviour",
             "sendEvents": true,
@@ -4384,6 +4408,8 @@
             ]
           },
           {
+            "label": "Actions",
+            "labelHidden": true,
             "type": "event",
             "key": "onClick",
             "nested": true,
@@ -4407,7 +4433,7 @@
           {
             "type": "boolean",
             "key": "showTitleButton",
-            "label": "Show button above table",
+            "label": "Show button",
             "defaultValue": false
           },
           {
@@ -4420,7 +4446,7 @@
           {
             "type": "radio",
             "key": "titleButtonClickBehaviour",
-            "label": "On Click",
+            "label": "Behaviour",
             "dependsOn": "showTitleButton",
             "defaultValue": "actions",
             "info": "New row side panel is only compatible with internal or SQL tables",
@@ -4436,7 +4462,10 @@
             ]
           },
           {
+            "label": "On click",
             "type": "event",
+            "label": "On click",
+            "labelHidden": true,
             "key": "onClickTitleButton",
             "nested": true,
             "dependsOn": {
@@ -4471,10 +4500,10 @@
       },
       {
         "type": "searchfield",
-        "label": "Search Columns",
+        "label": "Search columns",
         "key": "searchColumns",
         "placeholder": "Choose search columns",
-        "info": "Only the first 5 search columns will be used"
+        "info": "Max 5 columns will be used"
       },
       {
         "type": "filter",
@@ -4484,12 +4513,12 @@
       },
       {
         "type": "field/sortable",
-        "label": "Sort Column",
+        "label": "Sort column",
         "key": "sortColumn"
       },
       {
         "type": "select",
-        "label": "Sort Order",
+        "label": "Sort order",
         "key": "sortOrder",
         "options": ["Ascending", "Descending"],
         "defaultValue": "Descending"
@@ -4544,7 +4573,7 @@
           {
             "type": "boolean",
             "key": "cardPeek",
-            "label": "Open link in modal"
+            "label": "Open in modal"
           },
           {
             "type": "url",
@@ -4559,7 +4588,7 @@
           },
           {
             "type": "boolean",
-            "label": "Use button for click action",
+            "label": "Add button",
             "key": "showCardButton"
           },
           {
@@ -4584,11 +4613,11 @@
           {
             "type": "boolean",
             "key": "showTitleButton",
-            "label": "Show link button"
+            "label": "Show button"
           },
           {
             "type": "boolean",
-            "label": "Open link in modal",
+            "label": "Open in modal",
             "key": "titleButtonPeek"
           },
           {
@@ -4609,7 +4638,7 @@
         "settings": [
           {
             "type": "field",
-            "label": "ID column for linking (appended to URL)",
+            "label": "ID column",
             "key": "linkColumn",
             "placeholder": "Default"
           }
@@ -4646,12 +4675,12 @@
       },
       {
         "type": "field/sortable",
-        "label": "Sort Column",
+        "label": "Sort column",
         "key": "sortColumn"
       },
       {
         "type": "select",
-        "label": "Sort Order",
+        "label": "Sort order",
         "key": "sortOrder",
         "options": ["Ascending", "Descending"],
         "defaultValue": "Descending"
@@ -4673,7 +4702,7 @@
         "settings": [
           {
             "type": "text",
-            "label": "Empty Text",
+            "label": "Empty text",
             "key": "noRowsMessage",
             "defaultValue": "No rows found"
           },
@@ -4701,7 +4730,7 @@
           },
           {
             "type": "select",
-            "label": "Horiz. Align",
+            "label": "Horiz. align",
             "key": "hAlign",
             "showInBar": true,
             "barStyle": "buttons",
@@ -4735,7 +4764,7 @@
           },
           {
             "type": "select",
-            "label": "Vert. Align",
+            "label": "Vert. align",
             "key": "vAlign",
             "showInBar": true,
             "barStyle": "buttons",
@@ -4974,7 +5003,7 @@
           },
           {
             "type": "boolean",
-            "label": "Show delete button",
+            "label": "Allow delete",
             "key": "showDeleteButton",
             "defaultValue": false,
             "dependsOn": {
@@ -5043,7 +5072,7 @@
         "settings": [
           {
             "type": "field",
-            "label": "Search Field",
+            "label": "Search field",
             "key": "cardSearchField",
             "nested": true
           },
diff --git a/packages/client/package.json b/packages/client/package.json
index 75b85bd8f5..314cb9604d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.4.27-alpha.8",
+  "version": "2.4.43",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.4.27-alpha.8",
-    "@budibase/frontend-core": "2.4.27-alpha.8",
-    "@budibase/shared-core": "2.4.27-alpha.8",
-    "@budibase/string-templates": "2.4.27-alpha.8",
-    "@budibase/types": "2.4.27-alpha.8",
+    "@budibase/bbui": "^2.4.43",
+    "@budibase/frontend-core": "^2.4.43",
+    "@budibase/shared-core": "^2.4.43",
+    "@budibase/string-templates": "^2.4.43",
+    "@budibase/types": "^2.4.43",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 3a1e7b5934..0b4b5eb0a5 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -37,7 +37,7 @@
 
   // Provide contexts
   setContext("sdk", SDK)
-  setContext("component", writable({}))
+  setContext("component", writable({ id: null, ancestors: [] }))
   setContext("context", createContextStore())
 
   let dataLoaded = false
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index c0b8febd96..97e6808912 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -26,19 +26,20 @@
   } from "stores"
   import { Helpers } from "@budibase/bbui"
   import { getActiveConditions, reduceConditionActions } from "utils/conditions"
-  import Placeholder from "components/app/Placeholder.svelte"
+  import EmptyPlaceholder from "components/app/EmptyPlaceholder.svelte"
   import ScreenPlaceholder from "components/app/ScreenPlaceholder.svelte"
-  import ComponentPlaceholder from "components/app/ComponentPlaceholder.svelte"
+  import ComponentErrorState from "components/error-states/ComponentErrorState.svelte"
+  import { BudibasePrefix } from "../stores/components.js"
 
   export let instance = {}
   export let isLayout = false
   export let isScreen = false
   export let isBlock = false
-  export let parent = null
 
   // Get parent contexts
   const context = getContext("context")
   const insideScreenslot = !!getContext("screenslot")
+  const component = getContext("component")
 
   // Create component context
   const store = writable({})
@@ -120,6 +121,12 @@
   $: showEmptyState = definition?.showEmptyState !== false
   $: hasMissingRequiredSettings = missingRequiredSettings?.length > 0
   $: editable = !!definition?.editable && !hasMissingRequiredSettings
+  $: requiredAncestors = definition?.requiredAncestors || []
+  $: missingRequiredAncestors = requiredAncestors.filter(
+    ancestor => !$component.ancestors.includes(`${BudibasePrefix}${ancestor}`)
+  )
+  $: hasMissingRequiredAncestors = missingRequiredAncestors?.length > 0
+  $: errorState = hasMissingRequiredSettings || hasMissingRequiredAncestors
 
   // Interactive components can be selected, dragged and highlighted inside
   // the builder preview
@@ -183,6 +190,7 @@
       custom: customCSS,
       id,
       empty: emptyState,
+      selected,
       interactive,
       draggable,
       editable,
@@ -193,7 +201,9 @@
     name,
     editing,
     type: instance._component,
-    missingRequiredSettings,
+    errorState,
+    parent: id,
+    ancestors: [...$component?.ancestors, instance._component],
   })
 
   const initialise = (instance, force = false) => {
@@ -482,6 +492,7 @@
         getDataContext: () => get(context),
         reload: () => initialise(instance, true),
         setEphemeralStyles: styles => (ephemeralStyles = styles),
+        state: store,
       })
     }
   })
@@ -509,24 +520,28 @@
     class:pad
     class:parent={hasChildren}
     class:block={isBlock}
+    class:error={errorState}
     data-id={id}
     data-name={name}
     data-icon={icon}
-    data-parent={parent}
+    data-parent={$component.id}
   >
-    {#if hasMissingRequiredSettings}
-      <ComponentPlaceholder />
+    {#if errorState}
+      <ComponentErrorState
+        {missingRequiredSettings}
+        {missingRequiredAncestors}
+      />
     {:else}
       <svelte:component this={constructor} bind:this={ref} {...initialSettings}>
         {#if children.length}
           {#each children as child (child._id)}
-            <svelte:self instance={child} parent={id} />
+            <svelte:self instance={child} />
           {/each}
         {:else if emptyState}
           {#if isScreen}
             <ScreenPlaceholder />
           {:else}
-            <Placeholder />
+            <EmptyPlaceholder />
           {/if}
         {:else if isBlock}
           <slot />
diff --git a/packages/client/src/components/app/ComponentPlaceholder.svelte b/packages/client/src/components/app/ComponentPlaceholder.svelte
deleted file mode 100644
index e040685fc5..0000000000
--- a/packages/client/src/components/app/ComponentPlaceholder.svelte
+++ /dev/null
@@ -1,42 +0,0 @@
-<script>
-  import { getContext } from "svelte"
-  import { builderStore } from "stores"
-
-  const component = getContext("component")
-  const { styleable } = getContext("sdk")
-
-  $: requiredSetting = $component.missingRequiredSettings?.[0]
-</script>
-
-{#if $builderStore.inBuilder && requiredSetting}
-  <div class="component-placeholder" use:styleable={$component.styles}>
-    <span>
-      Add the <mark>{requiredSetting.label}</mark> setting to start using your component
-      -
-    </span>
-    <span
-      class="spectrum-Link"
-      on:click={() => {
-        builderStore.actions.highlightSetting(requiredSetting.key)
-      }}
-    >
-      Show me
-    </span>
-  </div>
-{/if}
-
-<style>
-  .component-placeholder {
-    color: var(--spectrum-global-color-gray-600);
-    font-size: var(--font-size-s);
-    padding: var(--spacing-xs);
-  }
-  .component-placeholder mark {
-    background-color: var(--spectrum-global-color-gray-400);
-    padding: 0 4px;
-    border-radius: 2px;
-  }
-  .component-placeholder .spectrum-Link {
-    cursor: pointer;
-  }
-</style>
diff --git a/packages/client/src/components/app/EmptyPlaceholder.svelte b/packages/client/src/components/app/EmptyPlaceholder.svelte
new file mode 100644
index 0000000000..7e9920510a
--- /dev/null
+++ b/packages/client/src/components/app/EmptyPlaceholder.svelte
@@ -0,0 +1,45 @@
+<script>
+  import { getContext } from "svelte"
+  import { Icon } from "@budibase/bbui"
+
+  const component = getContext("component")
+  const { builderStore, componentStore } = getContext("sdk")
+
+  $: definition = componentStore.actions.getComponentDefinition($component.type)
+</script>
+
+{#if $builderStore.inBuilder}
+  <div class="component-placeholder">
+    <Icon name="Help" color="var(--spectrum-global-color-blue-600)" />
+    <span
+      class="spectrum-Link"
+      on:click={() => {
+        builderStore.actions.requestAddComponent()
+      }}
+    >
+      Add components inside your {definition?.name || $component.type}
+    </span>
+  </div>
+{/if}
+
+<style>
+  .component-placeholder {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+    color: var(--spectrum-global-color-gray-600);
+    font-size: var(--font-size-s);
+    gap: var(--spacing-s);
+  }
+
+  /* Common styles for all error states to use */
+  .component-placeholder :global(mark) {
+    background-color: var(--spectrum-global-color-gray-400);
+    padding: 0 4px;
+    border-radius: 2px;
+  }
+  .component-placeholder :global(.spectrum-Link) {
+    cursor: pointer;
+  }
+</style>
diff --git a/packages/client/src/components/context/DeviceBindingsProvider.svelte b/packages/client/src/components/context/DeviceBindingsProvider.svelte
index ba2d9c2dc9..bc0e2db093 100644
--- a/packages/client/src/components/context/DeviceBindingsProvider.svelte
+++ b/packages/client/src/components/context/DeviceBindingsProvider.svelte
@@ -4,7 +4,7 @@
 
   let width = window.innerWidth
   let height = window.innerHeight
-  const tabletBreakpoint = 768
+  const tabletBreakpoint = 720
   const desktopBreakpoint = 1280
   const resizeObserver = new ResizeObserver(entries => {
     if (entries?.[0]) {
diff --git a/packages/client/src/components/error-states/ComponentErrorState.svelte b/packages/client/src/components/error-states/ComponentErrorState.svelte
new file mode 100644
index 0000000000..ec7c5169b0
--- /dev/null
+++ b/packages/client/src/components/error-states/ComponentErrorState.svelte
@@ -0,0 +1,52 @@
+<script>
+  import { getContext } from "svelte"
+  import { Icon } from "@budibase/bbui"
+  import MissingRequiredSetting from "./MissingRequiredSetting.svelte"
+  import MissingRequiredAncestor from "./MissingRequiredAncestor.svelte"
+
+  export let missingRequiredSettings
+  export let missingRequiredAncestors
+
+  const component = getContext("component")
+  const { styleable, builderStore } = getContext("sdk")
+
+  $: styles = { ...$component.styles, normal: {}, custom: null, empty: true }
+  $: requiredSetting = missingRequiredSettings?.[0]
+  $: requiredAncestor = missingRequiredAncestors?.[0]
+</script>
+
+{#if $builderStore.inBuilder}
+  {#if $component.errorState}
+    <div class="component-placeholder" use:styleable={styles}>
+      <Icon name="Alert" color="var(--spectrum-global-color-static-red-600)" />
+      {#if requiredAncestor}
+        <MissingRequiredAncestor {requiredAncestor} />
+      {:else if requiredSetting}
+        <MissingRequiredSetting {requiredSetting} />
+      {/if}
+    </div>
+  {/if}
+{/if}
+
+<style>
+  .component-placeholder {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+    color: var(--spectrum-global-color-gray-600);
+    font-size: var(--font-size-s);
+    padding: var(--spacing-xs);
+    gap: var(--spacing-s);
+  }
+
+  /* Common styles for all error states to use */
+  .component-placeholder :global(mark) {
+    background-color: var(--spectrum-global-color-gray-400);
+    padding: 0 4px;
+    border-radius: 2px;
+  }
+  .component-placeholder :global(.spectrum-Link) {
+    cursor: pointer;
+  }
+</style>
diff --git a/packages/client/src/components/error-states/MissingRequiredAncestor.svelte b/packages/client/src/components/error-states/MissingRequiredAncestor.svelte
new file mode 100644
index 0000000000..29e9bf0c74
--- /dev/null
+++ b/packages/client/src/components/error-states/MissingRequiredAncestor.svelte
@@ -0,0 +1,41 @@
+<script>
+  import { getContext } from "svelte"
+  import { BudibasePrefix } from "stores/components"
+
+  export let requiredAncestor
+
+  const component = getContext("component")
+  const { builderStore, componentStore } = getContext("sdk")
+
+  $: definition = componentStore.actions.getComponentDefinition($component.type)
+  $: fullAncestorType = `${BudibasePrefix}${requiredAncestor}`
+  $: ancestorDefinition =
+    componentStore.actions.getComponentDefinition(fullAncestorType)
+  $: pluralName = getPluralName(definition?.name, $component.type)
+  $: ancestorName = getAncestorName(ancestorDefinition?.name, requiredAncestor)
+
+  const getPluralName = (name, type) => {
+    if (!name) {
+      name = type.replace(BudibasePrefix, "")
+    }
+    return name.endsWith("s") ? `${name}'` : `${name}s`
+  }
+
+  const getAncestorName = name => {
+    return name || requiredAncestor
+  }
+</script>
+
+<span>
+  {pluralName} need to be inside a
+  <mark>{ancestorName}</mark>
+</span>
+<span>-</span>
+<span
+  class="spectrum-Link"
+  on:click={() => {
+    builderStore.actions.addParentComponent($component.id, fullAncestorType)
+  }}
+>
+  Add {ancestorName}
+</span>
diff --git a/packages/client/src/components/error-states/MissingRequiredSetting.svelte b/packages/client/src/components/error-states/MissingRequiredSetting.svelte
new file mode 100644
index 0000000000..206c7fec0a
--- /dev/null
+++ b/packages/client/src/components/error-states/MissingRequiredSetting.svelte
@@ -0,0 +1,20 @@
+<script>
+  import { getContext } from "svelte"
+
+  export let requiredSetting
+
+  const { builderStore } = getContext("sdk")
+</script>
+
+<span>
+  Add the <mark>{requiredSetting.label}</mark> setting to start using your component
+</span>
+<span>-</span>
+<span
+  class="spectrum-Link"
+  on:click={() => {
+    builderStore.actions.highlightSetting(requiredSetting.key)
+  }}
+>
+  Show me
+</span>
diff --git a/packages/client/src/components/preview/GridDNDHandler.svelte b/packages/client/src/components/preview/GridDNDHandler.svelte
index 46e2e575b0..df0ccb814e 100644
--- a/packages/client/src/components/preview/GridDNDHandler.svelte
+++ b/packages/client/src/components/preview/GridDNDHandler.svelte
@@ -12,7 +12,8 @@
   $: id = dragInfo?.id || id
 
   // Set ephemeral grid styles on the dragged component
-  $: componentStore.actions.getComponentInstance(id)?.setEphemeralStyles({
+  $: instance = componentStore.actions.getComponentInstance(id)
+  $: $instance?.setEphemeralStyles({
     ...gridStyles,
     ...(gridStyles ? { "z-index": 999 } : null),
   })
diff --git a/packages/client/src/components/preview/IndicatorSet.svelte b/packages/client/src/components/preview/IndicatorSet.svelte
index ff0c7d71d6..053523aa12 100644
--- a/packages/client/src/components/preview/IndicatorSet.svelte
+++ b/packages/client/src/components/preview/IndicatorSet.svelte
@@ -16,6 +16,7 @@
   let text
   let icon
   let insideGrid = false
+  let errorState = false
 
   $: visibleIndicators = indicators.filter(x => x.visible)
   $: offset = $builderStore.inBuilder ? 0 : 2
@@ -85,6 +86,7 @@
         icon = parents[0].dataset.icon
       }
     }
+    errorState = parents?.[0]?.classList.contains("error")
 
     // Batch reads to minimize reflow
     const scrollX = window.scrollX
@@ -152,10 +154,10 @@
       text={idx === 0 ? text : null}
       icon={idx === 0 ? icon : null}
       showResizeAnchors={allowResizeAnchors && insideGrid}
+      color={errorState ? "var(--spectrum-global-color-static-red-600)" : color}
       {componentId}
       {transition}
       {zIndex}
-      {color}
     />
   {/each}
 {/key}
diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte
index 961af98d39..e1bfe4f7e5 100644
--- a/packages/client/src/components/preview/SettingsBar.svelte
+++ b/packages/client/src/components/preview/SettingsBar.svelte
@@ -15,17 +15,22 @@
   let self
   let measured = false
 
+  $: id = $builderStore.selectedComponentId
+  $: instance = componentStore.actions.getComponentInstance(id)
+  $: state = $instance?.state
   $: definition = $componentStore.selectedComponentDefinition
   $: showBar =
-    definition?.showSettingsBar !== false && !$dndIsDragging && definition
+    definition?.showSettingsBar !== false &&
+    !$dndIsDragging &&
+    definition &&
+    !$state?.errorState
   $: {
     if (!showBar) {
       measured = false
     }
   }
   $: settings = getBarSettings(definition)
-  $: isScreen =
-    $builderStore.selectedComponentId === $builderStore.screen?.props?._id
+  $: isScreen = id === $builderStore.screen?.props?._id
 
   const getBarSettings = definition => {
     let allSettings = []
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index 1ddcaf82b9..b82b032617 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -109,6 +109,12 @@ const createBuilderStore = () => {
       // Notify the builder so we can reload component definitions
       eventStore.actions.dispatchEvent("reload-plugin")
     },
+    addParentComponent: (componentId, parentType) => {
+      eventStore.actions.dispatchEvent("add-parent-component", {
+        componentId,
+        parentType,
+      })
+    },
   }
   return {
     ...store,
diff --git a/packages/client/src/stores/components.js b/packages/client/src/stores/components.js
index d30ffaa2bb..b7f7d98197 100644
--- a/packages/client/src/stores/components.js
+++ b/packages/client/src/stores/components.js
@@ -8,7 +8,7 @@ import Router from "../components/Router.svelte"
 import * as AppComponents from "../components/app/index.js"
 import { ScreenslotType } from "../constants.js"
 
-const budibasePrefix = "@budibase/standard-components/"
+export const BudibasePrefix = "@budibase/standard-components/"
 
 const createComponentStore = () => {
   const store = writable({
@@ -107,12 +107,12 @@ const createComponentStore = () => {
 
     // Screenslot is an edge case
     if (type === ScreenslotType) {
-      type = `${budibasePrefix}${type}`
+      type = `${BudibasePrefix}${type}`
     }
 
     // Handle built-in components
-    if (type.startsWith(budibasePrefix)) {
-      type = type.replace(budibasePrefix, "")
+    if (type.startsWith(BudibasePrefix)) {
+      type = type.replace(BudibasePrefix, "")
       return type ? Manifest[type] : null
     }
 
@@ -130,7 +130,7 @@ const createComponentStore = () => {
     }
 
     // Handle budibase components
-    if (type.startsWith(budibasePrefix)) {
+    if (type.startsWith(BudibasePrefix)) {
       const split = type.split("/")
       const name = split[split.length - 1]
       return AppComponents[name]
@@ -145,7 +145,7 @@ const createComponentStore = () => {
     if (!id) {
       return null
     }
-    return get(store).mountedComponents[id]
+    return derived(store, $store => $store.mountedComponents[id])
   }
 
   const registerCustomComponent = ({ Component, schema, version }) => {
diff --git a/packages/client/src/stores/index.js b/packages/client/src/stores/index.js
index 7548d31817..9530792353 100644
--- a/packages/client/src/stores/index.js
+++ b/packages/client/src/stores/index.js
@@ -16,6 +16,7 @@ export { rowSelectionStore } from "./rowSelection.js"
 export { blockStore } from "./blocks.js"
 export { environmentStore } from "./environment"
 export { eventStore } from "./events.js"
+export { orgStore } from "./org.js"
 export {
   dndStore,
   dndIndex,
diff --git a/packages/client/src/stores/initialise.js b/packages/client/src/stores/initialise.js
index 1900e62ce1..f34d775a4e 100644
--- a/packages/client/src/stores/initialise.js
+++ b/packages/client/src/stores/initialise.js
@@ -1,7 +1,9 @@
 import { routeStore } from "./routes"
 import { appStore } from "./app"
+import { orgStore } from "./org"
 
 export async function initialise() {
   await routeStore.actions.fetchRoutes()
   await appStore.actions.fetchAppDefinition()
+  await orgStore.actions.init()
 }
diff --git a/packages/client/src/stores/org.js b/packages/client/src/stores/org.js
new file mode 100644
index 0000000000..af0fc955f9
--- /dev/null
+++ b/packages/client/src/stores/org.js
@@ -0,0 +1,29 @@
+import { API } from "api"
+import { writable, get } from "svelte/store"
+import { appStore } from "./app"
+
+const createOrgStore = () => {
+  const store = writable(null)
+
+  const { subscribe, set } = store
+
+  async function init() {
+    const tenantId = get(appStore).application?.tenantId
+    if (!tenantId) return
+    try {
+      const settingsConfigDoc = await API.getTenantConfig(tenantId)
+      set({ logoUrl: settingsConfigDoc.config.logoUrl })
+    } catch (e) {
+      console.log("Could not init org ", e)
+    }
+  }
+
+  return {
+    subscribe,
+    actions: {
+      init,
+    },
+  }
+}
+
+export const orgStore = createOrgStore()
diff --git a/packages/client/src/stores/screens.js b/packages/client/src/stores/screens.js
index 6ef164dc9d..ba373ad8e0 100644
--- a/packages/client/src/stores/screens.js
+++ b/packages/client/src/stores/screens.js
@@ -2,6 +2,7 @@ import { derived } from "svelte/store"
 import { routeStore } from "./routes"
 import { builderStore } from "./builder"
 import { appStore } from "./app"
+import { orgStore } from "./org"
 import { dndIndex, dndParent, dndIsNewComponent, dndBounds } from "./dnd.js"
 import { RoleUtils } from "@budibase/frontend-core"
 import { findComponentById, findComponentParent } from "../utils/components.js"
@@ -14,6 +15,7 @@ const createScreenStore = () => {
       appStore,
       routeStore,
       builderStore,
+      orgStore,
       dndParent,
       dndIndex,
       dndIsNewComponent,
@@ -23,6 +25,7 @@ const createScreenStore = () => {
       $appStore,
       $routeStore,
       $builderStore,
+      $orgStore,
       $dndParent,
       $dndIndex,
       $dndIsNewComponent,
@@ -146,6 +149,11 @@ const createScreenStore = () => {
           if (!navigationSettings.title && !navigationSettings.hideTitle) {
             navigationSettings.title = $appStore.application?.name
           }
+
+          // Default to the org logo
+          if (!navigationSettings.logoUrl) {
+            navigationSettings.logoUrl = $orgStore?.logoUrl
+          }
         }
         activeLayout = {
           _id: "layout",
diff --git a/packages/client/src/utils/styleable.js b/packages/client/src/utils/styleable.js
index 4a6f1c0d7c..f48eece89b 100644
--- a/packages/client/src/utils/styleable.js
+++ b/packages/client/src/utils/styleable.js
@@ -29,9 +29,13 @@ export const styleable = (node, styles = {}) => {
 
     let baseStyles = {}
     if (newStyles.empty) {
-      baseStyles.border = "2px dashed var(--spectrum-global-color-gray-400)"
       baseStyles.padding = "var(--spacing-l)"
       baseStyles.overflow = "hidden"
+      if (newStyles.selected) {
+        baseStyles.border = "2px solid transparent"
+      } else {
+        baseStyles.border = "2px dashed var(--spectrum-global-color-gray-400)"
+      }
     }
 
     const componentId = newStyles.id
diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock
index 189c93c120..e7140f7af3 100644
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
@@ -23,11 +23,6 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@budibase/types@2.4.8-alpha.4":
-  version "2.4.8-alpha.4"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.8-alpha.4.tgz#4e6dec50eef381994432ef4d08587a9a7156dd84"
-  integrity sha512-aiHHOvsDLHQ2OFmLgaSUttQwSuaPBqF1lbyyCkEJIbbl/qo9EPNZGl+AkB7wo12U5HdqWhr9OpFL12EqkcD4GA==
-
 "@jridgewell/gen-mapping@^0.3.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 12370d3172..ba04b519be 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.4.27-alpha.8",
+  "version": "2.4.43",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.4.27-alpha.8",
-    "@budibase/shared-core": "2.4.27-alpha.8",
+    "@budibase/bbui": "^2.4.43",
+    "@budibase/shared-core": "^2.4.43",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/frontend-core/src/api/configs.js b/packages/frontend-core/src/api/configs.js
index 8447e0d79d..8d0d176a55 100644
--- a/packages/frontend-core/src/api/configs.js
+++ b/packages/frontend-core/src/api/configs.js
@@ -73,6 +73,18 @@ export const buildConfigEndpoints = API => ({
     })
   },
 
+  /**
+   * Updates the company favicon for the environment.
+   * @param data the favicon form data
+   */
+  uploadFavicon: async data => {
+    return await API.post({
+      url: "/api/global/configs/upload/settings/faviconUrl",
+      body: data,
+      json: false,
+    })
+  },
+
   /**
    * Uploads a logo for an OIDC provider.
    * @param name the name of the OIDC provider
diff --git a/packages/frontend-core/src/components/TestimonialPage.svelte b/packages/frontend-core/src/components/TestimonialPage.svelte
index 25ed4ac08d..bbb61d2276 100644
--- a/packages/frontend-core/src/components/TestimonialPage.svelte
+++ b/packages/frontend-core/src/components/TestimonialPage.svelte
@@ -5,6 +5,8 @@
   import Covanta from "../../assets/covanta.png"
   import Schnellecke from "../../assets/schnellecke.png"
 
+  export let enabled = true
+
   const testimonials = [
     {
       text: "Budibase was the only solution that checked all the boxes for Covanta. Covanta expects to realize $3.2MM in savings due to the elimination of redundant data entry.",
@@ -33,23 +35,25 @@
 
 <SplitPage>
   <slot />
-  <div class="wrapper" slot="right">
-    <div class="testimonial">
-      <Layout noPadding gap="S">
-        <img
-          width={testimonial.imageSize}
-          alt="a-happy-budibase-user"
-          src={testimonial.image}
-        />
-        <div class="text">
-          "{testimonial.text}"
-        </div>
-        <div class="author">
-          <div class="name">{testimonial.name}</div>
-          <div class="company">{testimonial.role}</div>
-        </div>
-      </Layout>
-    </div>
+  <div class:wrapper={enabled} slot="right">
+    {#if enabled}
+      <div class="testimonial">
+        <Layout noPadding gap="S">
+          <img
+            width={testimonial.imageSize}
+            alt="a-happy-budibase-user"
+            src={testimonial.image}
+          />
+          <div class="text">
+            "{testimonial.text}"
+          </div>
+          <div class="author">
+            <div class="name">{testimonial.name}</div>
+            <div class="company">{testimonial.role}</div>
+          </div>
+        </Layout>
+      </div>
+    {/if}
   </div>
 </SplitPage>
 
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index bdf7abe36f..3c8efcd658 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -68,6 +68,7 @@ export const Features = {
   ENVIRONMENT_VARIABLES: "environmentVariables",
   AUDIT_LOGS: "auditLogs",
   ENFORCEABLE_SSO: "enforceableSSO",
+  BRANDING: "branding",
 }
 
 // Role IDs
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index ced98bcdbd..eecd104f0d 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.4.27-alpha.8",
+  "version": "2.4.43",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts
index 36065cc489..b1498cdad7 100644
--- a/packages/server/jest.config.ts
+++ b/packages/server/jest.config.ts
@@ -44,6 +44,7 @@ const config: Config.InitialOptions = {
     // The use of coverage with couchdb view functions breaks tests
     "!src/db/views/staticViews.*",
     "!src/**/*.spec.{js,ts}",
+    "!src/tests/**/*.{js,ts}",
   ],
   coverageReporters: ["lcov", "json", "clover"],
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index 374934bc8c..be28de8718 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.4.27-alpha.8",
+  "version": "2.4.43",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -14,7 +14,7 @@
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
     "debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js",
     "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
-    "test": "NODE_OPTIONS=\"--max-old-space-size=4096\" bash scripts/test.sh",
+    "test": "bash scripts/test.sh",
     "test:memory": "jest --maxWorkers=2 --logHeapUsage --forceExit",
     "test:watch": "jest --watch",
     "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
@@ -44,12 +44,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.4.27-alpha.8",
-    "@budibase/client": "2.4.27-alpha.8",
-    "@budibase/pro": "2.4.27-alpha.8",
-    "@budibase/shared-core": "2.4.27-alpha.8",
-    "@budibase/string-templates": "2.4.27-alpha.8",
-    "@budibase/types": "2.4.27-alpha.8",
+    "@budibase/backend-core": "^2.4.43",
+    "@budibase/client": "^2.4.43",
+    "@budibase/pro": "2.4.43",
+    "@budibase/shared-core": "^2.4.43",
+    "@budibase/string-templates": "^2.4.43",
+    "@budibase/types": "^2.4.43",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/server/scripts/test.sh b/packages/server/scripts/test.sh
index d367f51c0b..f3f679c4da 100644
--- a/packages/server/scripts/test.sh
+++ b/packages/server/scripts/test.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
+set -e
 
 if [[ -n $CI ]]
 then
   # --runInBand performs better in ci where resources are limited
+  export NODE_OPTIONS="--max-old-space-size=4096"
   echo "jest --coverage --runInBand --forceExit"
   jest --coverage --runInBand --forceExit
 else
   # --maxWorkers performs better in development
-  echo "jest --coverage --maxWorkers=2"
-  jest --coverage --maxWorkers=2
-fi
+  echo "jest --coverage --maxWorkers=2 --forceExit"
+  jest --coverage --maxWorkers=2 --forceExit
+fi
\ No newline at end of file
diff --git a/packages/server/src/api/controllers/component.ts b/packages/server/src/api/controllers/component.ts
index 9b196ca289..52b1ac66bf 100644
--- a/packages/server/src/api/controllers/component.ts
+++ b/packages/server/src/api/controllers/component.ts
@@ -2,9 +2,9 @@ import { DocumentType } from "../../db/utils"
 import { Plugin } from "@budibase/types"
 import { db as dbCore, context, tenancy } from "@budibase/backend-core"
 import { getComponentLibraryManifest } from "../../utilities/fileSystem"
-import { BBContext } from "@budibase/types"
+import { UserCtx } from "@budibase/types"
 
-export async function fetchAppComponentDefinitions(ctx: BBContext) {
+export async function fetchAppComponentDefinitions(ctx: UserCtx) {
   try {
     const db = context.getAppDB()
     const app = await db.get(DocumentType.APP_METADATA)
diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts
index 348d441c78..349c4e72e7 100644
--- a/packages/server/src/api/controllers/row/index.ts
+++ b/packages/server/src/api/controllers/row/index.ts
@@ -133,10 +133,15 @@ export async function search(ctx: any) {
 
 export async function validate(ctx: Ctx) {
   const tableId = getTableId(ctx)
-  ctx.body = await utils.validate({
-    row: ctx.request.body,
-    tableId,
-  })
+  // external tables are hard to validate currently
+  if (isExternalTable(tableId)) {
+    ctx.body = { valid: true }
+  } else {
+    ctx.body = await utils.validate({
+      row: ctx.request.body,
+      tableId,
+    })
+  }
 }
 
 export async function fetchEnrichedRow(ctx: any) {
diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts
index c58e1a374d..c19fd1bb05 100644
--- a/packages/server/src/api/controllers/static/index.ts
+++ b/packages/server/src/api/controllers/static/index.ts
@@ -11,10 +11,12 @@ import {
 } from "../../../utilities/fileSystem"
 import env from "../../../environment"
 import { DocumentType } from "../../../db/utils"
-import { context, objectStore, utils } from "@budibase/backend-core"
+import { context, objectStore, utils, configs } from "@budibase/backend-core"
 import AWS from "aws-sdk"
 import fs from "fs"
 import sdk from "../../../sdk"
+import * as pro from "@budibase/pro"
+
 const send = require("koa-send")
 
 async function prepareUpload({ s3Key, bucket, metadata, file }: any) {
@@ -98,33 +100,74 @@ export const deleteObjects = async function (ctx: any) {
 }
 
 export const serveApp = async function (ctx: any) {
-  const db = context.getAppDB({ skip_setup: true })
-  const appInfo = await db.get(DocumentType.APP_METADATA)
-  let appId = context.getAppId()
+  //Public Settings
+  const { config } = await configs.getSettingsConfigDoc()
+  const branding = await pro.branding.getBrandingConfig(config)
 
-  if (!env.isJest()) {
-    const App = require("./templates/BudibaseApp.svelte").default
-    const plugins = objectStore.enrichPluginURLs(appInfo.usedPlugins)
-    const { head, html, css } = App.render({
-      metaImage:
-        "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
-      title: appInfo.name,
-      production: env.isProd(),
-      appId,
-      clientLibPath: objectStore.clientLibraryUrl(appId!, appInfo.version),
-      usedPlugins: plugins,
-    })
+  let db
+  try {
+    db = context.getAppDB({ skip_setup: true })
+    const appInfo = await db.get(DocumentType.APP_METADATA)
+    let appId = context.getAppId()
 
-    const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`)
-    ctx.body = await processString(appHbs, {
-      head,
-      body: html,
-      style: css.code,
-      appId,
-    })
-  } else {
-    // just return the app info for jest to assert on
-    ctx.body = appInfo
+    if (!env.isJest()) {
+      const App = require("./templates/BudibaseApp.svelte").default
+      const plugins = objectStore.enrichPluginURLs(appInfo.usedPlugins)
+      const { head, html, css } = App.render({
+        metaImage:
+          branding?.metaImageUrl ||
+          "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
+        metaDescription: branding?.metaDescription || "",
+        metaTitle:
+          branding?.metaTitle || `${appInfo.name} - built with Budibase`,
+        title: appInfo.name,
+        production: env.isProd(),
+        appId,
+        clientLibPath: objectStore.clientLibraryUrl(appId!, appInfo.version),
+        usedPlugins: plugins,
+        favicon:
+          branding.faviconUrl !== ""
+            ? objectStore.getGlobalFileUrl("settings", "faviconUrl")
+            : "",
+        logo:
+          config?.logoUrl !== ""
+            ? objectStore.getGlobalFileUrl("settings", "logoUrl")
+            : "",
+      })
+      const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`)
+      ctx.body = await processString(appHbs, {
+        head,
+        body: html,
+        style: css.code,
+        appId,
+      })
+    } else {
+      // just return the app info for jest to assert on
+      ctx.body = appInfo
+    }
+  } catch (error) {
+    if (!env.isJest()) {
+      const App = require("./templates/BudibaseApp.svelte").default
+      const { head, html, css } = App.render({
+        title: branding?.metaTitle,
+        metaTitle: branding?.metaTitle,
+        metaImage:
+          branding?.metaImageUrl ||
+          "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
+        metaDescription: branding?.metaDescription || "",
+        favicon:
+          branding.faviconUrl !== ""
+            ? objectStore.getGlobalFileUrl("settings", "faviconUrl")
+            : "",
+      })
+
+      const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`)
+      ctx.body = await processString(appHbs, {
+        head,
+        body: html,
+        style: css.code,
+      })
+    }
   }
 }
 
diff --git a/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte b/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte
index 27dad289b4..5df821f453 100644
--- a/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte
+++ b/packages/server/src/api/controllers/static/templates/BudibaseApp.svelte
@@ -1,7 +1,10 @@
 <script>
   export let title = ""
   export let favicon = ""
+
   export let metaImage = ""
+  export let metaTitle = ""
+  export let metaDescription = ""
 
   export let clientLibPath
   export let usedPlugins
@@ -13,18 +16,33 @@
     name="viewport"
     content="width=device-width, initial-scale=1.0, viewport-fit=cover"
   />
+
+  <!-- Primary Meta Tags -->
+  <meta name="title" content={metaTitle} />
+  <meta name="description" content={metaDescription} />
+
   <!-- Opengraph Meta Tags -->
-  <meta name="twitter:card" content="summary_large_image" />
-  <meta name="twitter:site" content="@budibase" />
-  <meta name="twitter:image" content={metaImage} />
-  <meta name="twitter:title" content="{title} - built with Budibase" />
   <meta property="og:site_name" content="Budibase" />
-  <meta property="og:title" content="{title} - built with Budibase" />
+  <meta property="og:title" content={metaTitle} />
+  <meta property="og:description" content={metaDescription} />
   <meta property="og:type" content="website" />
   <meta property="og:image" content={metaImage} />
 
+  <!-- Twitter -->
+  <meta property="twitter:card" content="summary_large_image" />
+  <meta property="twitter:site" content="@budibase" />
+  <meta property="twitter:image" content={metaImage} />
+  <meta property="twitter:image:alt" content={metaTitle} />
+  <meta property="twitter:title" content={metaTitle} />
+  <meta property="twitter:description" content={metaDescription} />
+
   <title>{title}</title>
-  <link rel="icon" type="image/png" href={favicon} />
+  {#if favicon !== ""}
+    <link rel="icon" type="image/png" href={favicon} />
+  {:else}
+    <link rel="icon" type="image/png" href="https://i.imgur.com/Xhdt1YP.png" />
+  {/if}
+
   <link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
   <link rel="preconnect" href="https://fonts.gstatic.com" />
   <link
@@ -83,11 +101,16 @@
 
 <body id="app">
   <div id="error">
-    <h1>There was an error loading your app</h1>
-    <h2>
-      The Budibase client library could not be loaded. Try republishing your
-      app.
-    </h2>
+    {#if clientLibPath}
+      <h1>There was an error loading your app</h1>
+      <h2>
+        The Budibase client library could not be loaded. Try republishing your
+        app.
+      </h2>
+    {:else}
+      <h2>We couldn't find that application</h2>
+      <p />
+    {/if}
   </div>
   <script type="application/javascript">
     window.INIT_TIME = Date.now()
diff --git a/packages/server/src/api/controllers/table/tests/utils.spec.ts b/packages/server/src/api/controllers/table/tests/utils.spec.ts
new file mode 100644
index 0000000000..957cf51ecd
--- /dev/null
+++ b/packages/server/src/api/controllers/table/tests/utils.spec.ts
@@ -0,0 +1,97 @@
+import { FieldType } from "@budibase/types"
+import { AutoFieldSubTypes } from "../../../../constants"
+import TestConfiguration from "../../../../tests/utilities/TestConfiguration"
+import { importToRows } from "../utils"
+
+describe("utils", () => {
+  const config = new TestConfiguration()
+
+  beforeEach(async () => {
+    await config.init()
+  })
+
+  afterAll(config.end)
+
+  describe("importToRows", () => {
+    it("consecutive row have consecutive auto ids", async () => {
+      await config.doInContext(config.appId, async () => {
+        const table = await config.createTable({
+          name: "table",
+          type: "table",
+          schema: {
+            autoId: {
+              name: "autoId",
+              type: FieldType.NUMBER,
+              subtype: AutoFieldSubTypes.AUTO_ID,
+              autocolumn: true,
+              constraints: {
+                type: FieldType.NUMBER,
+                presence: true,
+              },
+            },
+            name: {
+              name: "name",
+              type: FieldType.STRING,
+              constraints: {
+                type: FieldType.STRING,
+                presence: true,
+              },
+            },
+          },
+        })
+
+        const data = [{ name: "Alice" }, { name: "Bob" }, { name: "Claire" }]
+
+        const result = importToRows(data, table, config.user)
+        expect(result).toEqual([
+          expect.objectContaining({
+            autoId: 1,
+            name: "Alice",
+          }),
+          expect.objectContaining({
+            autoId: 2,
+            name: "Bob",
+          }),
+          expect.objectContaining({
+            autoId: 3,
+            name: "Claire",
+          }),
+        ])
+      })
+    })
+
+    it("can import data without a specific user performing the action", async () => {
+      await config.doInContext(config.appId, async () => {
+        const table = await config.createTable({
+          name: "table",
+          type: "table",
+          schema: {
+            autoId: {
+              name: "autoId",
+              type: FieldType.NUMBER,
+              subtype: AutoFieldSubTypes.AUTO_ID,
+              autocolumn: true,
+              constraints: {
+                type: FieldType.NUMBER,
+                presence: true,
+              },
+            },
+            name: {
+              name: "name",
+              type: FieldType.STRING,
+              constraints: {
+                type: FieldType.STRING,
+                presence: true,
+              },
+            },
+          },
+        })
+
+        const data = [{ name: "Alice" }, { name: "Bob" }, { name: "Claire" }]
+
+        const result = importToRows(data, table)
+        expect(result).toHaveLength(3)
+      })
+    })
+  })
+})
diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts
index 7c5c81939a..cf1883c083 100644
--- a/packages/server/src/api/controllers/table/utils.ts
+++ b/packages/server/src/api/controllers/table/utils.ts
@@ -20,7 +20,13 @@ import viewTemplate from "../view/viewBuilder"
 import { cloneDeep } from "lodash/fp"
 import { quotas } from "@budibase/pro"
 import { events, context } from "@budibase/backend-core"
-import { Database, Datasource, SourceName, Table } from "@budibase/types"
+import {
+  ContextUser,
+  Database,
+  Datasource,
+  SourceName,
+  Table,
+} from "@budibase/types"
 
 export async function clearColumns(table: any, columnNames: any) {
   const db: Database = context.getAppDB()
@@ -99,32 +105,35 @@ export function makeSureTableUpToDate(table: any, tableToSave: any) {
   return tableToSave
 }
 
-export function importToRows(data: any, table: any, user: any = {}) {
+export function importToRows(
+  data: any[],
+  table: Table,
+  user: ContextUser | null = null
+) {
   let finalData: any = []
   for (let i = 0; i < data.length; i++) {
     let row = data[i]
-    row._id = generateRowID(table._id)
+    row._id = generateRowID(table._id!)
     row.tableId = table._id
-    const processed: any = inputProcessing(user, table, row, {
+    const processed = inputProcessing(user, table, row, {
       noAutoRelationships: true,
     })
     row = processed.row
+    table = processed.table
 
-    let fieldName: any
-    let schema: any
-    for ([fieldName, schema] of Object.entries(table.schema)) {
+    for (const [fieldName, schema] of Object.entries(table.schema)) {
       // check whether the options need to be updated for inclusion as part of the data import
       if (
         schema.type === FieldTypes.OPTIONS &&
         row[fieldName] &&
-        (!schema.constraints.inclusion ||
-          schema.constraints.inclusion.indexOf(row[fieldName]) === -1)
+        (!schema.constraints!.inclusion ||
+          schema.constraints!.inclusion.indexOf(row[fieldName]) === -1)
       ) {
-        schema.constraints.inclusion = [
-          ...schema.constraints.inclusion,
+        schema.constraints!.inclusion = [
+          ...schema.constraints!.inclusion!,
           row[fieldName],
         ]
-        schema.constraints.inclusion.sort()
+        schema.constraints!.inclusion.sort()
       }
     }
 
diff --git a/packages/server/src/automations/automationUtils.ts b/packages/server/src/automations/automationUtils.ts
index 478acc8fab..44de2e7d6b 100644
--- a/packages/server/src/automations/automationUtils.ts
+++ b/packages/server/src/automations/automationUtils.ts
@@ -107,7 +107,7 @@ export function substituteLoopStep(hbsString: string, substitute: string) {
   let pointer = 0,
     openPointer = 0,
     closedPointer = 0
-  while (pointer < hbsString.length) {
+  while (pointer < hbsString?.length) {
     openPointer = hbsString.indexOf(open, pointer)
     closedPointer = hbsString.indexOf(closed, pointer) + 2
     if (openPointer < 0 || closedPointer < 0) {
diff --git a/packages/server/src/db/defaultData/datasource_bb_default.ts b/packages/server/src/db/defaultData/datasource_bb_default.ts
index 516783ed31..6ffbf601c8 100644
--- a/packages/server/src/db/defaultData/datasource_bb_default.ts
+++ b/packages/server/src/db/defaultData/datasource_bb_default.ts
@@ -34,7 +34,7 @@ function syncLastIds(table: Table, rowCount: number) {
   })
 }
 
-function tableImport(table: Table, data: Row) {
+function tableImport(table: Table, data: Row[]) {
   const cloneTable = cloneDeep(table)
   const rowDocs = importToRows(data, cloneTable)
   syncLastIds(cloneTable, rowDocs.length)
diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index a21c8e7d54..90107dfd4e 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -156,7 +156,7 @@ class InternalBuilder {
         const rawFnc = `${fnc}Raw`
         // @ts-ignore
         query = query[rawFnc](`LOWER(${likeKey(this.client, key)}) LIKE ?`, [
-          `%${value}%`,
+          `%${value.toLowerCase()}%`,
         ])
       }
     }
@@ -202,7 +202,7 @@ class InternalBuilder {
           let statement = ""
           for (let i in value) {
             if (typeof value[i] === "string") {
-              value[i] = `%"${value[i]}"%`
+              value[i] = `%"${value[i].toLowerCase()}"%`
             } else {
               value[i] = `%${value[i]}%`
             }
@@ -238,7 +238,7 @@ class InternalBuilder {
           const rawFnc = `${fnc}Raw`
           // @ts-ignore
           query = query[rawFnc](`LOWER(${likeKey(this.client, key)}) LIKE ?`, [
-            `${value}%`,
+            `${value.toLowerCase()}%`,
           ])
         }
       })
diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts
index f8bc84adea..476a6511e9 100644
--- a/packages/server/src/integrations/googlesheets.ts
+++ b/packages/server/src/integrations/googlesheets.ts
@@ -245,6 +245,10 @@ class GoogleSheetsIntegration implements DatasourcePlus {
   }
 
   async buildSchema(datasourceId: string, entities: Record<string, Table>) {
+    // not fully configured yet
+    if (!this.config.auth) {
+      return
+    }
     await this.connect()
     const sheets = this.client.sheetsByIndex
     const tables: Record<string, Table> = {}
diff --git a/packages/server/src/integrations/rest.ts b/packages/server/src/integrations/rest.ts
index c24636a5fd..dc63b961c4 100644
--- a/packages/server/src/integrations/rest.ts
+++ b/packages/server/src/integrations/rest.ts
@@ -19,6 +19,7 @@ import { formatBytes } from "../utilities"
 import { performance } from "perf_hooks"
 import FormData from "form-data"
 import { URLSearchParams } from "url"
+import { blacklist } from "@budibase/backend-core"
 
 const BodyTypes = {
   NONE: "none",
@@ -398,6 +399,9 @@ class RestIntegration implements IntegrationBase {
 
     this.startTimeMs = performance.now()
     const url = this.getUrl(path, queryString, pagination, paginationValues)
+    if (await blacklist.isBlacklisted(url)) {
+      throw new Error("Cannot connect to URL.")
+    }
     const response = await fetch(url, input)
     return await this.parseResponse(response, pagination)
   }
diff --git a/packages/server/src/integrations/tests/sql.spec.ts b/packages/server/src/integrations/tests/sql.spec.ts
index 2b9a0f1f10..bd1497bdc7 100644
--- a/packages/server/src/integrations/tests/sql.spec.ts
+++ b/packages/server/src/integrations/tests/sql.spec.ts
@@ -351,7 +351,7 @@ describe("SQL query builder", () => {
       })
     )
     expect(query).toEqual({
-      bindings: [10, "%20%", "%25%", `%"John"%`, `%"Mary"%`],
+      bindings: [10, "%20%", "%25%", `%"john"%`, `%"mary"%`],
       sql: `select * from (select top (@p0) * from [${TABLE_NAME}] where (LOWER([${TABLE_NAME}].[age]) LIKE @p1 AND LOWER([${TABLE_NAME}].[age]) LIKE @p2) and (LOWER([${TABLE_NAME}].[name]) LIKE @p3 AND LOWER([${TABLE_NAME}].[name]) LIKE @p4)) as [${TABLE_NAME}]`,
     })
   })
@@ -402,7 +402,7 @@ describe("SQL query builder", () => {
       })
     )
     expect(query).toEqual({
-      bindings: [10, "%20%", `%"John"%`],
+      bindings: [10, "%20%", `%"john"%`],
       sql: `select * from (select top (@p0) * from [${TABLE_NAME}] where NOT (LOWER([${TABLE_NAME}].[age]) LIKE @p1) and NOT (LOWER([${TABLE_NAME}].[name]) LIKE @p2)) as [${TABLE_NAME}]`,
     })
   })
@@ -453,7 +453,7 @@ describe("SQL query builder", () => {
       })
     )
     expect(query).toEqual({
-      bindings: [10, "%20%", "%25%", `%"John"%`, `%"Mary"%`],
+      bindings: [10, "%20%", "%25%", `%"john"%`, `%"mary"%`],
       sql: `select * from (select top (@p0) * from [${TABLE_NAME}] where (LOWER([${TABLE_NAME}].[age]) LIKE @p1 OR LOWER([${TABLE_NAME}].[age]) LIKE @p2) and (LOWER([${TABLE_NAME}].[name]) LIKE @p3 OR LOWER([${TABLE_NAME}].[name]) LIKE @p4)) as [${TABLE_NAME}]`,
     })
   })
@@ -531,7 +531,7 @@ describe("SQL query builder", () => {
       })
     )
     expect(query).toEqual({
-      bindings: ["John%", limit],
+      bindings: ["john%", limit],
       sql: `select * from (select * from \`${tableName}\` where LOWER(\`${tableName}\`.\`name\`) LIKE ? limit ?) as \`${tableName}\``,
     })
   })
@@ -549,7 +549,7 @@ describe("SQL query builder", () => {
       })
     )
     expect(query).toEqual({
-      bindings: [limit, "John%"],
+      bindings: [limit, "john%"],
       sql: `select * from (select top (@p0) * from [${tableName}] where LOWER([${tableName}].[name]) LIKE @p1) as [${tableName}]`,
     })
   })
@@ -591,4 +591,49 @@ describe("SQL query builder", () => {
       sql: `select * from (select * from \"${TABLE_NAME}\" where \"${TABLE_NAME}\".\"dob\" < $1 limit $2) as \"${TABLE_NAME}\"`,
     })
   })
+
+  it("should lowercase the values for Oracle LIKE statements", () => {
+    let query = new Sql(SqlClient.ORACLE, limit)._query(
+      generateReadJson({
+        filters: {
+          string: {
+            name: "John",
+          },
+        },
+      })
+    )
+    expect(query).toEqual({
+      bindings: ["john%", limit],
+      sql: `select * from (select * from (select * from \"test\" where LOWER(\"test\".\"name\") LIKE :1) where rownum <= :2) \"test\"`,
+    })
+
+    query = new Sql(SqlClient.ORACLE, limit)._query(
+      generateReadJson({
+        filters: {
+          contains: {
+            age: [20, 25],
+            name: ["John", "Mary"],
+          },
+        },
+      })
+    )
+    expect(query).toEqual({
+      bindings: ["%20%", "%25%", `%"john"%`, `%"mary"%`, limit],
+      sql: `select * from (select * from (select * from \"test\" where (LOWER(\"test\".\"age\") LIKE :1 AND LOWER(\"test\".\"age\") LIKE :2) and (LOWER(\"test\".\"name\") LIKE :3 AND LOWER(\"test\".\"name\") LIKE :4)) where rownum <= :5) \"test\"`,
+    })
+
+    query = new Sql(SqlClient.ORACLE, limit)._query(
+      generateReadJson({
+        filters: {
+          fuzzy: {
+            name: "Jo",
+          },
+        },
+      })
+    )
+    expect(query).toEqual({
+      bindings: [`%jo%`, limit],
+      sql: `select * from (select * from (select * from \"test\" where LOWER(\"test\".\"name\") LIKE :1) where rownum <= :2) \"test\"`,
+    })
+  })
 })
diff --git a/packages/server/src/middleware/currentapp.ts b/packages/server/src/middleware/currentapp.ts
index 7621bf61ee..efafc59e21 100644
--- a/packages/server/src/middleware/currentapp.ts
+++ b/packages/server/src/middleware/currentapp.ts
@@ -2,7 +2,6 @@ import {
   utils,
   constants,
   roles,
-  db as dbCore,
   tenancy,
   context,
 } from "@budibase/backend-core"
@@ -15,29 +14,10 @@ import { UserCtx } from "@budibase/types"
 export default async (ctx: UserCtx, next: any) => {
   // try to get the appID from the request
   let requestAppId = await utils.getAppIdFromCtx(ctx)
-  // get app cookie if it exists
-  let appCookie: { appId?: string } | undefined
-  try {
-    appCookie = utils.getCookie(ctx, constants.Cookie.CurrentApp)
-  } catch (err) {
-    utils.clearCookie(ctx, constants.Cookie.CurrentApp)
-  }
-  if (!appCookie && !requestAppId) {
+  if (!requestAppId) {
     return next()
   }
 
-  // check the app exists referenced in cookie
-  if (appCookie) {
-    const appId = appCookie.appId
-    const exists = await dbCore.dbExists(appId)
-    if (!exists) {
-      utils.clearCookie(ctx, constants.Cookie.CurrentApp)
-      return next()
-    }
-    // if the request app ID wasn't set, update it with the cookie
-    requestAppId = requestAppId || appId
-  }
-
   // deny access to application preview
   if (!env.isTest()) {
     if (
@@ -45,7 +25,6 @@ export default async (ctx: UserCtx, next: any) => {
       !isWebhookEndpoint(ctx) &&
       (!ctx.user || !ctx.user.builder || !ctx.user.builder.global)
     ) {
-      utils.clearCookie(ctx, constants.Cookie.CurrentApp)
       return ctx.redirect("/")
     }
   }
@@ -127,14 +106,6 @@ export default async (ctx: UserCtx, next: any) => {
         role: await roles.getRole(roleId),
       }
     }
-    if (
-      (requestAppId !== appId ||
-        appCookie == null ||
-        appCookie.appId !== requestAppId) &&
-      !skipCookie
-    ) {
-      utils.setCookie(ctx, { appId }, constants.Cookie.CurrentApp)
-    }
 
     return next()
   })
diff --git a/packages/server/src/middleware/tests/currentapp.spec.js b/packages/server/src/middleware/tests/currentapp.spec.js
index 8770118da2..b80800fd96 100644
--- a/packages/server/src/middleware/tests/currentapp.spec.js
+++ b/packages/server/src/middleware/tests/currentapp.spec.js
@@ -158,27 +158,22 @@ describe("Current app middleware", () => {
   })
 
   describe("check functionality when logged in", () => {
-    async function checkExpected(setCookie) {
+    async function checkExpected() {
       config.setUser()
       await config.executeMiddleware()
-      let { utils } = require("@budibase/backend-core")
-      if (setCookie) {
-        expect(utils.setCookie).toHaveBeenCalled()
-      } else {
-        expect(utils.setCookie).not.toHaveBeenCalled()
-      }
+
       expect(config.ctx.roleId).toEqual("PUBLIC")
       expect(config.ctx.user.role._id).toEqual("PUBLIC")
       expect(config.ctx.appId).toEqual("app_test")
       expect(config.next).toHaveBeenCalled()
     }
 
-    it("should be able to setup an app token when cookie not setup", async () => {
+    it("should be able to setup an app token on a first call", async () => {
       mockAuthWithCookie()
-      await checkExpected(true)
+      await checkExpected()
     })
 
-    it("should perform correct when no cookie exists", async () => {
+    it("should perform correct on a first call", async () => {
       mockReset()
       jest.mock("@budibase/backend-core", () => {
         const core = jest.requireActual("@budibase/backend-core")
@@ -206,38 +201,7 @@ describe("Current app middleware", () => {
           },
         }
       })
-      await checkExpected(true)
-    })
-
-    it("lastly check what occurs when cookie doesn't need updated", async () => {
-      mockReset()
-      jest.mock("@budibase/backend-core", () => {
-        const core = jest.requireActual("@budibase/backend-core")
-        return {
-          ...core,
-          db: {
-            ...core.db,
-            dbExists: () => true,
-          },
-          utils: {
-            getAppIdFromCtx: () => {
-              return "app_test"
-            },
-            setCookie: jest.fn(),
-            getCookie: () => ({ appId: "app_test", roleId: "PUBLIC" }),
-          },
-          cache: {
-            user: {
-              getUser: async id => {
-                return {
-                  _id: "us_uuid1",
-                }
-              },
-            },
-          },
-        }
-      })
-      await checkExpected(false)
+      await checkExpected()
     })
   })
 })
diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts
new file mode 100644
index 0000000000..11c2c53643
--- /dev/null
+++ b/packages/server/src/sdk/users/tests/utils.spec.ts
@@ -0,0 +1,159 @@
+import { db, roles } from "@budibase/backend-core"
+import { structures } from "@budibase/backend-core/tests"
+import { sdk as proSdk } from "@budibase/pro"
+
+import TestConfiguration from "../../../tests/utilities/TestConfiguration"
+import { rawUserMetadata, syncGlobalUsers } from "../utils"
+
+describe("syncGlobalUsers", () => {
+  const config = new TestConfiguration()
+
+  beforeEach(async () => {
+    await config.init()
+  })
+
+  afterAll(config.end)
+
+  it("the default user is synced", async () => {
+    await config.doInContext(config.appId, async () => {
+      await syncGlobalUsers()
+
+      const metadata = await rawUserMetadata()
+      expect(metadata).toHaveLength(1)
+      expect(metadata).toEqual([
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(config.user._id),
+        }),
+      ])
+    })
+  })
+
+  it("admin and builders users are synced", async () => {
+    const user1 = await config.createUser({ admin: true })
+    const user2 = await config.createUser({ admin: false, builder: true })
+    await config.doInContext(config.appId, async () => {
+      expect(await rawUserMetadata()).toHaveLength(1)
+      await syncGlobalUsers()
+
+      const metadata = await rawUserMetadata()
+      expect(metadata).toHaveLength(3)
+      expect(metadata).toContainEqual(
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(user1._id),
+        })
+      )
+      expect(metadata).toContainEqual(
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(user2._id),
+        })
+      )
+    })
+  })
+
+  it("app users are not synced if not specified", async () => {
+    const user = await config.createUser({ admin: false, builder: false })
+    await config.doInContext(config.appId, async () => {
+      await syncGlobalUsers()
+
+      const metadata = await rawUserMetadata()
+      expect(metadata).toHaveLength(1)
+      expect(metadata).not.toContainEqual(
+        expect.objectContaining({
+          _id: db.generateUserMetadataID(user._id),
+        })
+      )
+    })
+  })
+
+  it("app users are added when group is assigned to app", async () => {
+    await config.doInTenant(async () => {
+      const group = await proSdk.groups.save(structures.userGroups.userGroup())
+      const user1 = await config.createUser({ admin: false, builder: false })
+      const user2 = await config.createUser({ admin: false, builder: false })
+      await proSdk.groups.addUsers(group.id, [user1._id, user2._id])
+
+      await config.doInContext(config.appId, async () => {
+        await syncGlobalUsers()
+        expect(await rawUserMetadata()).toHaveLength(1)
+
+        await proSdk.groups.updateGroupApps(group.id, {
+          appsToAdd: [
+            { appId: config.prodAppId!, roleId: roles.BUILTIN_ROLE_IDS.BASIC },
+          ],
+        })
+        await syncGlobalUsers()
+
+        const metadata = await rawUserMetadata()
+        expect(metadata).toHaveLength(3)
+        expect(metadata).toContainEqual(
+          expect.objectContaining({
+            _id: db.generateUserMetadataID(user1._id),
+          })
+        )
+        expect(metadata).toContainEqual(
+          expect.objectContaining({
+            _id: db.generateUserMetadataID(user2._id),
+          })
+        )
+      })
+    })
+  })
+
+  it("app users are removed when app is removed from user group", async () => {
+    await config.doInTenant(async () => {
+      const group = await proSdk.groups.save(structures.userGroups.userGroup())
+      const user1 = await config.createUser({ admin: false, builder: false })
+      const user2 = await config.createUser({ admin: false, builder: false })
+      await proSdk.groups.updateGroupApps(group.id, {
+        appsToAdd: [
+          { appId: config.prodAppId!, roleId: roles.BUILTIN_ROLE_IDS.BASIC },
+        ],
+      })
+      await proSdk.groups.addUsers(group.id, [user1._id, user2._id])
+
+      await config.doInContext(config.appId, async () => {
+        await syncGlobalUsers()
+        expect(await rawUserMetadata()).toHaveLength(3)
+
+        await proSdk.groups.updateGroupApps(group.id, {
+          appsToRemove: [{ appId: config.prodAppId! }],
+        })
+        await syncGlobalUsers()
+
+        const metadata = await rawUserMetadata()
+        expect(metadata).toHaveLength(1)
+      })
+    })
+  })
+
+  it("app users are removed when app is removed from user group", async () => {
+    await config.doInTenant(async () => {
+      const group = await proSdk.groups.save(structures.userGroups.userGroup())
+      const user1 = await config.createUser({ admin: false, builder: false })
+      const user2 = await config.createUser({ admin: false, builder: false })
+      await proSdk.groups.updateGroupApps(group.id, {
+        appsToAdd: [
+          { appId: config.prodAppId!, roleId: roles.BUILTIN_ROLE_IDS.BASIC },
+        ],
+      })
+      await proSdk.groups.addUsers(group.id, [user1._id, user2._id])
+
+      await config.doInContext(config.appId, async () => {
+        await syncGlobalUsers()
+        expect(await rawUserMetadata()).toHaveLength(3)
+
+        await proSdk.groups.removeUsers(group.id, [user1._id])
+        await syncGlobalUsers()
+
+        const metadata = await rawUserMetadata()
+        expect(metadata).toHaveLength(2)
+
+        expect(metadata).not.toContainEqual(
+          expect.objectContaining({
+            _id: db.generateUserMetadataID(user1._id),
+          })
+        )
+      })
+    })
+  })
+})
diff --git a/packages/server/src/sdk/users/utils.ts b/packages/server/src/sdk/users/utils.ts
index 5c369754a1..9b9ea04c56 100644
--- a/packages/server/src/sdk/users/utils.ts
+++ b/packages/server/src/sdk/users/utils.ts
@@ -6,25 +6,33 @@ import {
   InternalTables,
 } from "../../db/utils"
 import { isEqual } from "lodash"
+import { ContextUser, UserMetadata } from "@budibase/types"
 
-export function combineMetadataAndUser(user: any, metadata: any) {
+export function combineMetadataAndUser(
+  user: ContextUser,
+  metadata: UserMetadata | UserMetadata[]
+) {
+  const metadataId = generateUserMetadataID(user._id!)
+  const found = Array.isArray(metadata)
+    ? metadata.find(doc => doc._id === metadataId)
+    : metadata
   // skip users with no access
   if (
     user.roleId == null ||
     user.roleId === rolesCore.BUILTIN_ROLE_IDS.PUBLIC
   ) {
+    // If it exists and it should not, we must remove it
+    if (found?._id) {
+      return { ...found, _deleted: true }
+    }
     return null
   }
   delete user._rev
-  const metadataId = generateUserMetadataID(user._id)
   const newDoc = {
     ...user,
     _id: metadataId,
     tableId: InternalTables.USER_METADATA,
   }
-  const found = Array.isArray(metadata)
-    ? metadata.find(doc => doc._id === metadataId)
-    : metadata
   // copy rev over for the purposes of equality check
   if (found) {
     newDoc._rev = found._rev
@@ -58,7 +66,7 @@ export async function syncGlobalUsers() {
   ])
   const toWrite = []
   for (let user of users) {
-    const combined = await combineMetadataAndUser(user, metadata)
+    const combined = combineMetadataAndUser(user, metadata)
     if (combined) {
       toWrite.push(combined)
     }
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index cf337c689f..ca48dd7f86 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -47,6 +47,7 @@ import {
   SourceName,
   Table,
   SearchFilters,
+  UserRoles,
 } from "@budibase/types"
 
 type DefaultUserValues = {
@@ -277,7 +278,7 @@ class TestConfiguration {
       email?: string
       builder?: boolean
       admin?: boolean
-      roles?: any
+      roles?: UserRoles
     } = {}
   ) {
     let { id, firstName, lastName, email, builder, admin, roles } = user
@@ -330,21 +331,13 @@ class TestConfiguration {
         sessionId: "sessionid",
         tenantId: this.getTenantId(),
       }
-      const app = {
-        roleId: roleId,
-        appId,
-      }
       const authToken = auth.jwt.sign(authObj, coreEnv.JWT_SECRET)
-      const appToken = auth.jwt.sign(app, coreEnv.JWT_SECRET)
 
       // returning necessary request headers
       await cache.user.invalidateUser(userId)
       return {
         Accept: "application/json",
-        Cookie: [
-          `${constants.Cookie.Auth}=${authToken}`,
-          `${constants.Cookie.CurrentApp}=${appToken}`,
-        ],
+        Cookie: [`${constants.Cookie.Auth}=${authToken}`],
         [constants.Header.APP_ID]: appId,
       }
     })
@@ -359,18 +352,11 @@ class TestConfiguration {
       sessionId: "sessionid",
       tenantId,
     }
-    const app = {
-      roleId: roles.BUILTIN_ROLE_IDS.ADMIN,
-      appId: this.appId,
-    }
     const authToken = auth.jwt.sign(authObj, coreEnv.JWT_SECRET)
-    const appToken = auth.jwt.sign(app, coreEnv.JWT_SECRET)
+
     const headers: any = {
       Accept: "application/json",
-      Cookie: [
-        `${constants.Cookie.Auth}=${authToken}`,
-        `${constants.Cookie.CurrentApp}=${appToken}`,
-      ],
+      Cookie: [`${constants.Cookie.Auth}=${authToken}`],
       [constants.Header.CSRF_TOKEN]: this.defaultUserValues.csrfToken,
       Host: this.tenantHost(),
       ...extras,
diff --git a/packages/server/src/utilities/fileSystem/app.ts b/packages/server/src/utilities/fileSystem/app.ts
index b8976336ac..f5e1f6e40e 100644
--- a/packages/server/src/utilities/fileSystem/app.ts
+++ b/packages/server/src/utilities/fileSystem/app.ts
@@ -33,15 +33,8 @@ export const deleteApp = async (appId: string) => {
 export const getComponentLibraryManifest = async (library: string) => {
   const appId = context.getAppId()
   const filename = "manifest.json"
-  /* istanbul ignore next */
-  // when testing in cypress and so on we need to get the package
-  // as the environment may not be fully fleshed out for dev or prod
-  if (env.isTest()) {
-    library = library.replace("standard-components", "client")
-    const lib = library.split("/")[1]
-    const path = require.resolve(library).split(lib)[0]
-    return require(join(path, lib, filename))
-  } else if (env.isDev()) {
+
+  if (env.isDev() || env.isTest()) {
     const path = join(NODE_MODULES_PATH, "@budibase", "client", filename)
     // always load from new so that updates are refreshed
     delete require.cache[require.resolve(path)]
diff --git a/packages/server/src/utilities/fileSystem/filesystem.ts b/packages/server/src/utilities/fileSystem/filesystem.ts
index 086eaa835a..6d3c6d48f6 100644
--- a/packages/server/src/utilities/fileSystem/filesystem.ts
+++ b/packages/server/src/utilities/fileSystem/filesystem.ts
@@ -24,10 +24,6 @@ export const init = () => {
       }
     }
   }
-  const clientLibPath = join(budibaseTempDir(), "budibase-client.js")
-  if (env.isTest() && !fs.existsSync(clientLibPath)) {
-    fs.copyFileSync(require.resolve("@budibase/client"), clientLibPath)
-  }
 }
 
 /**
diff --git a/packages/server/src/utilities/rowProcessor/index.ts b/packages/server/src/utilities/rowProcessor/index.ts
index 9e1029fa1a..a5bb352eeb 100644
--- a/packages/server/src/utilities/rowProcessor/index.ts
+++ b/packages/server/src/utilities/rowProcessor/index.ts
@@ -131,7 +131,7 @@ export function coerce(row: any, type: string) {
  * @returns {object} the row which has been prepared to be written to the DB.
  */
 export function inputProcessing(
-  user: ContextUser,
+  user: ContextUser | null,
   table: Table,
   row: Row,
   opts?: AutoColumnProcessingOpts
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 3a4b2c712e..a29e4f60f9 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1290,14 +1290,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.27-alpha.8":
-  version "2.4.27-alpha.8"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.27-alpha.8.tgz#c733674998ec22650be930f0071091649202e333"
-  integrity sha512-wXrQ43dqdzSpgr+Bu7z6cEUg+DZUKKZeV4e0ow7QlqnR3izczIB6vT9xiKomxKeyp9auUVaUA5jsCm1gUhZ04g==
+"@budibase/backend-core@2.4.43":
+  version "2.4.43"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.43.tgz#801cdad706a90f6718e9323dd66e7e664cc9b287"
+  integrity sha512-pxMjFsCugkR/lR6XsA4bAbBEnUta92jjeUIY4C//hjczHF0lwEUWqhhR8QRCMaNTrWoJfZBFGnJyNIqfguyDVw==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.4.27-alpha.8"
+    "@budibase/types" "^2.4.43"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1429,14 +1429,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.27-alpha.8":
-  version "2.4.27-alpha.8"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.27-alpha.8.tgz#c405ef42ceebd9f1bbfe19f541777fa8a0c0b44a"
-  integrity sha512-eRRSY51D/xgYG2IwrBVCqCv7udf3It09I/VXEsxwmbWTz6qlFSEmnKjEKM0GhTJaMU8XAGkD0JIMaLPhhlSUbA==
+"@budibase/pro@2.4.43":
+  version "2.4.43"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.43.tgz#e717000a26fd4c183a984a141965945a26ac83d9"
+  integrity sha512-J/Up28bSV5E2UTQBpaTOXvNG1jQqRj8fcZH5TSqS7ymJ2H4OyLOQvEGFL3roCGnN3Dgrzkfv9LBO0JyRORVtSw==
   dependencies:
-    "@budibase/backend-core" "2.4.27-alpha.8"
+    "@budibase/backend-core" "2.4.43"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.27-alpha.8"
+    "@budibase/types" "2.4.43"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1475,10 +1475,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.27-alpha.8":
-  version "2.4.27-alpha.8"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.27-alpha.8.tgz#d8fc065a00a40207bf64a45b94fab3a7247a91c9"
-  integrity sha512-mUFgly36rPk2Wfro2vdKMmd210Ix9dYYw5TZGme9W8DjU+fFfqFgOOpNLMeU2grONPlq4O3j8K8VCq5+a1+gfg==
+"@budibase/types@2.4.43", "@budibase/types@^2.4.43":
+  version "2.4.43"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.43.tgz#2f6e609bada8855c83dfb26deb3b2d64dbb2d401"
+  integrity sha512-OWr8dNjk3VjjAJ4Rni/+AMGDtCDhz7LrZqxgedL0wKiRwgwkSiBNExh1eIZ/NKlt1vZrzH/GG5jhzlPkYqDTQg==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index 80b3e00f1b..9ea61a9af7 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.4.27-alpha.8",
+  "version": "2.4.43",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "2.4.27-alpha.8"
+    "@budibase/types": "^2.4.43"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/shared-core/src/helpers.ts b/packages/shared-core/src/helpers/helpers.ts
similarity index 100%
rename from packages/shared-core/src/helpers.ts
rename to packages/shared-core/src/helpers/helpers.ts
diff --git a/packages/shared-core/src/helpers/index.ts b/packages/shared-core/src/helpers/index.ts
new file mode 100644
index 0000000000..fd185aa1e9
--- /dev/null
+++ b/packages/shared-core/src/helpers/index.ts
@@ -0,0 +1,2 @@
+export * from "./helpers"
+export * from "./integrations"
diff --git a/packages/shared-core/src/helpers/integrations.ts b/packages/shared-core/src/helpers/integrations.ts
new file mode 100644
index 0000000000..a7b74885d8
--- /dev/null
+++ b/packages/shared-core/src/helpers/integrations.ts
@@ -0,0 +1,5 @@
+import { SourceName } from "@budibase/types"
+
+export function isGoogleSheets(type: SourceName) {
+  return type === SourceName.GOOGLE_SHEETS
+}
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index fe9c620d00..24a0edc652 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.4.27-alpha.8",
+  "version": "2.4.43",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index 6b20763866..89bce8dc0d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.4.27-alpha.8",
+  "version": "2.4.43",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/types/src/api/web/global/configs.ts b/packages/types/src/api/web/global/configs.ts
index 1476d13cee..b36d974904 100644
--- a/packages/types/src/api/web/global/configs.ts
+++ b/packages/types/src/api/web/global/configs.ts
@@ -5,6 +5,7 @@ import { SettingsConfig, SettingsInnerConfig } from "../../../documents"
  */
 export interface PublicSettingsInnerConfig extends SettingsInnerConfig {
   google: boolean
+  googleDatasourceConfigured: boolean
   oidc: boolean
   oidcCallbackUrl: string
   googleCallbackUrl: string
diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts
index 6e86ed2674..f2e266a5e2 100644
--- a/packages/types/src/documents/global/config.ts
+++ b/packages/types/src/documents/global/config.ts
@@ -22,6 +22,24 @@ export interface SMTPConfig extends Config {
   config: SMTPInnerConfig
 }
 
+/**
+ * Accessible only via pro.
+ */
+export interface SettingsBrandingConfig {
+  faviconUrl?: string
+  faviconUrlEtag?: string
+
+  emailBrandingEnabled?: boolean
+  testimonialsEnabled?: boolean
+  platformTitle?: string
+  loginHeading?: string
+  loginButton?: string
+
+  metaDescription?: string
+  metaImageUrl?: string
+  metaTitle?: string
+}
+
 export interface SettingsInnerConfig {
   platformUrl?: string
   company?: string
diff --git a/packages/types/src/sdk/licensing/feature.ts b/packages/types/src/sdk/licensing/feature.ts
index 9f6090623b..1ff4f8febb 100644
--- a/packages/types/src/sdk/licensing/feature.ts
+++ b/packages/types/src/sdk/licensing/feature.ts
@@ -4,4 +4,5 @@ export enum Feature {
   ENVIRONMENT_VARIABLES = "environmentVariables",
   AUDIT_LOGS = "auditLogs",
   ENFORCEABLE_SSO = "enforceableSSO",
+  BRANDING = "branding",
 }
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 2424ef6659..a738524244 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.4.27-alpha.8",
+  "version": "2.4.43",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.4.27-alpha.8",
-    "@budibase/pro": "2.4.27-alpha.8",
-    "@budibase/string-templates": "2.4.27-alpha.8",
-    "@budibase/types": "2.4.27-alpha.8",
+    "@budibase/backend-core": "^2.4.43",
+    "@budibase/pro": "2.4.43",
+    "@budibase/string-templates": "^2.4.43",
+    "@budibase/types": "^2.4.43",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
diff --git a/packages/worker/scripts/test.sh b/packages/worker/scripts/test.sh
index d367f51c0b..d7659a9318 100644
--- a/packages/worker/scripts/test.sh
+++ b/packages/worker/scripts/test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 if [[ -n $CI ]]
 then
@@ -7,6 +8,6 @@ then
   jest --coverage --runInBand --forceExit
 else
   # --maxWorkers performs better in development
-  echo "jest --coverage --maxWorkers=2"
-  jest --coverage --maxWorkers=2
-fi
+  echo "jest --coverage --maxWorkers=2 --forceExit"
+  jest --coverage --maxWorkers=2 --forceExit
+fi
\ No newline at end of file
diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts
index 1286fd519d..c8f75b3610 100644
--- a/packages/worker/src/api/controllers/global/auth.ts
+++ b/packages/worker/src/api/controllers/global/auth.ts
@@ -50,11 +50,6 @@ async function passportCallback(
   setCookie(ctx, token, Cookie.Auth, { sign: false })
   // set the token in a header as well for APIs
   ctx.set(Header.TOKEN, token)
-  // get rid of any app cookies on login
-  // have to check test because this breaks cypress
-  if (!env.isTest()) {
-    clearCookie(ctx, Cookie.CurrentApp)
-  }
 }
 
 export const login = async (ctx: Ctx<LoginRequest>, next: any) => {
diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts
index 4f4575074b..66804c3b9c 100644
--- a/packages/worker/src/api/controllers/global/configs.ts
+++ b/packages/worker/src/api/controllers/global/configs.ts
@@ -11,6 +11,7 @@ import {
   tenancy,
 } from "@budibase/backend-core"
 import { checkAnyUserExists } from "../../../utilities/users"
+import { getLicensedConfig } from "../../../utilities/configs"
 import {
   Config,
   ConfigType,
@@ -211,6 +212,38 @@ export async function save(ctx: UserCtx<Config>) {
     ctx.throw(400, err)
   }
 
+  // Ignore branding changes if the license does not permit it
+  // Favicon and Logo Url are excluded.
+  try {
+    const brandingEnabled = await pro.features.isBrandingEnabled()
+    if (existingConfig?.config && !brandingEnabled) {
+      const {
+        emailBrandingEnabled,
+        testimonialsEnabled,
+        platformTitle,
+        metaDescription,
+        loginHeading,
+        loginButton,
+        metaImageUrl,
+        metaTitle,
+      } = existingConfig.config
+
+      body.config = {
+        ...body.config,
+        emailBrandingEnabled,
+        testimonialsEnabled,
+        platformTitle,
+        metaDescription,
+        loginHeading,
+        loginButton,
+        metaImageUrl,
+        metaTitle,
+      }
+    }
+  } catch (e) {
+    console.error("There was an issue retrieving the license", e)
+  }
+
   try {
     body._id = configs.generateConfigID(type)
     const response = await configs.save(body)
@@ -276,6 +309,9 @@ export async function publicSettings(
     // settings
     const configDoc = await configs.getSettingsConfigDoc()
     const config = configDoc.config
+
+    const branding = await pro.branding.getBrandingConfig(config)
+
     // enrich the logo url - empty url means deleted
     if (config.logoUrl && config.logoUrl !== "") {
       config.logoUrl = objectStore.getGlobalFileUrl(
@@ -285,8 +321,19 @@ export async function publicSettings(
       )
     }
 
+    if (branding.faviconUrl && branding.faviconUrl !== "") {
+      // @ts-ignore
+      config.faviconUrl = objectStore.getGlobalFileUrl(
+        "settings",
+        "faviconUrl",
+        branding.faviconUrl
+      )
+    }
+
     // google
     const googleConfig = await configs.getGoogleConfig()
+    const googleDatasourceConfigured =
+      !!(await configs.getGoogleDatasourceConfig())
     const preActivated = googleConfig && googleConfig.activated == null
     const google = preActivated || !!googleConfig?.activated
     const _googleCallbackUrl = await googleCallbackUrl(googleConfig)
@@ -305,7 +352,9 @@ export async function publicSettings(
       _rev: configDoc._rev,
       config: {
         ...config,
+        ...branding,
         google,
+        googleDatasourceConfigured,
         oidc,
         isSSOEnforced,
         oidcCallbackUrl: _oidcCallbackUrl,
diff --git a/packages/worker/src/api/controllers/global/self.ts b/packages/worker/src/api/controllers/global/self.ts
index 78e5bf7164..d0232bee60 100644
--- a/packages/worker/src/api/controllers/global/self.ts
+++ b/packages/worker/src/api/controllers/global/self.ts
@@ -2,7 +2,6 @@ import * as userSdk from "../../../sdk/users"
 import {
   featureFlags,
   tenancy,
-  constants,
   db as dbCore,
   utils,
   encryption,
@@ -11,7 +10,7 @@ import {
 import env from "../../../environment"
 import { groups } from "@budibase/pro"
 import { UpdateSelfRequest, UpdateSelfResponse, UserCtx } from "@budibase/types"
-const { getCookie, clearCookie, newid } = utils
+const { newid } = utils
 
 function newTestApiKey() {
   return env.ENCRYPTED_TEST_PUBLIC_API_KEY
@@ -71,16 +70,6 @@ export async function fetchAPIKey(ctx: any) {
   ctx.body = cleanupDevInfo(devInfo)
 }
 
-const checkCurrentApp = (ctx: any) => {
-  const appCookie = getCookie(ctx, constants.Cookie.CurrentApp)
-  if (appCookie && !tenancy.isUserInAppTenant(appCookie.appId)) {
-    // there is a currentapp cookie from another tenant
-    // remove the cookie as this is incompatible with the builder
-    // due to builder and admin permissions being removed
-    clearCookie(ctx, constants.Cookie.CurrentApp)
-  }
-}
-
 /**
  * Add the attributes that are session based to the current user.
  */
@@ -101,8 +90,6 @@ export async function getSelf(ctx: any) {
     id: userId,
   }
 
-  checkCurrentApp(ctx)
-
   // get the main body of the user
   const user = await userSdk.getUser(userId)
   ctx.body = await groups.enrichUserRolesFromGroups(user)
diff --git a/packages/worker/src/api/controllers/system/environment.ts b/packages/worker/src/api/controllers/system/environment.ts
index 8ae0fcda3f..17cf73b5ed 100644
--- a/packages/worker/src/api/controllers/system/environment.ts
+++ b/packages/worker/src/api/controllers/system/environment.ts
@@ -7,6 +7,7 @@ export const fetch = async (ctx: BBContext) => {
     cloud: !env.SELF_HOSTED,
     accountPortalUrl: env.ACCOUNT_PORTAL_URL,
     disableAccountPortal: env.DISABLE_ACCOUNT_PORTAL,
+    baseUrl: env.PLATFORM_URL,
     // in test need to pretend its in production for the UI (Cypress)
     isDev: env.isDev() && !env.isTest(),
   }
diff --git a/packages/worker/src/api/controllers/system/tenants.ts b/packages/worker/src/api/controllers/system/tenants.ts
index 151507358f..476343a05e 100644
--- a/packages/worker/src/api/controllers/system/tenants.ts
+++ b/packages/worker/src/api/controllers/system/tenants.ts
@@ -5,7 +5,7 @@ export async function destroy(ctx: UserCtx) {
   const user = ctx.user!
   const tenantId = ctx.params.tenantId
 
-  if (tenantId !== user.tenantId) {
+  if (!ctx.internal && tenantId !== user.tenantId) {
     ctx.throw(403, "Tenant ID does not match current user")
   }
 
@@ -17,3 +17,7 @@ export async function destroy(ctx: UserCtx) {
     throw err
   }
 }
+
+export async function info(ctx: UserCtx) {
+  ctx.body = await tenantSdk.tenantInfo(ctx.params.tenantId)
+}
diff --git a/packages/worker/src/api/routes/global/tests/configs.spec.ts b/packages/worker/src/api/routes/global/tests/configs.spec.ts
index 1abe575b02..193dbf4a59 100644
--- a/packages/worker/src/api/routes/global/tests/configs.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/configs.spec.ts
@@ -286,14 +286,17 @@ describe("configs", () => {
         type: "settings",
         config: {
           company: "Budibase",
+          emailBrandingEnabled: true,
           logoUrl: "",
           analyticsEnabled: false,
           google: false,
+          googleDatasourceConfigured: false,
           googleCallbackUrl: `http://localhost:10000/api/global/auth/${config.tenantId}/google/callback`,
           isSSOEnforced: false,
           oidc: false,
           oidcCallbackUrl: `http://localhost:10000/api/global/auth/${config.tenantId}/oidc/callback`,
           platformUrl: "http://localhost:10000",
+          testimonialsEnabled: true,
         },
       }
       delete body._rev
diff --git a/packages/worker/src/api/routes/system/tests/environment.spec.ts b/packages/worker/src/api/routes/system/tests/environment.spec.ts
index 0f7a690abc..4e6907a9d7 100644
--- a/packages/worker/src/api/routes/system/tests/environment.spec.ts
+++ b/packages/worker/src/api/routes/system/tests/environment.spec.ts
@@ -23,6 +23,7 @@ describe("/api/system/environment", () => {
         disableAccountPortal: 0,
         isDev: false,
         multiTenancy: true,
+        baseUrl: "http://localhost:10000",
       })
     })
   })
diff --git a/packages/worker/src/constants/index.ts b/packages/worker/src/constants/index.ts
index dba058eabb..4301569a3a 100644
--- a/packages/worker/src/constants/index.ts
+++ b/packages/worker/src/constants/index.ts
@@ -20,6 +20,7 @@ export enum TemplateType {
 }
 
 export enum EmailTemplatePurpose {
+  CORE = "core",
   BASE = "base",
   PASSWORD_RECOVERY = "password_recovery",
   INVITATION = "invitation",
diff --git a/packages/worker/src/constants/templates/core.hbs b/packages/worker/src/constants/templates/core.hbs
new file mode 100644
index 0000000000..b7f9658d8c
--- /dev/null
+++ b/packages/worker/src/constants/templates/core.hbs
@@ -0,0 +1,33 @@
+{{#if enableEmailBranding}}
+  <tr>
+    <td cellpadding="0" cellspacing="0">
+      <table
+        align="center"
+        width="570"
+        cellpadding="0"
+        cellspacing="0"
+        role="presentation"
+      >
+        <tbody>
+          <tr>
+            <td
+              style="padding:0 35px; padding-top: 15px;"
+              cellpadding="0"
+              cellspacing="0"
+            >
+              <img
+                width="32px"
+                style="margin-right:16px; vertical-align: middle;"
+                alt="Budibase Logo"
+                src="https://i.imgur.com/Xhdt1YP.png"
+              />
+              <strong style="vertical-align: middle; font-size: 1.1em">
+                Budibase
+              </strong>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </td>
+  </tr>
+{{/if}}
\ No newline at end of file
diff --git a/packages/worker/src/constants/templates/index.ts b/packages/worker/src/constants/templates/index.ts
index b0b6029c36..1feac62040 100644
--- a/packages/worker/src/constants/templates/index.ts
+++ b/packages/worker/src/constants/templates/index.ts
@@ -21,6 +21,7 @@ export const EmailTemplates = {
     join(__dirname, "welcome.hbs")
   ),
   [EmailTemplatePurpose.CUSTOM]: readStaticFile(join(__dirname, "custom.hbs")),
+  [EmailTemplatePurpose.CORE]: readStaticFile(join(__dirname, "core.hbs")),
 }
 
 export function addBaseTemplates(templates: Template[], type?: string) {
diff --git a/packages/worker/src/sdk/tenants/tenants.ts b/packages/worker/src/sdk/tenants/tenants.ts
index 829b144c75..4f580402f7 100644
--- a/packages/worker/src/sdk/tenants/tenants.ts
+++ b/packages/worker/src/sdk/tenants/tenants.ts
@@ -74,3 +74,10 @@ async function removeTenantUsers(tenantId: string) {
     throw err
   }
 }
+
+export async function tenantInfo(tenantId: string) {
+  const globalDbName = tenancy.getGlobalDBName(tenantId)
+  return {
+    exists: await dbCore.dbExists(globalDbName),
+  }
+}
diff --git a/packages/worker/src/tests/api/tenants.ts b/packages/worker/src/tests/api/tenants.ts
index b28b55697f..16f970915a 100644
--- a/packages/worker/src/tests/api/tenants.ts
+++ b/packages/worker/src/tests/api/tenants.ts
@@ -2,8 +2,10 @@ import TestConfiguration from "../TestConfiguration"
 import { TestAPI, TestAPIOpts } from "./base"
 
 export class TenantAPI extends TestAPI {
+  config: TestConfiguration
   constructor(config: TestConfiguration) {
     super(config)
+    this.config = config
   }
 
   delete = (tenantId: string, opts?: TestAPIOpts) => {
diff --git a/packages/worker/src/utilities/configs.ts b/packages/worker/src/utilities/configs.ts
new file mode 100644
index 0000000000..97420582c7
--- /dev/null
+++ b/packages/worker/src/utilities/configs.ts
@@ -0,0 +1,27 @@
+import * as pro from "@budibase/pro"
+
+export async function getLicensedConfig() {
+  let licensedConfig: object = {}
+  const defaults = {
+    emailBrandingEnabled: true,
+    testimonialsEnabled: true,
+    platformTitle: undefined,
+    metaDescription: undefined,
+    loginHeading: undefined,
+    loginButton: undefined,
+    metaImageUrl: undefined,
+    metaTitle: undefined,
+  }
+
+  try {
+    // License/Feature Checks
+    const enabled = await pro.features.isBrandingEnabled()
+    if (!enabled) {
+      licensedConfig = { ...defaults }
+    }
+  } catch (e) {
+    licensedConfig = { ...defaults }
+    console.info("Could not retrieve license", e)
+  }
+  return licensedConfig
+}
diff --git a/packages/worker/src/utilities/email.ts b/packages/worker/src/utilities/email.ts
index 4fd8a82161..fcd022cd92 100644
--- a/packages/worker/src/utilities/email.ts
+++ b/packages/worker/src/utilities/email.ts
@@ -1,6 +1,6 @@
 import env from "../environment"
 import { EmailTemplatePurpose, TemplateType } from "../constants"
-import { getTemplateByPurpose } from "../constants/templates"
+import { getTemplateByPurpose, EmailTemplates } from "../constants/templates"
 import { getSettingsTemplateContext } from "./templates"
 import { processString } from "@budibase/string-templates"
 import { getResetPasswordCode, getInviteCode } from "./redis"
@@ -109,11 +109,16 @@ async function buildEmail(
     getTemplateByPurpose(TYPE, EmailTemplatePurpose.BASE),
     getTemplateByPurpose(TYPE, purpose),
   ])
-  if (!base || !body) {
+
+  // Change from branding to core
+  let core = EmailTemplates[EmailTemplatePurpose.CORE]
+
+  if (!base || !body || !core) {
     throw "Unable to build email, missing base components"
   }
   base = base.contents
   body = body.contents
+
   let name = user ? user.name : undefined
   if (user && !name && user.firstName) {
     name = user.lastName ? `${user.firstName} ${user.lastName}` : user.firstName
@@ -126,8 +131,12 @@ async function buildEmail(
     user: user || {},
   }
 
-  body = await processString(body, context)
-  // this should now be the complete email HTML
+  // Prepend the core template
+  const fullBody = core + body
+
+  body = await processString(fullBody, context)
+
+  // this should now be the core email HTML
   return processString(base, {
     ...context,
     body,
diff --git a/packages/worker/src/utilities/templates.ts b/packages/worker/src/utilities/templates.ts
index 1597325c7c..13fc5ef0cf 100644
--- a/packages/worker/src/utilities/templates.ts
+++ b/packages/worker/src/utilities/templates.ts
@@ -1,17 +1,22 @@
 import { tenancy, configs } from "@budibase/backend-core"
+import { SettingsInnerConfig } from "@budibase/types"
 import {
   InternalTemplateBinding,
   LOGO_URL,
   EmailTemplatePurpose,
 } from "../constants"
 import { checkSlashesInUrl } from "./index"
+import { getLicensedConfig } from "./configs"
+
 const BASE_COMPANY = "Budibase"
+import * as pro from "@budibase/pro"
 
 export async function getSettingsTemplateContext(
   purpose: EmailTemplatePurpose,
   code?: string | null
 ) {
-  let settings = await configs.getSettingsConfig()
+  const settings = await configs.getSettingsConfig()
+  const branding = await pro.branding.getBrandingConfig(settings)
   const URL = settings.platformUrl
   const context: any = {
     [InternalTemplateBinding.LOGO_URL]:
@@ -25,6 +30,9 @@ export async function getSettingsTemplateContext(
     [InternalTemplateBinding.CURRENT_DATE]: new Date().toISOString(),
     [InternalTemplateBinding.CURRENT_YEAR]: new Date().getFullYear(),
   }
+
+  context["enableEmailBranding"] = branding.emailBrandingEnabled === true
+
   // attach purpose specific context
   switch (purpose) {
     case EmailTemplatePurpose.PASSWORD_RECOVERY:
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 638f073f7c..c5b9acf663 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.27-alpha.8":
-  version "2.4.27-alpha.8"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.27-alpha.8.tgz#c733674998ec22650be930f0071091649202e333"
-  integrity sha512-wXrQ43dqdzSpgr+Bu7z6cEUg+DZUKKZeV4e0ow7QlqnR3izczIB6vT9xiKomxKeyp9auUVaUA5jsCm1gUhZ04g==
+"@budibase/backend-core@2.4.43":
+  version "2.4.43"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.43.tgz#801cdad706a90f6718e9323dd66e7e664cc9b287"
+  integrity sha512-pxMjFsCugkR/lR6XsA4bAbBEnUta92jjeUIY4C//hjczHF0lwEUWqhhR8QRCMaNTrWoJfZBFGnJyNIqfguyDVw==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "2.4.27-alpha.8"
+    "@budibase/types" "^2.4.43"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.27-alpha.8":
-  version "2.4.27-alpha.8"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.27-alpha.8.tgz#c405ef42ceebd9f1bbfe19f541777fa8a0c0b44a"
-  integrity sha512-eRRSY51D/xgYG2IwrBVCqCv7udf3It09I/VXEsxwmbWTz6qlFSEmnKjEKM0GhTJaMU8XAGkD0JIMaLPhhlSUbA==
+"@budibase/pro@2.4.43":
+  version "2.4.43"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.43.tgz#e717000a26fd4c183a984a141965945a26ac83d9"
+  integrity sha512-J/Up28bSV5E2UTQBpaTOXvNG1jQqRj8fcZH5TSqS7ymJ2H4OyLOQvEGFL3roCGnN3Dgrzkfv9LBO0JyRORVtSw==
   dependencies:
-    "@budibase/backend-core" "2.4.27-alpha.8"
+    "@budibase/backend-core" "2.4.43"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.27-alpha.8"
+    "@budibase/types" "2.4.43"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.27-alpha.8":
-  version "2.4.27-alpha.8"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.27-alpha.8.tgz#d8fc065a00a40207bf64a45b94fab3a7247a91c9"
-  integrity sha512-mUFgly36rPk2Wfro2vdKMmd210Ix9dYYw5TZGme9W8DjU+fFfqFgOOpNLMeU2grONPlq4O3j8K8VCq5+a1+gfg==
+"@budibase/types@2.4.43", "@budibase/types@^2.4.43":
+  version "2.4.43"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.43.tgz#2f6e609bada8855c83dfb26deb3b2d64dbb2d401"
+  integrity sha512-OWr8dNjk3VjjAJ4Rni/+AMGDtCDhz7LrZqxgedL0wKiRwgwkSiBNExh1eIZ/NKlt1vZrzH/GG5jhzlPkYqDTQg==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
diff --git a/qa-core/package.json b/qa-core/package.json
index 9a5cc8dc32..3f818b7aaa 100644
--- a/qa-core/package.json
+++ b/qa-core/package.json
@@ -21,7 +21,7 @@
     "api:test:ci": "start-server-and-test api:server:setup:ci http://localhost:4100/builder test",
     "api:test": "start-server-and-test api:server:setup http://localhost:4100/builder test",
     "api:test:local": "env-cmd jest --runInBand --testPathIgnorePatterns=\\\"\\/dataSources\\/\\\"",
-    "api:test:nightly": "env-cmd jest --runInBand --outputFile=testResults.json"
+    "api:test:nightly": "env-cmd jest --runInBand --json --outputFile=testResults.json"
   },
   "jest": {
     "preset": "ts-jest",
diff --git a/qa-core/scripts/testResultsWebhook.js b/qa-core/scripts/testResultsWebhook.js
index fc00bf34ad..b4725cae56 100644
--- a/qa-core/scripts/testResultsWebhook.js
+++ b/qa-core/scripts/testResultsWebhook.js
@@ -10,7 +10,7 @@ const GITHUB_ACTIONS_RUN_URL = process.env.GITHUB_ACTIONS_RUN_URL
 
 async function generateReport() {
   // read the report file
-  const REPORT_PATH = path.resolve(__dirname, "..", "testReport.json")
+  const REPORT_PATH = path.resolve(__dirname, "..", "testResults.json")
   const report = fs.readFileSync(REPORT_PATH, "utf-8")
   return JSON.parse(report)
 }