Merge pull request #2699 from Budibase/develop

Develop -> Master
2021-09-22 09:33:08 +01:00 · 2021-09-22 09:33:08 +01:00 · 067194bf71
parent f65cf13f97 3ba43a1b35
commit 067194bf71
315 changed files with 6365 additions and 3104 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -1,6 +1,6 @@
 name: Budibase Release

-on: 
+on:
 push:
    branches:
      - master
@ -15,20 +15,20 @@ env:
  POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }}
  POSTHOG_URL: ${{ secrets.POSTHOG_URL }}
  SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-      
+
 jobs:
  release:
-    runs-on: ubuntu-latest 
+    runs-on: ubuntu-latest

    steps:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v1
        with:
          node-version: 12.x
-      - run: yarn 
-      - run: yarn bootstrap 
-      - run: yarn lint 
-      - run: yarn build 
+      - run: yarn
+      - run: yarn bootstrap
+      - run: yarn lint
+      - run: yarn build
      - run: yarn test

      - name: Configure AWS Credentials
@ -41,11 +41,11 @@ jobs:
      - name: Publish budibase packages to NPM
        env:
          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: | 
+        run: |
          # setup the username and email. I tend to use 'GitHub Actions Bot' with no email by default
          git config user.name "Budibase Release Bot"
          git config user.email "<>"
-          echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc 
+          echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc
          yarn release

      - name: 'Get Previous tag'
@ -86,4 +86,3 @@ jobs:
          charts_dir: docs
        env:
          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    
--- a/3
+++ b/3
@ -5,8 +5,7 @@ Each Budibase package has its own license:
 builder: GPLv3
 server: GPLv3
 client: MPLv2.0
-standard-components: MPLv2.0

-You can consider Budibase to be GPLv3 licensed. 
+You can consider Budibase to be GPLv3 licensed.

 The apps that you build with Budibase do not fall under GPLv3 - hence why our components and client library are licensed differently.
--- a/SECURITY.md
+++ b/SECURITY.md
@ -0,0 +1,15 @@
+# Security Policy
+
+## Versions
+
+As an open source product, we will only patch the latest major version for security vulnerabilities. Previous versions of budibase will not be retroactively patched.
+
+## Disclosing
+
+You can get in touch with us regarding a vulnerability via email at community@budibase.com.
+
+You can also disclose via huntr.dev. If you believe you have found a vulnerability, please disclose it on huntr and let us know.
+
+https://huntr.dev/bounties/disclose
+
+This will enable us to review the vulnerability and potentially reward you for your work.
--- a/hosting/docker-compose.yaml
+++ b/hosting/docker-compose.yaml
@ -51,6 +51,7 @@ services:
      INTERNAL_API_KEY: ${INTERNAL_API_KEY}
      REDIS_URL: redis-service:6379
      REDIS_PASSWORD: ${REDIS_PASSWORD}
+      ACCOUNT_PORTAL_URL: https://portal.budi.live
    volumes:
      - ./logs:/logs
    depends_on:
@ -107,7 +108,7 @@ services:
    depends_on:
      - couchdb-service
    command: ["sh","-c","sleep 10 && $${PUT_CALL}/_users && $${PUT_CALL}/_replicator; fg;"]
-  
+
  redis-service:
    restart: always
    image: redis
@ -116,7 +117,7 @@ services:
      - "${REDIS_PORT}:6379"
    volumes:
      - redis_data:/data
-  
+
  watchtower-service:
    image: containrrr/watchtower
    ports:
--- a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml
+++ b/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml
@ -87,6 +87,8 @@ spec:
          {{ end }}
        - name: SELF_HOSTED
          value: {{ .Values.globals.selfHosted | quote }}
+        - name: ACCOUNT_PORTAL_URL
+          value: {{ .Values.globals.accountPortalUrl | quote }}
        image: budibase/worker
        imagePullPolicy: Always
        name: bbworker
--- a/hosting/kubernetes/budibase/values.yaml
+++ b/hosting/kubernetes/budibase/values.yaml
@ -44,7 +44,7 @@ ingress:
  nginx: true
  certificateArn: ""
  className: ""
-  annotations: 
+  annotations:
    kubernetes.io/ingress.class: nginx
  hosts:
    - host: # change if using custom domain
@ -55,7 +55,7 @@ ingress:
          service:
            name: proxy-service
            port:
-              number: 10000 
+              number: 10000

 resources: {}
  # We usually recommend not to specify default resources and to leave this as a conscious
@ -86,9 +86,10 @@ globals:
  budibaseEnv: PRODUCTION
  enableAnalytics: false
  posthogToken: ""
-  sentryDSN: "" 
+  sentryDSN: ""
  logLevel: info
  selfHosted: 1
+  accountPortalUrL: ""
  createSecrets: true # creates an internal API key, JWT secrets and redis password for you

  # if createSecrets is set to false, you can hard-code your secrets here
@ -120,7 +121,7 @@ services:
    password: "" # only change if pointing to existing couch server
    port: 5984
    storage: 100Mi
-  
+
  redis:
    enabled: true # disable if using external redis
    port: 6379
@ -128,15 +129,15 @@ services:
    url: "" # only change if pointing to existing redis cluster and enabled: false
    password: "budibase" # recommended to override if using built-in redis
    storage: 100Mi
-  
+
  objectStore:
    minio: true
    browser: true
    port: 9000
    replicaCount: 1
    accessKey: "" # AWS_ACCESS_KEY if using S3 or existing minio access key
-    secretKey: "" # AWS_SECRET_ACCESS_KEY if using S3 or existing minio secret 
-    region: "" # AWS_REGION if using S3 or existing minio secret 
-    url: "" # only change if pointing to existing minio cluster and minio: false 
+    secretKey: "" # AWS_SECRET_ACCESS_KEY if using S3 or existing minio secret
+    region: "" # AWS_REGION if using S3 or existing minio secret
+    url: "" # only change if pointing to existing minio cluster and minio: false
    storage: 100Mi

--- a/hosting/kubernetes/envoy/envoy.yaml
+++ b/hosting/kubernetes/envoy/envoy.yaml
@ -28,12 +28,12 @@ static_resources:
              - match: { prefix: "/builder" }
                route:
                  cluster: app-service
-              
+
              - match: { prefix: "/app_" }
                route:
                  cluster: app-service

-              # special case for worker admin API
+              # special cases for worker admin (deprecated), global and system API
              - match: { prefix: "/api/global/" }
                route:
                  cluster: worker-service
@ -50,13 +50,13 @@ static_resources:
                route:
                  cluster: app-service

-              # special case for when API requests are made, can just forward, not to minio    
+              # special case for when API requests are made, can just forward, not to minio
              - match: { prefix: "/api/" }
                route:
                  cluster: app-service

              - match: { prefix: "/worker/" }
-                route: 
+                route:
                  cluster: worker-service
                  prefix_rewrite: "/"

@ -85,7 +85,7 @@ static_resources:
      - lb_endpoints:
        - endpoint:
            address:
-              socket_address: 
+              socket_address:
                address: app-service.budibase.svc.cluster.local
                port_value: 4002

@ -113,7 +113,7 @@ static_resources:
      - lb_endpoints:
        - endpoint:
            address:
-              socket_address: 
+              socket_address:
                address: worker-service.budibase.svc.cluster.local
                port_value: 4001

--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "0.9.139",
+  "version": "0.9.140-alpha.0",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/package.json
+++ b/package.json
@ -20,7 +20,6 @@
    "setup": "node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev",
    "bootstrap": "lerna link && lerna bootstrap",
    "build": "lerna run build",
-    "initialise": "lerna run initialise",
    "publishdev": "lerna run publishdev",
    "publishnpm": "yarn build && lerna publish --force-publish",
    "release": "yarn build && lerna publish patch --yes --force-publish",
@ -49,6 +48,8 @@
    "release:helm": "./scripts/release_helm_chart.sh",
    "multi:enable": "lerna run multi:enable",
    "multi:disable": "lerna run multi:disable",
+    "selfhost:enable": "lerna run selfhost:enable",
+    "selfhost:disable": "lerna run selfhost:disable",
    "postinstall": "husky install"
  }
 }
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/auth",
-  "version": "0.9.139",
+  "version": "0.9.140-alpha.0",
  "description": "Authentication middlewares for budibase builder and apps",
  "main": "src/index.js",
  "author": "Budibase",
--- a/packages/auth/scripts/jestSetup.js
+++ b/packages/auth/scripts/jestSetup.js
@ -1,5 +1,6 @@
 const env = require("../src/environment")

+env._set("SELF_HOSTED", "1")
 env._set("NODE_ENV", "jest")
 env._set("JWT_SECRET", "test-jwtsecret")
 env._set("LOG_LEVEL", "silent")
--- a/packages/auth/src/cache/user.js
+++ b/packages/auth/src/cache/user.js
@ -1,9 +1,42 @@
 const redis = require("../redis/authRedis")
 const { getTenantId, lookupTenantId, getGlobalDB } = require("../tenancy")
+const env = require("../environment")
+const accounts = require("../cloud/accounts")

 const EXPIRY_SECONDS = 3600

-exports.getUser = async (userId, tenantId = null) => {
+/**
+ * The default populate user function
+ */
+const populateFromDB = async (userId, tenantId) => {
+  const user = await getGlobalDB(tenantId).get(userId)
+  user.budibaseAccess = true
+
+  if (!env.SELF_HOSTED) {
+    const account = await accounts.getAccount(user.email)
+    if (account) {
+      user.account = account
+      user.accountPortalAccess = true
+    }
+  }
+
+  return user
+}
+
+/**
+ * Get the requested user by id.
+ * Use redis cache to first read the user.
+ * If not present fallback to loading the user directly and re-caching.
+ * @param {*} userId the id of the user to get
+ * @param {*} tenantId the tenant of the user to get
+ * @param {*} populateUser function to provide the user for re-caching. default to couch db
+ * @returns
+ */
+exports.getUser = async (
+  userId,
+  tenantId = null,
+  populateUser = populateFromDB
+) => {
  if (!tenantId) {
    try {
      tenantId = getTenantId()
@ -15,7 +48,7 @@ exports.getUser = async (userId, tenantId = null) => {
  // try cache
  let user = await client.get(userId)
  if (!user) {
-    user = await getGlobalDB(tenantId).get(userId)
+    user = await populateUser(userId, tenantId)
    client.store(userId, user, EXPIRY_SECONDS)
  }
  if (user && !user.tenantId && tenantId) {
--- a/packages/auth/src/cloud/accounts.js
+++ b/packages/auth/src/cloud/accounts.js
@ -0,0 +1,22 @@
+const API = require("./api")
+const env = require("../environment")
+
+const api = new API(env.ACCOUNT_PORTAL_URL)
+
+// TODO: Authorization
+
+exports.getAccount = async email => {
+  const payload = {
+    email,
+  }
+  const response = await api.post(`/api/accounts/search`, {
+    body: payload,
+  })
+  const json = await response.json()
+
+  if (response.status !== 200) {
+    throw Error(`Error getting account by email ${email}`, json)
+  }
+
+  return json[0]
+}
--- a/packages/auth/src/cloud/api.js
+++ b/packages/auth/src/cloud/api.js
@ -0,0 +1,44 @@
+const fetch = require("node-fetch")
+class API {
+  constructor(host) {
+    this.host = host
+  }
+
+  apiCall =
+    method =>
+    async (url = "", options = {}) => {
+      if (!options.headers) {
+        options.headers = {}
+      }
+
+      if (!options.headers["Content-Type"]) {
+        options.headers = {
+          "Content-Type": "application/json",
+          Accept: "application/json",
+          ...options.headers,
+        }
+      }
+
+      let json = options.headers["Content-Type"] === "application/json"
+
+      const requestOptions = {
+        method: method,
+        body: json ? JSON.stringify(options.body) : options.body,
+        headers: options.headers,
+        // TODO: See if this is necessary
+        credentials: "include",
+      }
+
+      const resp = await fetch(`${this.host}${url}`, requestOptions)
+
+      return resp
+    }
+
+  post = this.apiCall("POST")
+  get = this.apiCall("GET")
+  patch = this.apiCall("PATCH")
+  del = this.apiCall("DELETE")
+  put = this.apiCall("PUT")
+}
+
+module.exports = API
--- a/packages/auth/src/db/utils.js
+++ b/packages/auth/src/db/utils.js
@ -35,10 +35,6 @@ exports.APP_PREFIX = DocumentTypes.APP + SEPARATOR
 exports.APP_DEV = exports.APP_DEV_PREFIX = DocumentTypes.APP_DEV + SEPARATOR
 exports.SEPARATOR = SEPARATOR

-function isDevApp(app) {
-  return app.appId.startsWith(exports.APP_DEV_PREFIX)
-}
-
 /**
 * If creating DB allDocs/query params with only a single top level ID this can be used, this
 * is usually the case as most of our docs are top level e.g. tables, automations, users and so on.
@ -62,6 +58,18 @@ function getDocParams(docType, docId = null, otherProps = {}) {
  }
 }

+exports.isDevAppID = appId => {
+  return appId.startsWith(exports.APP_DEV_PREFIX)
+}
+
+exports.isProdAppID = appId => {
+  return appId.startsWith(exports.APP_PREFIX) && !exports.isDevAppID(appId)
+}
+
+function isDevApp(app) {
+  return exports.isDevAppID(app.appId)
+}
+
 /**
 * Given an app ID this will attempt to retrieve the tenant ID from it.
 * @return {null|string} The tenant ID found within the app ID.
--- a/packages/auth/src/environment.js
+++ b/packages/auth/src/environment.js
@ -20,6 +20,8 @@ module.exports = {
  MINIO_URL: process.env.MINIO_URL,
  INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
  MULTI_TENANCY: process.env.MULTI_TENANCY,
+  ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
+  SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
  isTest,
  _set(key, value) {
    process.env[key] = value
--- a/packages/auth/src/middleware/authenticated.js
+++ b/packages/auth/src/middleware/authenticated.js
@ -21,7 +21,10 @@ function finalise(
 * The tenancy modules should not be used here and it should be assumed that the tenancy context
 * has not yet been populated.
 */
-module.exports = (noAuthPatterns = [], opts = { publicAllowed: false }) => {
+module.exports = (
+  noAuthPatterns = [],
+  opts = { publicAllowed: false, populateUser: null }
+) => {
  const noAuthOptions = noAuthPatterns ? buildMatcherRegex(noAuthPatterns) : []
  return async (ctx, next) => {
    let publicEndpoint = false
@ -46,7 +49,15 @@ module.exports = (noAuthPatterns = [], opts = { publicAllowed: false }) => {
          error = "No session found"
        } else {
          try {
-            user = await getUser(userId, session.tenantId)
+            if (opts && opts.populateUser) {
+              user = await getUser(
+                userId,
+                session.tenantId,
+                opts.populateUser(ctx)
+              )
+            } else {
+              user = await getUser(userId, session.tenantId)
+            }
            delete user.password
            authenticated = true
          } catch (err) {
--- a/packages/auth/src/redis/utils.js
+++ b/packages/auth/src/redis/utils.js
@ -8,11 +8,13 @@ const REDIS_PASSWORD = !env.REDIS_PASSWORD ? "budibase" : env.REDIS_PASSWORD

 exports.Databases = {
  PW_RESETS: "pwReset",
+  VERIFICATIONS: "verification",
  INVITATIONS: "invitation",
  DEV_LOCKS: "devLocks",
  DEBOUNCE: "debounce",
  SESSIONS: "session",
  USER_CACHE: "users",
+  FLAGS: "flags",
 }

 exports.SEPARATOR = SEPARATOR
--- a/packages/auth/src/tenancy/tenancy.js
+++ b/packages/auth/src/tenancy/tenancy.js
@ -63,6 +63,7 @@ exports.tryAddTenant = async (tenantId, userId, email) => {
  }
  if (emailDoc) {
    emailDoc.tenantId = tenantId
+    emailDoc.userId = userId
    promises.push(db.put(emailDoc))
  }
  if (tenants.tenantIds.indexOf(tenantId) === -1) {
--- 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": "0.9.139",
+  "version": "0.9.140-alpha.0",
  "license": "AGPL-3.0",
  "svelte": "src/index.js",
  "module": "dist/bbui.es.js",
--- a/packages/bbui/src/ActionButton/ActionButton.svelte
+++ b/packages/bbui/src/ActionButton/ActionButton.svelte
@ -12,6 +12,7 @@
  export let dataCy = null
  export let size = "M"
  export let active = false
+  export let fullWidth = false

  function longPress(element) {
    if (!longPressable) return
@ -40,6 +41,7 @@
  class:spectrum-ActionButton--quiet={quiet}
  class:spectrum-ActionButton--emphasized={emphasized}
  class:is-selected={selected}
+  class:fullWidth
  class="spectrum-ActionButton spectrum-ActionButton--size{size}"
  class:active
  {disabled}
@ -71,6 +73,9 @@
 </button>

 <style>
+  .fullWidth {
+    width: 100%;
+  }
  .active,
  .active svg {
    color: var(--spectrum-global-color-blue-600);
--- a/packages/bbui/src/Badge/Badge.svelte
+++ b/packages/bbui/src/Badge/Badge.svelte
@ -7,6 +7,7 @@
  export let orange = false
  export let yellow = false
  export let seafoam = false
+  export let green = false
  export let active = false
  export let inactive = false
 </script>
@ -17,6 +18,7 @@
  class:spectrum-Label--large={size === "L"}
  class:spectrum-Label--grey={grey}
  class:spectrum-Label--red={red}
+  class:spectrum-Label--green={green}
  class:spectrum-Label--orange={orange}
  class:spectrum-Label--yellow={yellow}
  class:spectrum-Label--seafoam={seafoam}
--- a/packages/bbui/src/Drawer/Drawer.svelte
+++ b/packages/bbui/src/Drawer/Drawer.svelte
@ -6,9 +6,8 @@
  import Heading from "../Typography/Heading.svelte"

  export let title
-
+  export let fillWidth
  let visible = false
-
  export function show() {
    if (visible) {
      return
@ -34,7 +33,7 @@

 {#if visible}
  <Portal>
-    <section class="drawer" transition:slide>
+    <section class:fillWidth class="drawer" transition:slide>
      <header>
        <div class="text">
          <Heading size="XS">{title}</Heading>
@ -63,6 +62,10 @@
    z-index: 2;
  }

+  .fillWidth {
+    width: calc(100% - 260px) !important;
+  }
+
  header {
    display: flex;
    justify-content: space-between;
--- a/packages/bbui/src/Form/Core/DatePicker.svelte
+++ b/packages/bbui/src/Form/Core/DatePicker.svelte
@ -13,6 +13,7 @@
  export let enableTime = true
  export let value = null
  export let placeholder = null
+  export let appendTo = undefined

  const dispatch = createEventDispatcher()
  const flatpickrId = `${generateID()}-wrapper`
@ -24,6 +25,7 @@
    altInput: true,
    altFormat: enableTime ? "F j Y, H:i" : "F j, Y",
    wrap: true,
+    appendTo,
  }

  const handleChange = event => {
--- a/packages/bbui/src/Form/DatePicker.svelte
+++ b/packages/bbui/src/Form/DatePicker.svelte
@ -10,6 +10,7 @@
  export let error = null
  export let enableTime = true
  export let placeholder = null
+  export let appendTo = undefined

  const dispatch = createEventDispatcher()
  const onChange = e => {
@ -26,6 +27,7 @@
    {value}
    {placeholder}
    {enableTime}
+    {appendTo}
    on:change={onChange}
  />
 </Field>
--- a/packages/bbui/src/Icon/Icon.svelte
+++ b/packages/bbui/src/Icon/Icon.svelte
@ -36,7 +36,7 @@
    transition: color var(--spectrum-global-animation-duration-100, 130ms);
  }
  svg.hoverable:hover {
-    color: var(--spectrum-alias-icon-color-selected);
+    color: var(--spectrum-alias-icon-color-selected-hover);
    cursor: pointer;
  }

--- a/packages/bbui/src/Layout/Page.svelte
+++ b/packages/bbui/src/Layout/Page.svelte
@ -21,8 +21,5 @@
  .wide {
    max-width: none;
    margin: 0;
-    padding: var(--spacing-xl) calc(var(--spacing-xl) * 2)
-      calc(var(--spacing-xl) * 2) calc(var(--spacing-xl) * 2);
-    min-height: calc(100% - var(--spacing-xl) * 3);
  }
 </style>
--- a/packages/bbui/src/Modal/ModalContent.svelte
+++ b/packages/bbui/src/Modal/ModalContent.svelte
@ -46,8 +46,10 @@
      <h1
        class="spectrum-Dialog-heading spectrum-Dialog-heading--noHeader"
        class:noDivider={!showDivider}
+        class:header-spacing={$$slots.header}
      >
        {title}
+        <slot name="header" />
      </h1>
      {#if showDivider}
        <Divider size="M" />
@ -120,4 +122,9 @@
  .close-icon :global(svg) {
    margin-right: 0;
  }
+
+  .header-spacing {
+    display: flex;
+    justify-content: space-between;
+  }
 </style>
--- a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte
+++ b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte
@ -13,7 +13,7 @@
    }
  }

-  export let value = false
+  export let value = null
  export let minValue = 0
  export let maxValue = 100

@ -42,7 +42,7 @@

 <div
  on:click
-  class:spectrum-ProgressCircle--indeterminate={!value}
+  class:spectrum-ProgressCircle--indeterminate={value == null}
  class:spectrum-ProgressCircle--overBackground={overBackground}
  class="spectrum-ProgressCircle spectrum-ProgressCircle--{convertSize(size)}"
 >
--- a/packages/bbui/src/SideNavigation/Item.svelte
+++ b/packages/bbui/src/SideNavigation/Item.svelte
@ -13,6 +13,7 @@
  class="spectrum-SideNav-item"
  class:is-selected={selected}
  class:is-disabled={disabled}
+  on:click
 >
  {#if heading}
    <h2 class="spectrum-SideNav-heading" id="nav-heading-{heading}">
--- a/packages/bbui/src/Table/Table.svelte
+++ b/packages/bbui/src/Table/Table.svelte
@ -3,6 +3,7 @@
  import "@spectrum-css/table/dist/index-vars.css"
  import CellRenderer from "./CellRenderer.svelte"
  import SelectEditRenderer from "./SelectEditRenderer.svelte"
+  import { cloneDeep } from "lodash"

  /**
   * The expected schema is our normal couch schemas for our tables.
@ -197,7 +198,7 @@

  const editRow = (e, row) => {
    e.stopPropagation()
-    dispatch("editrow", row)
+    dispatch("editrow", cloneDeep(row))
  }

  const toggleSelectRow = row => {
--- a/packages/builder/assets/discord.svg
+++ b/packages/builder/assets/discord.svg
@ -0,0 +1,10 @@
+<svg width="71" height="55" viewBox="0 0 71 55" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z" fill="#5865F2"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="71" height="55" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- a/packages/builder/assets/integromat.png
+++ b/packages/builder/assets/integromat.png
--- a/packages/builder/assets/n8n.png
+++ b/packages/builder/assets/n8n.png
--- a/packages/builder/assets/slack.svg
+++ b/packages/builder/assets/slack.svg
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 132 132" style="enable-background:new 0 0 132 132;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#E01E5A;}
+	.st1{fill:#36C5F0;}
+	.st2{fill:#2EB67D;}
+	.st3{fill:#ECB22E;}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M30.4,82.2c0,7.1-5.8,12.9-12.9,12.9S4.6,89.3,4.6,82.2c0-7.1,5.8-12.9,12.9-12.9h12.9V82.2z"/>
+		<path class="st0" d="M36.9,82.2c0-7.1,5.8-12.9,12.9-12.9s12.9,5.8,12.9,12.9v32.3c0,7.1-5.8,12.9-12.9,12.9s-12.9-5.8-12.9-12.9
+			C36.9,114.5,36.9,82.2,36.9,82.2z"/>
+	</g>
+	<g>
+		<path class="st1" d="M49.8,30.4c-7.1,0-12.9-5.8-12.9-12.9S42.7,4.6,49.8,4.6s12.9,5.8,12.9,12.9v12.9H49.8z"/>
+		<path class="st1" d="M49.8,36.9c7.1,0,12.9,5.8,12.9,12.9s-5.8,12.9-12.9,12.9H17.5c-7.1,0-12.9-5.8-12.9-12.9s5.8-12.9,12.9-12.9
+			C17.5,36.9,49.8,36.9,49.8,36.9z"/>
+	</g>
+	<g>
+		<path class="st2" d="M101.6,49.8c0-7.1,5.8-12.9,12.9-12.9c7.1,0,12.9,5.8,12.9,12.9s-5.8,12.9-12.9,12.9h-12.9V49.8z"/>
+		<path class="st2" d="M95.1,49.8c0,7.1-5.8,12.9-12.9,12.9c-7.1,0-12.9-5.8-12.9-12.9V17.5c0-7.1,5.8-12.9,12.9-12.9
+			c7.1,0,12.9,5.8,12.9,12.9V49.8z"/>
+	</g>
+	<g>
+		<path class="st3" d="M82.2,101.6c7.1,0,12.9,5.8,12.9,12.9c0,7.1-5.8,12.9-12.9,12.9c-7.1,0-12.9-5.8-12.9-12.9v-12.9H82.2z"/>
+		<path class="st3" d="M82.2,95.1c-7.1,0-12.9-5.8-12.9-12.9c0-7.1,5.8-12.9,12.9-12.9h32.3c7.1,0,12.9,5.8,12.9,12.9
+			c0,7.1-5.8,12.9-12.9,12.9H82.2z"/>
+	</g>
+</g>
+</svg>
--- a/packages/builder/assets/zapier.png
+++ b/packages/builder/assets/zapier.png
--- a/packages/builder/cypress/integration/createAutomation.spec.js
+++ b/packages/builder/cypress/integration/createAutomation.spec.js
@ -7,26 +7,42 @@ context("Create a automation", () => {
  // https://on.cypress.io/interacting-with-elements
  it("should create a automation", () => {
    cy.createTestTableWithData()
-
+    cy.wait(2000)
    cy.contains("Automate").click()
    cy.get("[data-cy='new-screen'] > .spectrum-Icon").click()
-    cy.get(".spectrum-Dialog-grid").within(() => {
+    cy.get(".modal-inner-wrapper").within(() => {
      cy.get("input").type("Add Row")
+      cy.contains("Row Created").click()
+      cy.wait(500)
      cy.get(".spectrum-Button--cta").click()
    })

-    // Add trigger
-    cy.contains("Trigger").click()
-    cy.contains("Row Created").click()
-    cy.get(".setup").within(() => {
-      cy.get(".spectrum-Picker-label").click()
-      cy.contains("dog").click()
-    })
+    // Setup trigger
+    cy.contains("Setup").click()
+    cy.get(".spectrum-Picker-label").click()
+    cy.wait(500)
+    cy.contains("dog").click()

    // Create action
-    cy.contains("Action").click()
-    cy.contains("Create Row").click()
-    cy.get(".setup").within(() => {
+    cy.contains("Add Action").click()
+    cy.get(".modal-inner-wrapper").within(() => {
+      cy.wait(1000)
+      cy.contains("Create Row").trigger('mouseover').click().click()
+      cy.get(".spectrum-Button--cta").click()
+    })
+    cy.contains("Setup").click()
+    cy.get(".spectrum-Picker-label").click()
+    cy.contains("dog").click()
+    cy.get(".spectrum-Textfield-input")
+    .first()
+    .type("goodboy")
+    cy.get(".spectrum-Textfield-input")
+      .eq(1)
+      .type("11")
+
+    cy.contains("Run test").click()
+    cy.get(".modal-inner-wrapper").within(() => {
+      cy.wait(1000)
      cy.get(".spectrum-Picker-label").click()
      cy.contains("dog").click()
      cy.get(".spectrum-Textfield-input")
@ -35,19 +51,12 @@ context("Create a automation", () => {
      cy.get(".spectrum-Textfield-input")
        .eq(1)
        .type("11")
+      cy.get(".spectrum-Textfield-input")
+        .eq(2)
+        .type("123456")
+      cy.get(".spectrum-Textfield-input")
+        .eq(3)
+        .type("123456")
    })
-
-    // Save
-    cy.contains("Save Automation").click()
-
-    // Activate Automation
-    cy.get("[data-cy=activate-automation]").click()
-  })
-
-  it("should add row when a new row is added", () => {
-    cy.contains("Data").click()
-    cy.addRow(["Rover", 15])
-    cy.reload()
-    cy.contains("goodboy").should("have.text", "goodboy")
  })
 })
--- a/packages/builder/cypress/setup.js
+++ b/packages/builder/cypress/setup.js
@ -23,6 +23,7 @@ process.env.MINIO_SECRET_KEY = "budibase"
 process.env.COUCH_DB_USER = "budibase"
 process.env.COUCH_DB_PASSWORD = "budibase"
 process.env.INTERNAL_API_KEY = "budibase"
+process.env.ALLOW_DEV_AUTOMATIONS = 1

 // Stop info logs polluting test outputs
 process.env.LOG_LEVEL = "error"
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@ -34,12 +34,11 @@ Cypress.Commands.add("createApp", name => {
  cy.get(".spectrum-Modal")
    .within(() => {
      cy.get("input").eq(0).type(name).should("have.value", name).blur()
-      cy.contains("Create app").click()
+      cy.get(".spectrum-ButtonGroup").contains("Create app").click()
    })
    .then(() => {
-      cy.get(".selected > .content", {
-        timeout: 20000,
-      }).should("be.visible")
+      cy.expandBudibaseConnection()
+      cy.get(".nav-item.selected > .content").should("be.visible")
    })
 })

@ -83,6 +82,7 @@ Cypress.Commands.add("createTable", tableName => {

 Cypress.Commands.add("addColumn", (tableName, columnName, type) => {
  // Select Table
+  cy.selectTable(tableName)
  cy.contains(".nav-item", tableName).click()
  cy.contains("Create column").click()

@ -161,3 +161,15 @@ Cypress.Commands.add("createScreen", (screenName, route) => {
    cy.get(".spectrum-Button--cta").click()
  })
 })
+
+Cypress.Commands.add("expandBudibaseConnection", () => {
+  if (Cypress.$(".nav-item > .content > .opened").length === 0) {
+    // expand the Budibase DB connection string
+    cy.get(".icon.arrow").eq(0).click()
+  }
+})
+
+Cypress.Commands.add("selectTable", tableName => {
+  cy.expandBudibaseConnection()
+  cy.contains(".nav-item", tableName).click()
+})
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "0.9.139",
+  "version": "0.9.140-alpha.0",
  "license": "AGPL-3.0",
  "private": true,
  "scripts": {
@ -65,10 +65,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^0.9.139",
-    "@budibase/client": "^0.9.139",
+    "@budibase/bbui": "^0.9.140-alpha.0",
+    "@budibase/client": "^0.9.140-alpha.0",
    "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.139",
+    "@budibase/string-templates": "^0.9.140-alpha.0",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@ -1,6 +1,10 @@
 import { cloneDeep } from "lodash/fp"
 import { get } from "svelte/store"
-import { findComponent, findComponentPath } from "./storeUtils"
+import {
+  findComponent,
+  findComponentPath,
+  findAllMatchingComponents,
+} from "./storeUtils"
 import { store } from "builderStore"
 import { tables as tablesStore, queries as queriesStores } from "stores/backend"
 import { makePropSafe } from "@budibase/string-templates"
@ -18,7 +22,9 @@ export const getBindableProperties = (asset, componentId) => {
  const userBindings = getUserBindings()
  const urlBindings = getUrlBindings(asset)
  const deviceBindings = getDeviceBindings()
+  const stateBindings = getStateBindings()
  return [
+    ...stateBindings,
    ...deviceBindings,
    ...urlBindings,
    ...contextBindings,
@ -256,6 +262,22 @@ const getDeviceBindings = () => {
  return bindings
 }

+/**
+ * Gets all state bindings that are globally available.
+ */
+const getStateBindings = () => {
+  let bindings = []
+  if (get(store).clientFeatures?.state) {
+    const safeState = makePropSafe("state")
+    bindings = getAllStateVariables().map(key => ({
+      type: "context",
+      runtimeBinding: `${safeState}.${makePropSafe(key)}`,
+      readableBinding: `State.${key}`,
+    }))
+  }
+  return bindings
+}
+
 /**
 * Gets all bindable properties from URL parameters.
 */
@ -458,3 +480,49 @@ export function runtimeToReadableBinding(bindableProperties, textWithBindings) {
    "readableBinding"
  )
 }
+
+/**
+ * Returns an array of the keys of any state variables which are set anywhere
+ * in the app.
+ */
+export const getAllStateVariables = () => {
+  let allComponents = []
+
+  // Find all onClick settings in all layouts
+  get(store).layouts.forEach(layout => {
+    const components = findAllMatchingComponents(
+      layout.props,
+      c => c.onClick != null
+    )
+    allComponents = allComponents.concat(components || [])
+  })
+
+  // Find all onClick settings in all screens
+  get(store).screens.forEach(screen => {
+    const components = findAllMatchingComponents(
+      screen.props,
+      c => c.onClick != null
+    )
+    allComponents = allComponents.concat(components || [])
+  })
+
+  // Add state bindings for all state actions
+  let bindingSet = new Set()
+  allComponents.forEach(component => {
+    if (!Array.isArray(component.onClick)) {
+      return
+    }
+    component.onClick.forEach(action => {
+      if (
+        action["##eventHandlerType"] === "Update State" &&
+        action.parameters?.type === "set" &&
+        action.parameters?.key &&
+        action.parameters?.value
+      ) {
+        bindingSet.add(action.parameters.key)
+      }
+    })
+  })
+
+  return Array.from(bindingSet)
+}
--- a/packages/builder/src/builderStore/store/automation/Automation.js
+++ b/packages/builder/src/builderStore/store/automation/Automation.js
@ -13,6 +13,10 @@ export default class Automation {
    return this.automation.definition.trigger
  }

+  addTestData(data) {
+    this.automation.testData = data
+  }
+
  addBlock(block) {
    // Make sure to add trigger if doesn't exist
    if (!this.hasTrigger() && block.type === "TRIGGER") {
--- a/packages/builder/src/builderStore/store/automation/index.js
+++ b/packages/builder/src/builderStore/store/automation/index.js
@ -17,7 +17,6 @@ const automationActions = store => ({
      state.blockDefinitions = {
        TRIGGER: jsonResponses[1].trigger,
        ACTION: jsonResponses[1].action,
-        LOGIC: jsonResponses[1].logic,
      }
      // if previously selected find the new obj and select it
      if (selected) {
@ -46,21 +45,24 @@ const automationActions = store => ({
      return state
    })
  },
-  save: async ({ automation }) => {
+  save: async automation => {
    const UPDATE_AUTOMATION_URL = `/api/automations`
    const response = await api.put(UPDATE_AUTOMATION_URL, automation)
    const json = await response.json()
    store.update(state => {
+      const newAutomation = json.automation
      const existingIdx = state.automations.findIndex(
        existing => existing._id === automation._id
      )
-      state.automations.splice(existingIdx, 1, json.automation)
-      state.automations = state.automations
-      store.actions.select(json.automation)
-      return state
+      if (existingIdx !== -1) {
+        state.automations.splice(existingIdx, 1, newAutomation)
+        state.automations = [...state.automations]
+        store.actions.select(newAutomation)
+        return state
+      }
    })
  },
-  delete: async ({ automation }) => {
+  delete: async automation => {
    const { _id, _rev } = automation
    const DELETE_AUTOMATION_URL = `/api/automations/${_id}/${_rev}`
    await api.delete(DELETE_AUTOMATION_URL)
@ -70,16 +72,24 @@ const automationActions = store => ({
        existing => existing._id === _id
      )
      state.automations.splice(existingIdx, 1)
-      state.automations = state.automations
+      state.automations = [...state.automations]
      state.selectedAutomation = null
      state.selectedBlock = null
      return state
    })
  },
-  trigger: async ({ automation }) => {
+  trigger: async automation => {
    const { _id } = automation
-    const TRIGGER_AUTOMATION_URL = `/api/automations/${_id}/trigger`
-    return await api.post(TRIGGER_AUTOMATION_URL)
+    return await api.post(`/api/automations/${_id}/trigger`)
+  },
+  test: async (automation, testData) => {
+    const { _id } = automation
+    const response = await api.post(`/api/automations/${_id}/test`, testData)
+    const json = await response.json()
+    store.update(state => {
+      state.selectedAutomation.testResults = json
+      return state
+    })
  },
  select: automation => {
    store.update(state => {
@ -88,6 +98,12 @@ const automationActions = store => ({
      return state
    })
  },
+  addTestDataToAutomation: data => {
+    store.update(state => {
+      state.selectedAutomation.addTestData(data)
+      return state
+    })
+  },
  addBlockToAutomation: block => {
    store.update(state => {
      const newBlock = state.selectedAutomation.addBlock(cloneDeep(block))
@ -129,7 +145,6 @@ export const getAutomationStore = () => {
    blockDefinitions: {
      TRIGGER: [],
      ACTION: [],
-      LOGIC: [],
    },
    selectedAutomation: null,
  }
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@ -41,6 +41,9 @@ const INITIAL_FRONTEND_STATE = {
    spectrumThemes: false,
    intelligentLoading: false,
    deviceAwareness: false,
+    state: false,
+    customThemes: false,
+    devicePreview: false,
  },
  currentFrontEndType: "none",
  selectedScreenId: "",
@ -53,6 +56,8 @@ const INITIAL_FRONTEND_STATE = {
  routes: {},
  clientLibPath: "",
  theme: "",
+  customTheme: {},
+  previewDevice: "desktop",
 }

 export const getFrontendStore = () => {
@ -77,6 +82,7 @@ export const getFrontendStore = () => {
        layouts,
        screens,
        theme: application.theme || "spectrum--light",
+        customTheme: application.customTheme,
        hasAppPackage: true,
        appInstance: application.instance,
        clientLibPath,
@ -110,6 +116,22 @@ export const getFrontendStore = () => {
        }
      },
    },
+    customTheme: {
+      save: async customTheme => {
+        const appId = get(store).appId
+        const response = await api.put(`/api/applications/${appId}`, {
+          customTheme,
+        })
+        if (response.status === 200) {
+          store.update(state => {
+            state.customTheme = customTheme
+            return state
+          })
+        } else {
+          throw new Error("Error updating theme")
+        }
+      },
+    },
    routing: {
      fetch: async () => {
        const response = await api.get("/api/routing")
@ -210,6 +232,12 @@ export const getFrontendStore = () => {
          await store.actions.layouts.save(selectedAsset)
        }
      },
+      setDevice: device => {
+        store.update(state => {
+          state.previewDevice = device
+          return state
+        })
+      },
    },
    layouts: {
      select: layoutId => {
--- a/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
@ -1,10 +1,8 @@
 <script>
  import { automationStore } from "builderStore"
  import Flowchart from "./FlowChart/FlowChart.svelte"
-  import BlockList from "./BlockList.svelte"

  $: automation = $automationStore.selectedAutomation?.automation
-
  function onSelect(block) {
    automationStore.update(state => {
      state.selectedBlock = block
@ -14,6 +12,5 @@
 </script>

 {#if automation}
-  <BlockList />
  <Flowchart {automation} {onSelect} />
 {/if}
--- a/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/BlockList.svelte
@ -1,108 +0,0 @@
-<script>
-  import { sortBy } from "lodash/fp"
-  import { automationStore } from "builderStore"
-  import { ActionButton, Popover, Modal } from "@budibase/bbui"
-  import { DropdownContainer, DropdownItem } from "components/common/Dropdowns"
-  import CreateWebhookModal from "../Shared/CreateWebhookModal.svelte"
-
-  $: hasTrigger = $automationStore.selectedAutomation.hasTrigger()
-  $: tabs = [
-    {
-      label: "Trigger",
-      value: "TRIGGER",
-      icon: "Algorithm",
-      disabled: hasTrigger,
-    },
-    {
-      label: "Action",
-      value: "ACTION",
-      icon: "Actions",
-      disabled: !hasTrigger,
-    },
-    {
-      label: "Logic",
-      value: "LOGIC",
-      icon: "Filter",
-      disabled: !hasTrigger,
-    },
-  ]
-
-  let selectedIndex
-  let anchors = []
-  let popover
-  let webhookModal
-  $: selectedTab = selectedIndex == null ? null : tabs[selectedIndex].value
-  $: anchor = selectedIndex === -1 ? null : anchors[selectedIndex]
-  $: blocks = sortBy(entry => entry[1].name)(
-    Object.entries($automationStore.blockDefinitions[selectedTab] ?? {})
-  )
-
-  function onChangeTab(idx) {
-    selectedIndex = idx
-    popover.show()
-  }
-
-  function closePopover() {
-    selectedIndex = null
-    popover.hide()
-  }
-
-  function addBlockToAutomation(stepId, blockDefinition) {
-    const newBlock = $automationStore.selectedAutomation.constructBlock(
-      selectedTab,
-      stepId,
-      blockDefinition
-    )
-    automationStore.actions.addBlockToAutomation(newBlock)
-    closePopover()
-    if (stepId === "WEBHOOK") {
-      webhookModal.show()
-    }
-  }
-</script>
-
-<div class="tab-container">
-  {#each tabs as tab, idx}
-    <div bind:this={anchors[idx]}>
-      <ActionButton
-        quiet
-        size="S"
-        icon={tab.icon}
-        disabled={tab.disabled}
-        on:click={tab.disabled ? null : () => onChangeTab(idx)}
-      >
-        {tab.label}
-      </ActionButton>
-    </div>
-  {/each}
-</div>
-<Popover
-  on:close={() => (selectedIndex = null)}
-  bind:this={popover}
-  {anchor}
-  align="left"
->
-  <DropdownContainer>
-    {#each blocks as [stepId, blockDefinition]}
-      <DropdownItem
-        icon={blockDefinition.icon}
-        title={blockDefinition.name}
-        subtitle={blockDefinition.description}
-        on:click={() => addBlockToAutomation(stepId, blockDefinition)}
-      />
-    {/each}
-  </DropdownContainer>
-</Popover>
-<Modal bind:this={webhookModal} width="30%">
-  <CreateWebhookModal />
-</Modal>
-
-<style>
-  .tab-container {
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: center;
-    min-height: 24px;
-  }
-</style>
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@ -0,0 +1,135 @@
+<script>
+  import { ModalContent, Layout, Detail, Body, Icon } from "@budibase/bbui"
+  import { automationStore } from "builderStore"
+  import { database } from "stores/backend"
+  import { externalActions } from "./ExternalActions"
+  $: instanceId = $database._id
+
+  let selectedAction
+  let actionVal
+  let actions = Object.entries($automationStore.blockDefinitions.ACTION)
+  export let blockComplete
+
+  const external = actions.reduce((acc, elm) => {
+    const [k, v] = elm
+    if (!v.internal) {
+      acc[k] = v
+    }
+    return acc
+  }, {})
+
+  const internal = actions.reduce((acc, elm) => {
+    const [k, v] = elm
+    if (v.internal) {
+      acc[k] = v
+    }
+    return acc
+  }, {})
+
+  const selectAction = action => {
+    actionVal = action
+    selectedAction = action.name
+  }
+
+  async function addBlockToAutomation() {
+    const newBlock = $automationStore.selectedAutomation.constructBlock(
+      "ACTION",
+      actionVal.stepId,
+      actionVal
+    )
+    automationStore.actions.addBlockToAutomation(newBlock)
+    await automationStore.actions.save(
+      $automationStore.selectedAutomation?.automation
+    )
+  }
+</script>
+
+<ModalContent
+  title="Create Automation"
+  confirmText="Save"
+  size="M"
+  disabled={!selectedAction}
+  onConfirm={() => {
+    blockComplete = true
+    addBlockToAutomation()
+  }}
+>
+  <Body size="XS">Select an app or event.</Body>
+  <Layout noPadding>
+    <Body size="S">Apps</Body>
+
+    <div class="item-list">
+      {#each Object.entries(external) as [idx, action]}
+        <div
+          class="item"
+          class:selected={selectedAction === action.name}
+          on:click={() => selectAction(action)}
+        >
+          <div class="item-body">
+            <img
+              width="20"
+              height="20"
+              src={externalActions[action.stepId].icon}
+              alt="zapier"
+            />
+            <span class="icon-spacing">
+              <Body size="XS">{idx.charAt(0).toUpperCase() + idx.slice(1)}</Body
+              ></span
+            >
+          </div>
+        </div>
+      {/each}
+    </div>
+
+    <Detail size="S">Actions</Detail>
+
+    <div class="item-list">
+      {#each Object.entries(internal) as [idx, action]}
+        <div
+          class="item"
+          class:selected={selectedAction === action.name}
+          on:click={() => selectAction(action)}
+        >
+          <div class="item-body">
+            <Icon name={action.icon} />
+            <span class="icon-spacing">
+              <Body size="XS">{action.name}</Body></span
+            >
+          </div>
+        </div>
+      {/each}
+    </div>
+  </Layout>
+</ModalContent>
+
+<style>
+  .icon-spacing {
+    margin-left: var(--spacing-m);
+  }
+  .item-body {
+    display: flex;
+    margin-left: var(--spacing-m);
+  }
+  .item-list {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+    grid-gap: var(--spectrum-alias-grid-baseline);
+  }
+
+  .item {
+    cursor: pointer;
+    display: grid;
+    grid-gap: var(--spectrum-alias-grid-margin-xsmall);
+    padding: var(--spectrum-alias-item-padding-s);
+    background: var(--spectrum-alias-background-color-secondary);
+    transition: 0.3s all;
+    border: solid var(--spectrum-alias-border-color);
+    border-radius: 5px;
+    box-sizing: border-box;
+    border-width: 2px;
+  }
+  .item:hover,
+  .selected {
+    background: var(--spectrum-alias-background-color-tertiary);
+  }
+</style>
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/Arrow.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/Arrow.svelte
@ -6,6 +6,7 @@
  xmlns="http://www.w3.org/2000/svg"
 >
  <path
+    stroke-dasharray="5,5"
    d="M5.0625 70H9L4.5 75L0 70H3.9375V65H5.0625V70Z"
    fill="var(--grey-5)"
  />
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ExternalActions.js
@ -0,0 +1,11 @@
+import DiscordLogo from "assets/discord.svg"
+import ZapierLogo from "assets/zapier.png"
+import IntegromatLogo from "assets/integromat.png"
+import SlackLogo from "assets/slack.svg"
+
+export const externalActions = {
+  zapier: { name: "zapier", icon: ZapierLogo },
+  discord: { name: "discord", icon: DiscordLogo },
+  slack: { name: "slack", icon: SlackLogo },
+  integromat: { name: "integromat", icon: IntegromatLogo },
+}
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
@ -1,12 +1,23 @@
 <script>
+  import { automationStore } from "builderStore"
+  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
  import FlowItem from "./FlowItem.svelte"
-  import Arrow from "./Arrow.svelte"
+  import TestDataModal from "./TestDataModal.svelte"
  import { flip } from "svelte/animate"
  import { fade, fly } from "svelte/transition"
+  import {
+    Detail,
+    Icon,
+    ActionButton,
+    notifications,
+    Modal,
+  } from "@budibase/bbui"

  export let automation
  export let onSelect
+  let testDataModal
  let blocks
+  let confirmDeleteDialog

  $: {
    blocks = []
@ -17,37 +28,108 @@
      blocks = blocks.concat(automation.definition.steps || [])
    }
  }
+
+  async function deleteAutomation() {
+    await automationStore.actions.delete(
+      $automationStore.selectedAutomation?.automation
+    )
+    notifications.success("Automation deleted.")
+  }
+
+  async function testAutomation() {
+    const result = await automationStore.actions.trigger(
+      $automationStore.selectedAutomation.automation
+    )
+    if (result.status === 200) {
+      notifications.success(
+        `Automation ${$automationStore.selectedAutomation.automation.name} triggered successfully.`
+      )
+    } else {
+      notifications.error(
+        `Failed to trigger automation ${$automationStore.selectedAutomation.automation.name}.`
+      )
+    }
+    return result
+  }
 </script>

-{#if !blocks.length}<i>Add a trigger to your automation to get started</i>{/if}
-<section class="canvas">
-  {#each blocks as block, idx (block.id)}
-    <div
-      class="block"
-      animate:flip={{ duration: 600 }}
-      in:fade|local
-      out:fly|local={{ x: 100 }}
-    >
-      <FlowItem {onSelect} {block} />
-      {#if idx !== blocks.length - 1}
-        <Arrow />
-      {/if}
+<div class="canvas">
+  <div class="content">
+    <div class="title">
+      <div class="subtitle">
+        <Detail size="L">{automation.name}</Detail>
+        <div
+          style="display:flex;
+          color: var(--spectrum-global-color-gray-400);"
+        >
+          <span class="iconPadding">
+            <div class="icon">
+              <Icon
+                on:click={confirmDeleteDialog.show}
+                hoverable
+                name="DeleteOutline"
+              />
+            </div>
+          </span>
+          <ActionButton
+            on:click={() => {
+              testDataModal.show()
+            }}
+            icon="MultipleCheck"
+            size="S">Run test</ActionButton
+          >
+        </div>
+      </div>
    </div>
-  {/each}
-</section>
+    {#each blocks as block, idx (block.id)}
+      <div
+        class="block"
+        animate:flip={{ duration: 800 }}
+        in:fade|local
+        out:fly|local={{ x: 500 }}
+      >
+        <FlowItem {testDataModal} {testAutomation} {onSelect} {block} />
+        {#if idx !== blocks.length - 1}
+          <div class="separator" />
+          <Icon name="AddCircle" size="S" />
+          <div class="separator" />
+        {/if}
+      </div>
+    {/each}
+  </div>
+  <ConfirmDialog
+    bind:this={confirmDeleteDialog}
+    okText="Delete Automation"
+    onOk={deleteAutomation}
+    title="Confirm Deletion"
+  >
+    Are you sure you wish to delete the automation
+    <i>{automation.name}?</i>
+    This action cannot be undone.
+  </ConfirmDialog>
+
+  <Modal bind:this={testDataModal} width="30%">
+    <TestDataModal {testAutomation} />
+  </Modal>
+</div>

 <style>
-  section {
+  .separator {
+    width: 1px;
+    height: 25px;
+    border-left: 1px dashed var(--grey-4);
+    color: var(--grey-4);
+    /* center horizontally */
+    align-self: center;
+  }
+  .canvas {
    margin: 0 -40px calc(-1 * var(--spacing-l)) -40px;
-    padding: var(--spacing-l) 40px 0 40px;
-    display: flex;
-    align-items: center;
-    flex-direction: column;
    overflow-y: auto;
-    flex: 1 1 auto;
+    text-align: center;
+    height: 100%;
  }
  /* Fix for firefox not respecting bottom padding in scrolling containers */
-  section > *:last-child {
+  .canvas > *:last-child {
    padding-bottom: 40px;
  }

@ -58,8 +140,24 @@
    align-items: center;
  }

-  i {
-    font-size: var(--font-size-m);
-    color: var(--grey-5);
+  .content {
+    display: inline-block;
+    text-align: left;
+  }
+
+  .title {
+    padding-bottom: var(--spacing-xl);
+  }
+
+  .subtitle {
+    padding-bottom: var(--spacing-xl);
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .icon {
+    cursor: pointer;
+    display: flex;
+    padding-right: var(--spacing-m);
  }
 </style>
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@ -1,86 +1,203 @@
 <script>
  import { automationStore } from "builderStore"
-  import AutomationBlockTagline from "./AutomationBlockTagline.svelte"
-  import { Icon } from "@budibase/bbui"
+  import {
+    Icon,
+    Divider,
+    Layout,
+    Body,
+    Detail,
+    Modal,
+    Button,
+    StatusLight,
+  } from "@budibase/bbui"
+  import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
+  import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
+  import ResultsModal from "./ResultsModal.svelte"
+  import ActionModal from "./ActionModal.svelte"
+  import { database } from "stores/backend"
+  import { externalActions } from "./ExternalActions"

  export let onSelect
  export let block
+  export let testDataModal
  let selected
+  let webhookModal
+  let actionModal
+  let resultsModal
+  let setupToggled
+  let blockComplete
+  $: testResult = $automationStore.selectedAutomation.testResults?.steps.filter(
+    step => step.stepId === block.stepId
+  )
+  $: instanceId = $database._id
+
+  $: isTrigger = block.type === "TRIGGER"

  $: selected = $automationStore.selectedBlock?.id === block.id
  $: steps =
    $automationStore.selectedAutomation?.automation?.definition?.steps ?? []
-  $: blockIdx = steps.findIndex(step => step.id === block.id)
-  $: allowDeleteTrigger = !steps.length

-  function deleteStep() {
+  $: blockIdx = steps.findIndex(step => step.id === block.id)
+  $: lastStep = !isTrigger && blockIdx + 1 === steps.length
+
+  // Logic for hiding / showing the add button.first we check if it has a child
+  // then we check to see whether its inputs have been commpleted
+  $: disableAddButton = isTrigger
+    ? $automationStore.selectedAutomation?.automation?.definition?.steps
+        .length > 0
+    : !isTrigger && steps.length - blockIdx > 1
+  $: hasCompletedInputs = Object.keys(
+    block.schema?.inputs?.properties || {}
+  ).every(x => block?.inputs[x])
+
+  async function deleteStep() {
    automationStore.actions.deleteAutomationBlock(block)
+    await automationStore.actions.save(
+      $automationStore.selectedAutomation?.automation
+    )
  }
 </script>

 <div
  class={`block ${block.type} hoverable`}
  class:selected
-  on:click={() => onSelect(block)}
+  on:click={() => {
+    onSelect(block)
+  }}
 >
-  <header>
-    {#if block.type === "TRIGGER"}
-      <Icon name="Light" />
-      <span>When this happens...</span>
-    {:else if block.type === "ACTION"}
-      <Icon name="FlashOn" />
-      <span>Do this...</span>
-    {:else if block.type === "LOGIC"}
-      <Icon name="Branch2" />
-      <span>Only continue if...</span>
-    {/if}
-    <div class="label">
-      {#if block.type === "TRIGGER"}Trigger{:else}Step {blockIdx + 1}{/if}
+  <div class="blockSection">
+    <div
+      on:click={() => {
+        blockComplete = !blockComplete
+      }}
+      class="splitHeader"
+    >
+      <div class="center-items">
+        {#if externalActions[block.stepId]}
+          <img
+            alt={externalActions[block.stepId].name}
+            width="28px"
+            height="28px"
+            src={externalActions[block.stepId].icon}
+          />
+        {:else}
+          <svg
+            width="28px"
+            height="28px"
+            class="spectrum-Icon"
+            style="color:grey;"
+            focusable="false"
+          >
+            <use xlink:href="#spectrum-icon-18-{block.icon}" />
+          </svg>
+        {/if}
+        <div class="iconAlign">
+          {#if isTrigger}
+            <Body size="XS">When this happens:</Body>
+          {:else}
+            <Body size="XS">Do this:</Body>
+          {/if}
+
+          <Detail size="S">{block?.name?.toUpperCase() || ""}</Detail>
+        </div>
+      </div>
+      {#if testResult}
+        <span on:click={() => resultsModal.show()}>
+          <StatusLight
+            positive={isTrigger || testResult[0].outputs?.success}
+            negative={!testResult[0].outputs?.success}
+            ><Body size="XS">View response</Body></StatusLight
+          >
+        </span>
+      {/if}
    </div>
-    {#if block.type !== "TRIGGER" || allowDeleteTrigger}
-      <div on:click|stopPropagation={deleteStep}><Icon name="Close" /></div>
-    {/if}
-  </header>
-  <hr />
-  <p>
-    <AutomationBlockTagline {block} />
-  </p>
+  </div>
+  {#if !blockComplete}
+    <Divider noMargin />
+    <div class="blockSection">
+      <Layout noPadding gap="S">
+        <div class="splitHeader">
+          <div
+            on:click|stopPropagation={() => {
+              setupToggled = !setupToggled
+            }}
+            class="center-items"
+          >
+            {#if setupToggled}
+              <Icon size="M" name="ChevronDown" />
+            {:else}
+              <Icon size="M" name="ChevronRight" />
+            {/if}
+            <Detail size="S">Setup</Detail>
+          </div>
+          {#if !isTrigger}
+            <div on:click={() => deleteStep()}>
+              <Icon name="DeleteOutline" />
+            </div>
+          {/if}
+        </div>
+
+        {#if setupToggled}
+          <AutomationBlockSetup
+            schemaProperties={Object.entries(block.schema.inputs.properties)}
+            {block}
+            {webhookModal}
+          />
+          {#if lastStep}
+            <Button on:click={() => testDataModal.show()} cta
+              >Finish and test automation</Button
+            >
+          {/if}
+          <Button
+            disabled={disableAddButton ? true : !hasCompletedInputs}
+            on:click={() => {
+              setupToggled = false
+              actionModal.show()
+            }}
+            primary={!isTrigger}
+            cta={isTrigger}>Add Action</Button
+          >
+        {/if}
+      </Layout>
+    </div>
+  {/if}
+
+  <Modal bind:this={resultsModal} width="30%">
+    <ResultsModal {isTrigger} {testResult} />
+  </Modal>
+
+  <Modal bind:this={actionModal} width="30%">
+    <ActionModal bind:blockComplete />
+  </Modal>
+
+  <Modal bind:this={webhookModal} width="30%">
+    <CreateWebhookModal />
+  </Modal>
 </div>

 <style>
+  .center-items {
+    display: flex;
+    align-items: center;
+  }
+  .splitHeader {
+    display: flex;
+    justify-content: space-between;
+  }
+  .iconAlign {
+    padding: 0 0 0 var(--spacing-m);
+    display: inline-block;
+  }
  .block {
    width: 360px;
-    padding: 20px;
-    border-radius: var(--border-radius-m);
-    transition: 0.3s all ease;
-    box-shadow: 0 4px 30px 0 rgba(57, 60, 68, 0.08);
    font-size: 16px;
-    background-color: var(--spectrum-global-color-gray-50);
+    background-color: var(--spectrum-alias-background-color-secondary);
    color: var(--grey-9);
-  }
-  .block.selected,
-  .block:hover {
-    transform: scale(1.1);
-    box-shadow: 0 4px 30px 0 rgba(57, 60, 68, 0.15);
+    border: 1px solid var(--spectrum-global-color-gray-300);
+    border-radius: 4px 4px 4px 4px;
  }

-  header {
-    font-size: 16px;
-    font-weight: 600;
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: center;
-    gap: var(--spacing-xs);
-  }
-  header span {
-    flex: 1 1 auto;
-  }
-  header .label {
-    font-size: 14px;
-    padding: var(--spacing-s);
-    border-radius: var(--border-radius-m);
-    background-color: var(--grey-2);
-    color: var(--grey-8);
+  .blockSection {
+    padding: var(--spacing-xl);
  }
 </style>
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ResultsModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ResultsModal.svelte
@ -0,0 +1,114 @@
+<script>
+  import { ModalContent, Icon, Detail, TextArea } from "@budibase/bbui"
+
+  export let testResult
+  export let isTrigger
+  let inputToggled
+  let outputToggled
+</script>
+
+<ModalContent
+  showCloseIcon={false}
+  showConfirmButton={false}
+  title="Test Automation"
+  cancelText="Close"
+>
+  <div slot="header">
+    <div style="float: right;">
+      {#if isTrigger || testResult[0].outputs.success}
+        <div class="iconSuccess">
+          <Icon size="S" name="CheckmarkCircle" />
+        </div>
+      {:else}
+        <div class="iconFailure">
+          <Icon size="S" name="CloseCircle" />
+        </div>
+      {/if}
+    </div>
+  </div>
+
+  <div
+    on:click={() => {
+      inputToggled = !inputToggled
+    }}
+    class="toggle splitHeader"
+  >
+    <div>
+      <div style="display: flex; align-items: center;">
+        <span style="padding-left: var(--spacing-s);">
+          <Detail size="S">Input</Detail>
+        </span>
+      </div>
+    </div>
+    <div>
+      {#if inputToggled}
+        <Icon size="M" name="ChevronDown" />
+      {:else}
+        <Icon size="M" name="ChevronRight" />
+      {/if}
+    </div>
+  </div>
+  {#if inputToggled}
+    <div class="text-area-container">
+      <TextArea
+        disabled
+        value={JSON.stringify(testResult[0].inputs, null, 2)}
+      />
+    </div>
+  {/if}
+
+  <div
+    on:click={() => {
+      outputToggled = !outputToggled
+    }}
+    class="toggle splitHeader"
+  >
+    <div>
+      <div style="display: flex; align-items: center;">
+        <span style="padding-left: var(--spacing-s);">
+          <Detail size="S">Output</Detail>
+        </span>
+      </div>
+    </div>
+    <div>
+      {#if outputToggled}
+        <Icon size="M" name="ChevronDown" />
+      {:else}
+        <Icon size="M" name="ChevronRight" />
+      {/if}
+    </div>
+  </div>
+  {#if outputToggled}
+    <div class="text-area-container">
+      <TextArea
+        disabled
+        value={JSON.stringify(testResult[0].outputs, null, 2)}
+      />
+    </div>
+  {/if}
+</ModalContent>
+
+<style>
+  .iconSuccess {
+    color: var(--spectrum-global-color-green-600);
+  }
+
+  .iconFailure {
+    color: var(--spectrum-global-color-red-600);
+  }
+
+  .splitHeader {
+    cursor: pointer;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .toggle {
+    display: flex;
+    align-items: center;
+  }
+
+  .text-area-container :global(textarea) {
+    height: 150px;
+  }
+</style>
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@ -0,0 +1,91 @@
+<script>
+  import { ModalContent, Tabs, Tab, TextArea, Label } from "@budibase/bbui"
+  import { automationStore } from "builderStore"
+  import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
+  import { cloneDeep } from "lodash/fp"
+
+  let failedParse = null
+  // clone the trigger so we're not mutating the reference
+  let trigger = cloneDeep(
+    $automationStore.selectedAutomation.automation.definition.trigger
+  )
+  let schemaProperties = Object.entries(trigger.schema.outputs.properties || {})
+
+  if (!$automationStore.selectedAutomation.automation.testData) {
+    $automationStore.selectedAutomation.automation.testData = {}
+  }
+
+  // get the outputs so we can define the fields
+
+  // check to see if there is existing test data in the store
+  $: testData = $automationStore.selectedAutomation.automation.testData
+  // Check the schema to see if required fields have been entered
+  $: isError = !trigger.schema.outputs.required.every(
+    required => testData[required]
+  )
+
+  function parseTestJSON(e) {
+    try {
+      const obj = JSON.parse(e.detail)
+      failedParse = null
+      automationStore.actions.addTestDataToAutomation(obj)
+    } catch (e) {
+      failedParse = "Invalid JSON"
+    }
+  }
+</script>
+
+<ModalContent
+  title="Add test data"
+  confirmText="Test"
+  showConfirmButton={true}
+  disabled={isError}
+  onConfirm={() => {
+    automationStore.actions.addTestDataToAutomation(testData)
+    automationStore.actions.test(
+      $automationStore.selectedAutomation?.automation,
+      testData
+    )
+  }}
+  cancelText="Cancel"
+>
+  <Tabs selected="Form" quiet
+    ><Tab icon="Form" title="Form">
+      <div class="tab-content-padding">
+        <AutomationBlockSetup
+          bind:testData
+          {schemaProperties}
+          isTestModal
+          block={trigger}
+        />
+      </div></Tab
+    >
+    <Tab icon="FileJson" title="JSON">
+      <div class="tab-content-padding">
+        <Label>JSON</Label>
+        <div class="text-area-container">
+          <TextArea
+            value={JSON.stringify(
+              $automationStore.selectedAutomation.automation.testData,
+              null,
+              2
+            )}
+            error={failedParse}
+            on:change={e => parseTestJSON(e)}
+          />
+        </div>
+      </div>
+    </Tab>
+  </Tabs>
+</ModalContent>
+
+<style>
+  .text-area-container :global(textarea) {
+    min-height: 200px;
+    height: 200px;
+  }
+
+  .tab-content-padding {
+    padding: 0 var(--spacing-xl);
+  }
+</style>
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
@ -6,7 +6,6 @@
  import EditAutomationPopover from "./EditAutomationPopover.svelte"

  $: selectedAutomationId = $automationStore.selectedAutomation?.automation?._id
-
  onMount(() => {
    automationStore.actions.fetch()
  })
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
@ -2,7 +2,9 @@
  import AutomationList from "./AutomationList.svelte"
  import CreateAutomationModal from "./CreateAutomationModal.svelte"
  import { Icon, Modal, Tabs, Tab } from "@budibase/bbui"
-  let modal
+
+  export let modal
+  export let webhookModal
 </script>

 <div class="title">
@ -11,7 +13,7 @@
      <div class="tab-content-padding">
        <AutomationList />
        <Modal bind:this={modal}>
-          <CreateAutomationModal />
+          <CreateAutomationModal {webhookModal} />
        </Modal>
      </div>
    </Tab>
--- a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
@ -3,12 +3,14 @@
  import { database } from "stores/backend"
  import { automationStore } from "builderStore"
  import { notifications } from "@budibase/bbui"
-  import { Icon, Input, ModalContent } from "@budibase/bbui"
+  import { Input, ModalContent, Layout, Body, Icon } from "@budibase/bbui"
  import analytics from "analytics"

  let name
+  let selectedTrigger
+  let triggerVal
+  export let webhookModal

-  $: valid = !!name
  $: instanceId = $database._id

  async function createAutomation() {
@ -16,41 +18,96 @@
      name,
      instanceId,
    })
+    const newBlock = $automationStore.selectedAutomation.constructBlock(
+      "TRIGGER",
+      triggerVal.stepId,
+      triggerVal
+    )
+
+    automationStore.actions.addBlockToAutomation(newBlock)
+    if (triggerVal.stepId === "WEBHOOK") {
+      webhookModal.show
+    }
+
+    await automationStore.actions.save(
+      $automationStore.selectedAutomation?.automation
+    )
+
    notifications.success(`Automation ${name} created.`)
+
    $goto(`./${$automationStore.selectedAutomation.automation._id}`)
    analytics.captureEvent("Automation Created", { name })
  }
+  $: triggers = Object.entries($automationStore.blockDefinitions.TRIGGER)
+
+  const selectTrigger = trigger => {
+    triggerVal = trigger
+    selectedTrigger = trigger.name
+  }
 </script>

 <ModalContent
  title="Create Automation"
-  confirmText="Create"
-  size="L"
+  confirmText="Save"
+  size="M"
  onConfirm={createAutomation}
-  disabled={!valid}
+  disabled={!selectedTrigger}
 >
+  <Body size="XS"
+    >Please name your automation, then select a trigger. Every automation must
+    start with a trigger.
+  </Body>
  <Input bind:value={name} label="Name" />
-  <a
-    slot="footer"
-    target="_blank"
-    href="https://docs.budibase.com/automate/introduction-to-automate"
-  >
-    <Icon name="InfoOutline" />
-    <span>Learn about automations</span>
-  </a>
+
+  <Layout noPadding>
+    <Body size="S">Triggers</Body>
+
+    <div class="item-list">
+      {#each triggers as [idx, trigger]}
+        <div
+          class="item"
+          class:selected={selectedTrigger === trigger.name}
+          on:click={() => selectTrigger(trigger)}
+        >
+          <div class="item-body">
+            <Icon name={trigger.icon} />
+            <span class="icon-spacing">
+              <Body size="S">{trigger.name}</Body></span
+            >
+          </div>
+        </div>
+      {/each}
+    </div>
+  </Layout>
 </ModalContent>

 <style>
-  a {
-    color: var(--ink);
-    font-size: 14px;
-    vertical-align: middle;
-    display: flex;
-    align-items: center;
-    text-decoration: none;
+  .icon-spacing {
+    margin-left: var(--spacing-m);
  }
-  a span {
-    text-decoration: underline;
-    margin-left: var(--spectrum-alias-item-padding-s);
+  .item-body {
+    display: flex;
+    margin-left: var(--spacing-m);
+  }
+  .item-list {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+    grid-gap: var(--spectrum-alias-grid-baseline);
+  }
+
+  .item {
+    cursor: pointer;
+    display: grid;
+    grid-gap: var(--spectrum-alias-grid-margin-xsmall);
+    padding: var(--spectrum-alias-item-padding-s);
+    background: var(--spectrum-alias-background-color-secondary);
+    transition: 0.3s all;
+    border: solid var(--spectrum-alias-border-color);
+    border-radius: 5px;
+    box-sizing: border-box;
+    border-width: 2px;
+  }
+  .selected {
+    background: var(--spectrum-alias-background-color-tertiary);
  }
 </style>
--- a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
@ -1,20 +1,17 @@
 <script>
  import { goto } from "@roxi/routify"
  import { automationStore } from "builderStore"
-  import { database } from "stores/backend"
  import { ActionMenu, MenuItem, notifications, Icon } from "@budibase/bbui"
  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import UpdateAutomationModal from "components/automation/AutomationPanel/UpdateAutomationModal.svelte"

  export let automation

  let confirmDeleteDialog
-  $: instanceId = $database._id
+  let updateAutomationDialog

  async function deleteAutomation() {
-    await automationStore.actions.delete({
-      instanceId,
-      automation,
-    })
+    await automationStore.actions.delete(automation)
    notifications.success("Automation deleted.")
    $goto("../automate")
  }
@ -24,9 +21,8 @@
  <div slot="control" class="icon">
    <Icon s hoverable name="MoreSmallList" />
  </div>
-  <MenuItem noClose icon="Delete" on:click={confirmDeleteDialog.show}>
-    Delete
-  </MenuItem>
+  <MenuItem icon="Edit" on:click={updateAutomationDialog.show}>Edit</MenuItem>
+  <MenuItem icon="Delete" on:click={confirmDeleteDialog.show}>Delete</MenuItem>
 </ActionMenu>

 <ConfirmDialog
@ -39,6 +35,7 @@
  <i>{automation.name}?</i>
  This action cannot be undone.
 </ConfirmDialog>
+<UpdateAutomationModal {automation} bind:this={updateAutomationDialog} />

 <style>
  div.icon {
--- a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
@ -0,0 +1,76 @@
+<script>
+  import { automationStore } from "builderStore"
+  import { notifications } from "@budibase/bbui"
+  import { Icon, Input, ModalContent, Modal } from "@budibase/bbui"
+  import analytics from "analytics"
+
+  let name
+  let error = ""
+  let modal
+
+  export let automation
+  export let onCancel = undefined
+
+  export const show = () => {
+    name = automation?.name
+    modal.show()
+  }
+  export const hide = () => {
+    modal.hide()
+  }
+
+  async function saveAutomation() {
+    const updatedAutomation = {
+      ...automation,
+      name,
+    }
+    await automationStore.actions.save(updatedAutomation)
+    notifications.success(`Automation ${name} updated successfully.`)
+    analytics.captureEvent("Automation Saved", { name })
+    hide()
+  }
+
+  function checkValid(evt) {
+    name = evt.target.value
+    if (!name) {
+      error = "Name is required"
+      return
+    }
+    error = ""
+  }
+</script>
+
+<Modal bind:this={modal} on:hide={onCancel}>
+  <ModalContent
+    title="Edit Automation"
+    confirmText="Save"
+    size="L"
+    onConfirm={saveAutomation}
+    disabled={error}
+  >
+    <Input bind:value={name} label="Name" on:input={checkValid} {error} />
+    <a
+      slot="footer"
+      target="_blank"
+      href="https://docs.budibase.com/automate/introduction-to-automate"
+    >
+      <Icon name="InfoOutline" />
+      <span>Learn about automations</span>
+    </a>
+  </ModalContent>
+</Modal>
+
+<style>
+  a {
+    color: var(--ink);
+    font-size: 14px;
+    vertical-align: middle;
+    display: flex;
+    align-items: center;
+    text-decoration: none;
+  }
+  a span {
+    text-decoration: underline;
+    margin-left: var(--spectrum-alias-item-padding-s);
+  }
+</style>
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@ -2,8 +2,16 @@
  import TableSelector from "./TableSelector.svelte"
  import RowSelector from "./RowSelector.svelte"
  import SchemaSetup from "./SchemaSetup.svelte"
-  import { Button, Input, Select, Label } from "@budibase/bbui"
+  import {
+    Button,
+    Input,
+    Select,
+    Label,
+    ActionButton,
+    Drawer,
+  } from "@budibase/bbui"
  import { automationStore } from "builderStore"
+  import { tables } from "stores/backend"
  import WebhookDisplay from "../Shared/WebhookDisplay.svelte"
  import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
  import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
@ -12,16 +20,47 @@
  import QueryParamSelector from "./QueryParamSelector.svelte"
  import CronBuilder from "./CronBuilder.svelte"
  import Editor from "components/integration/QueryEditor.svelte"
+  import { debounce } from "lodash"
+  import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
+  import FilterDrawer from "components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte"
+  // need the client lucene builder to convert to the structure API expects
+  import { buildLuceneQuery } from "../../../../../client/src/utils/lucene"

  export let block
  export let webhookModal
-  $: inputs = Object.entries(block.schema?.inputs?.properties || {})
+  export let testData
+  export let schemaProperties
+  export let isTestModal = false
+  let drawer
+  let tempFilters = lookForFilters(schemaProperties) || []
+  let fillWidth = true
  $: stepId = block.stepId
  $: bindings = getAvailableBindings(
-    block,
+    block || $automationStore.selectedBlock,
    $automationStore.selectedAutomation?.automation?.definition
  )

+  $: inputData = testData ? testData : block.inputs
+  $: tableId = inputData ? inputData.tableId : null
+  $: table = tableId
+    ? $tables.list.find(table => table._id === inputData.tableId)
+    : { schema: {} }
+  $: schemaFields = table ? Object.values(table.schema) : []
+
+  const onChange = debounce(
+    async function (e, key) {
+      if (isTestModal) {
+        testData[key] = e.detail
+      } else {
+        block.inputs[key] = e.detail
+        await automationStore.actions.save(
+          $automationStore.selectedAutomation?.automation
+        )
+      }
+    },
+    isTestModal ? 0 : 800
+  )
+
  function getAvailableBindings(block, automation) {
    if (!block || !automation) {
      return []
@ -52,64 +91,158 @@
    }
    return bindings
  }
+
+  function lookForFilters(properties) {
+    if (!properties) {
+      return []
+    }
+    let filters
+    const inputs = testData ? testData : block.inputs
+    for (let [key, field] of properties) {
+      // need to look for the builder definition (keyed separately, see saveFilters)
+      const defKey = `${key}-def`
+      if (field.customType === "filters" && inputs?.[defKey]) {
+        filters = inputs[defKey]
+        break
+      }
+    }
+    return filters || []
+  }
+
+  function saveFilters(key) {
+    const filters = 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)
+    drawer.hide()
+  }
 </script>

 <div class="fields">
-  <div class="block-label">{block.name}</div>
-  {#each inputs as [key, value]}
+  {#each schemaProperties as [key, value]}
    <div class="block-field">
-      <Label>{value.title}</Label>
+      <Label>{value.title || (key === "row" ? "Table" : key)}</Label>
      {#if value.type === "string" && value.enum}
        <Select
-          bind:value={block.inputs[key]}
+          on:change={e => onChange(e, key)}
+          value={inputData[key]}
          options={value.enum}
          getOptionLabel={(x, idx) => (value.pretty ? value.pretty[idx] : x)}
        />
+      {:else if value.customType === "column"}
+        <Select
+          on:change={e => onChange(e, key)}
+          value={inputData[key]}
+          options={Object.keys(table.schema)}
+        />
+      {:else if value.customType === "filters"}
+        <ActionButton on:click={drawer.show}>Define filters</ActionButton>
+        <Drawer bind:this={drawer} {fillWidth} title="Filtering">
+          <Button cta slot="buttons" on:click={() => saveFilters(key)}
+            >Save</Button
+          >
+          <FilterDrawer
+            slot="body"
+            bind:filters={tempFilters}
+            {bindings}
+            {schemaFields}
+            panel={AutomationBindingPanel}
+          />
+        </Drawer>
      {:else if value.customType === "password"}
-        <Input type="password" bind:value={block.inputs[key]} />
+        <Input
+          type="password"
+          on:change={e => onChange(e, key)}
+          value={inputData[key]}
+        />
      {:else if value.customType === "email"}
-        <DrawerBindableInput
-          title={value.title}
-          panel={AutomationBindingPanel}
-          type="email"
-          value={block.inputs[key]}
-          on:change={e => (block.inputs[key] = e.detail)}
+        {#if isTestModal}
+          <ModalBindableInput
+            title={value.title}
+            value={inputData[key]}
+            panel={AutomationBindingPanel}
+            type="email"
+            on:change={e => onChange(e, key)}
+            {bindings}
+            fillWidth
+          />
+        {:else}
+          <DrawerBindableInput
+            fillWidth
+            title={value.title}
+            panel={AutomationBindingPanel}
+            type="email"
+            value={inputData[key]}
+            on:change={e => onChange(e, key)}
+            {bindings}
+          />
+        {/if}
+      {:else if value.customType === "query"}
+        <QuerySelector
+          on:change={e => onChange(e, key)}
+          value={inputData[key]}
+        />
+      {:else if value.customType === "cron"}
+        <CronBuilder on:change={e => onChange(e, key)} value={inputData[key]} />
+      {:else if value.customType === "queryParams"}
+        <QueryParamSelector
+          on:change={e => onChange(e, key)}
+          value={inputData[key]}
          {bindings}
        />
-      {:else if value.customType === "query"}
-        <QuerySelector bind:value={block.inputs[key]} />
-      {:else if value.customType === "cron"}
-        <CronBuilder bind:value={block.inputs[key]} />
-      {:else if value.customType === "queryParams"}
-        <QueryParamSelector bind:value={block.inputs[key]} {bindings} />
      {:else if value.customType === "table"}
-        <TableSelector bind:value={block.inputs[key]} />
+        <TableSelector
+          value={inputData[key]}
+          on:change={e => onChange(e, key)}
+        />
      {:else if value.customType === "row"}
-        <RowSelector bind:value={block.inputs[key]} {bindings} />
+        <RowSelector
+          value={inputData[key]}
+          on:change={e => onChange(e, key)}
+          {bindings}
+        />
      {:else if value.customType === "webhookUrl"}
-        <WebhookDisplay value={block.inputs[key]} />
+        <WebhookDisplay value={inputData[key]} />
      {:else if value.customType === "triggerSchema"}
-        <SchemaSetup bind:value={block.inputs[key]} />
+        <SchemaSetup on:change={e => onChange(e, key)} value={inputData[key]} />
      {:else if value.customType === "code"}
        <CodeEditorModal>
          <pre>{JSON.stringify(bindings, null, 2)}</pre>
          <Editor
            mode="javascript"
            on:change={e => {
-              block.inputs[key] = e.detail.value
+              onChange(e, key)
+              inputData[key] = e.detail.value
            }}
-            value={block.inputs[key]}
+            value={inputData[key]}
          />
        </CodeEditorModal>
      {:else if value.type === "string" || value.type === "number"}
-        <DrawerBindableInput
-          title={value.title}
-          panel={AutomationBindingPanel}
-          type={value.customType}
-          value={block.inputs[key]}
-          on:change={e => (block.inputs[key] = e.detail)}
-          {bindings}
-        />
+        {#if isTestModal}
+          <ModalBindableInput
+            title={value.title}
+            value={inputData[key]}
+            panel={AutomationBindingPanel}
+            type={value.customType}
+            on:change={e => onChange(e, key)}
+            {bindings}
+          />
+        {:else}
+          <div class="test">
+            <DrawerBindableInput
+              fillWidth={true}
+              title={value.title}
+              panel={AutomationBindingPanel}
+              type={value.customType}
+              value={inputData[key]}
+              on:change={e => onChange(e, key)}
+              {bindings}
+            />
+          </div>
+        {/if}
      {/if}
    </div>
  {/each}
@ -132,9 +265,7 @@
    grid-gap: 5px;
  }

-  .block-label {
-    font-weight: 600;
-    font-size: var(--font-size-s);
-    color: var(--grey-7);
+  .test :global(.drawer) {
+    width: 10000px !important;
  }
 </style>
--- a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
@ -1,7 +1,13 @@
 <script>
  import { Button, Select, Input } from "@budibase/bbui"
+  import { createEventDispatcher } from "svelte"
+  const dispatch = createEventDispatcher()

  export let value
+  const onChange = e => {
+    value = e.detail
+    dispatch("change", e.detail)
+  }

  let presets = false

@ -30,7 +36,7 @@
 </script>

 <div class="block-field">
-  <Input bind:value />
+  <Input on:change={onChange} {value} />

  <div class="presets">
    <Button on:click={() => (presets = !presets)}
@ -38,7 +44,8 @@
    >
    {#if presets}
      <Select
-        bind:value
+        on:change={onChange}
+        {value}
        secondary
        extraThin
        label="Presets"
--- a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
@ -38,6 +38,7 @@
        label={field.name}
        type="string"
        {bindings}
+        fillWidth={true}
      />
    {/each}
  </div>
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@ -1,14 +1,27 @@
 <script>
  import { tables } from "stores/backend"
-  import { Select } from "@budibase/bbui"
+  import { Select, Toggle, DatePicker, Multiselect } from "@budibase/bbui"
  import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
  import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
+  import { createEventDispatcher } from "svelte"
+  import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
+  import { automationStore } from "builderStore"
+
+  const dispatch = createEventDispatcher()

  export let value
  export let bindings
-
  $: table = $tables.list.find(table => table._id === value?.tableId)
  $: schemaFields = Object.entries(table?.schema ?? {})
+  const onChangeTable = e => {
+    value = { tableId: e.detail }
+    dispatch("change", value)
+  }
+
+  const onChange = (e, field) => {
+    value[field] = e.detail
+    dispatch("change", value)
+  }

  // Ensure any nullish tableId values get set to empty string so
  // that the select works
@ -20,7 +33,8 @@
 </script>

 <Select
-  bind:value={value.tableId}
+  on:change={onChangeTable}
+  value={value.tableId}
  options={$tables.list}
  getOptionLabel={table => table.name}
  getOptionValue={table => table._id}
@ -30,21 +44,52 @@
  <div class="schema-fields">
    {#each schemaFields as [field, schema]}
      {#if !schema.autocolumn}
-        {#if schemaHasOptions(schema)}
+        {#if schemaHasOptions(schema) && schema.type !== "array"}
          <Select
+            on:change={e => onChange(e, field)}
            label={field}
+            value={value[field]}
+            options={schema.constraints.inclusion}
+          />
+        {:else if schema.type === "datetime"}
+          <DatePicker
+            label={field}
+            value={value[field]}
+            on:change={e => onChange(e, field)}
+          />
+        {:else if schema.type === "boolean"}
+          <Toggle
+            text={field}
+            value={value[field]}
+            on:change={e => onChange(e, field)}
+          />
+        {:else if schema.type === "array"}
+          <Multiselect
            bind:value={value[field]}
+            label={field}
            options={schema.constraints.inclusion}
          />
        {:else if schema.type === "string" || schema.type === "number"}
-          <DrawerBindableInput
-            panel={AutomationBindingPanel}
-            value={value[field]}
-            on:change={e => (value[field] = e.detail)}
-            label={field}
-            type="string"
-            {bindings}
-          />
+          {#if $automationStore.selectedAutomation.automation.testData}
+            <ModalBindableInput
+              value={value[field]}
+              panel={AutomationBindingPanel}
+              label={field}
+              type={value.customType}
+              on:change={e => onChange(e, field)}
+              {bindings}
+            />
+          {:else}
+            <DrawerBindableInput
+              panel={AutomationBindingPanel}
+              value={value[field]}
+              on:change={e => onChange(e, field)}
+              label={field}
+              type="string"
+              {bindings}
+              fillWidth={true}
+            />
+          {/if}
        {/if}
      {/if}
    {/each}
--- a/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SchemaSetup.svelte
@ -1,11 +1,18 @@
 <script>
  import { Input, Select } from "@budibase/bbui"
+  import { createEventDispatcher } from "svelte"
+
+  const dispatch = createEventDispatcher()

  export let value = {}
-  $: fieldsArray = Object.entries(value).map(([name, type]) => ({
-    name,
-    type,
-  }))
+
+  $: fieldsArray = value
+    ? Object.entries(value).map(([name, type]) => ({
+        name,
+        type,
+      }))
+    : []
+
  const typeOptions = [
    {
      label: "Text",
@ -28,13 +35,13 @@
  function addField() {
    const newValue = { ...value }
    newValue[""] = "string"
-    value = newValue
+    dispatch("change", newValue)
  }

  function removeField(name) {
    const newValues = { ...value }
    delete newValues[name]
-    value = newValues
+    dispatch("change", newValues)
  }

  const fieldNameChanged = originalName => e => {
@ -50,6 +57,7 @@
      newVals[current.name] = current.type
      return newVals
    }, {})
+    dispatch("change", value)
  }
 </script>

@ -68,7 +76,10 @@
      />
      <Select
        value={field.type}
-        on:change={e => (value[field.name] = e.target.value)}
+        on:change={e => {
+          value[field.name] = e.detail
+          dispatch("change", value)
+        }}
        options={typeOptions}
      />
      <i
@ -81,9 +92,7 @@

 <style>
  .root {
-    position: relative;
    max-width: 100%;
-    overflow-x: auto;
    /* so we can show the "+" button beside the "fields" label*/
    top: -26px;
  }
@ -103,7 +112,6 @@
    /*grid-template-rows: auto auto;
    grid-template-columns: auto;*/
    position: relative;
-    overflow: hidden;
  }

  .field :global(select) {
--- a/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/SetupPanel.svelte
@ -1,96 +0,0 @@
-<script>
-  import { automationStore } from "builderStore"
-  import { database } from "stores/backend"
-  import { notifications, Button, Modal, Heading, Toggle } from "@budibase/bbui"
-  import AutomationBlockSetup from "./AutomationBlockSetup.svelte"
-  import CreateWebookModal from "../Shared/CreateWebhookModal.svelte"
-
-  let webhookModal
-
-  $: instanceId = $database._id
-  $: automation = $automationStore.selectedAutomation?.automation
-  $: automationLive = automation?.live
-
-  function setAutomationLive(live) {
-    if (automationLive === live) {
-      return
-    }
-    automation.live = live
-    automationStore.actions.save({ instanceId, automation })
-    if (live) {
-      notifications.info(`Automation ${automation.name} enabled.`)
-    } else {
-      notifications.error(`Automation ${automation.name} disabled.`)
-    }
-  }
-
-  async function testAutomation() {
-    const result = await automationStore.actions.trigger({
-      automation: $automationStore.selectedAutomation.automation,
-    })
-    if (result.status === 200) {
-      notifications.success(
-        `Automation ${automation.name} triggered successfully.`
-      )
-    } else {
-      notifications.error(`Failed to trigger automation ${automation.name}.`)
-    }
-  }
-
-  async function saveAutomation() {
-    await automationStore.actions.save({
-      instanceId,
-      automation,
-    })
-    notifications.success(`Automation ${automation.name} saved.`)
-  }
-</script>
-
-<div class="title">
-  <Heading size="S">Setup</Heading>
-  <Toggle
-    value={automationLive}
-    on:change={() => setAutomationLive(!automationLive)}
-    dataCy="activate-automation"
-    text="Live"
-  />
-</div>
-{#if $automationStore.selectedBlock}
-  <AutomationBlockSetup
-    bind:block={$automationStore.selectedBlock}
-    {webhookModal}
-  />
-{:else if automation}
-  <div class="block-label">{automation.name}</div>
-  <Button secondary on:click={testAutomation}>Test Automation</Button>
-{/if}
-<Button
-  secondary
-  wide
-  data-cy="save-automation-setup"
-  on:click={saveAutomation}
->
-  Save Automation
-</Button>
-<Modal bind:this={webhookModal} width="30%">
-  <CreateWebookModal />
-</Modal>
-
-<style>
-  .title {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-    gap: var(--spacing-xs);
-  }
-  .title :global(h1) {
-    flex: 1 1 auto;
-  }
-
-  .block-label {
-    font-size: var(--spectrum-global-dimension-font-size-75);
-    font-weight: 600;
-    color: var(--grey-7);
-  }
-</style>
--- a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
@ -1,11 +1,20 @@
 <script>
  import { tables } from "stores/backend"
  import { Select } from "@budibase/bbui"
+  import { createEventDispatcher } from "svelte"
+
+  const dispatch = createEventDispatcher()

  export let value
+
+  const onChange = e => {
+    value = e.detail
+    dispatch("change", e.detail)
+  }
 </script>

 <Select
+  on:change={onChange}
  bind:value
  options={$tables.list}
  getOptionLabel={table => table.name}
--- a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
+++ b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
@ -18,10 +18,7 @@
  onMount(async () => {
    if (!automation?.definition?.trigger?.inputs.schemaUrl) {
      // save the automation initially
-      await automationStore.actions.save({
-        instanceId,
-        automation,
-      })
+      await automationStore.actions.save(automation)
    }
    interval = setInterval(async () => {
      await automationStore.actions.fetch()
--- a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte
@ -18,12 +18,10 @@
  let exportFormat = FORMATS[0].key

  async function exportView() {
-    const filename = `export.${exportFormat}`
    download(
      `/api/views/export?view=${encodeURIComponent(
        view
-      )}&format=${exportFormat}`,
-      filename
+      )}&format=${exportFormat}`
    )
  }
 </script>
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@ -9,7 +9,10 @@
  import TableNavigator from "components/backend/TableNavigator/TableNavigator.svelte"
  import ICONS from "./icons"

+  let openDataSources = []
+
  function selectDatasource(datasource) {
+    toggleNode(datasource)
    datasources.select(datasource._id)
    $goto(`./datasource/${datasource._id}`)
  }
@ -19,6 +22,15 @@
    $goto(`./datasource/${query.datasourceId}/${query._id}`)
  }

+  function toggleNode(datasource) {
+    const isOpen = openDataSources.includes(datasource._id)
+    if (isOpen) {
+      openDataSources = openDataSources.filter(id => datasource._id !== id)
+    } else {
+      openDataSources = [...openDataSources, datasource._id]
+    }
+  }
+
  onMount(() => {
    datasources.fetch()
    queries.fetch()
@ -31,8 +43,11 @@
      <NavItem
        border={idx > 0}
        text={datasource.name}
+        opened={openDataSources.includes(datasource._id)}
        selected={$datasources.selected === datasource._id}
+        withArrow={true}
        on:click={() => selectDatasource(datasource)}
+        on:iconClick={() => toggleNode(datasource)}
      >
        <div class="datasource-icon" slot="icon">
          <svelte:component
@ -46,13 +61,16 @@
        {/if}
      </NavItem>

-      <TableNavigator sourceId={datasource._id} />
+      {#if openDataSources.includes(datasource._id)}
+        <TableNavigator sourceId={datasource._id} />
+      {/if}

      {#each $queries.list.filter(query => query.datasourceId === datasource._id) as query}
        <NavItem
          indentLevel={1}
          icon="SQLQuery"
          text={query.name}
+          opened={$queries.selected === query._id}
          selected={$queries.selected === query._id}
          on:click={() => onClickQuery(query)}
        >
--- a/packages/builder/src/components/common/ConfigChecklist.svelte
+++ b/packages/builder/src/components/common/ConfigChecklist.svelte
@ -7,16 +7,29 @@
    ProgressCircle,
  } from "@budibase/bbui"
  import { admin } from "stores/portal"
+  import { goto } from "@roxi/routify"
+  import { onMount } from "svelte"

-  const MESSAGES = {
-    apps: "Create your first app",
-    smtp: "Set up email",
-    adminUser: "Create your first user",
-    sso: "Set up single sign-on",
-  }
+  let width = window.innerWidth
+  $: side = width < 500 ? "right" : "left"
+
+  const resizeObserver = new ResizeObserver(entries => {
+    if (entries?.[0]) {
+      width = entries[0].contentRect?.width
+    }
+  })
+
+  onMount(() => {
+    const doc = document.documentElement
+    resizeObserver.observe(doc)
+
+    return () => {
+      resizeObserver.unobserve(doc)
+    }
+  })
 </script>

-<ActionMenu>
+<ActionMenu align={side}>
  <div slot="control" class="icon">
    <ProgressCircle size="S" value={$admin.onboardingProgress} />
  </div>
@ -28,9 +41,12 @@
  </MenuItem>
  {#each Object.keys($admin.checklist) as checklistItem, idx}
    <MenuItem>
-      <div class="item">
-        <span>{idx + 1}. {MESSAGES[checklistItem]}</span>
-        <Checkbox value={!!$admin.checklist[checklistItem]} />
+      <div
+        class="item"
+        on:click={() => $goto($admin.checklist[checklistItem].link)}
+      >
+        <span>{idx + 1}. {$admin.checklist[checklistItem].label}</span>
+        <Checkbox value={$admin.checklist[checklistItem].checked} />
      </div>
    </MenuItem>
  {/each}
@ -40,7 +56,7 @@
  .item {
    display: grid;
    align-items: center;
-    grid-template-columns: 200px 20px;
+    grid-template-columns: 175px 20px;
  }
  .icon {
    cursor: pointer;
--- a/packages/builder/src/components/common/NavItem.svelte
+++ b/packages/builder/src/components/common/NavItem.svelte
@ -1,5 +1,6 @@
 <script>
  import { Icon } from "@budibase/bbui"
+  import { createEventDispatcher } from "svelte"

  export let icon
  export let withArrow = false
@ -10,6 +11,13 @@
  export let selected = false
  export let opened = false
  export let draggable = false
+
+  const dispatch = createEventDispatcher()
+
+  function onIconClick(event) {
+    event.stopPropagation()
+    dispatch("iconClick")
+  }
 </script>

 <div
@ -28,7 +36,7 @@
 >
  <div class="content">
    {#if withArrow}
-      <div class:opened class="icon arrow">
+      <div class:opened class="icon arrow" on:click={onIconClick}>
        <Icon size="S" name="ChevronRight" />
      </div>
    {/if}
--- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
@ -14,6 +14,7 @@
  export let placeholder
  export let label
  export let disabled = false
+  export let fillWidth

  const dispatch = createEventDispatcher()
  let bindingDrawer
@ -45,7 +46,7 @@
    </div>
  {/if}
 </div>
-<Drawer bind:this={bindingDrawer} {title}>
+<Drawer {fillWidth} bind:this={bindingDrawer} {title}>
  <svelte:fragment slot="description">
    Add the objects on the left to enrich your text.
  </svelte:fragment>
--- a/packages/builder/src/components/design/AppPreview/AppThemeSelect.svelte
+++ b/packages/builder/src/components/design/AppPreview/AppThemeSelect.svelte
@ -33,6 +33,6 @@

 <style>
  div {
-    padding-right: 8px;
+    width: 100px;
  }
 </style>
--- a/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte
+++ b/packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte
@ -83,10 +83,11 @@
    justify-content: flex-start;
    align-items: center;
    flex-wrap: wrap;
-    margin-top: -10px;
  }
  .components :global(> *) {
-    margin-top: 10px;
+    height: 32px;
+    display: grid;
+    place-items: center;
  }

  .buttonContent {
--- a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
+++ b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
@ -1,5 +1,5 @@
 <script>
-  import { onMount } from "svelte"
+  import { onMount, onDestroy } from "svelte"
  import { store, currentAsset } from "builderStore"
  import iframeTemplate from "./iframeTemplate"
  import { Screen } from "builderStore/store/screenTemplates/utils/Screen"
@ -49,6 +49,8 @@
    selectedComponentId,
    previewType: $store.currentFrontEndType,
    theme: $store.theme,
+    customTheme: $store.customTheme,
+    previewDevice: $store.previewDevice,
  }

  // Saving pages and screens to the DB causes them to have _revs.
@ -95,26 +97,53 @@
      { once: true }
    )

-    // Add listener for events sent by cliebt library in preview
-    iframe.contentWindow.addEventListener("bb-event", event => {
-      const { type, data } = event.detail
-      if (type === "select-component" && data.id) {
-        store.actions.components.select({ _id: data.id })
-      } else if (type === "update-prop") {
-        store.actions.components.updateProp(data.prop, data.value)
-      } else if (type === "delete-component" && data.id) {
-        idToDelete = data.id
-        confirmDeleteDialog.show()
-      } else if (type === "preview-loaded") {
-        // Wait for this event to show the client library if intelligent
-        // loading is supported
-        loading = false
-      } else {
-        console.warning(`Client sent unknown event type: ${type}`)
-      }
-    })
+    // Add listener for events sent by client library in preview
+    iframe.contentWindow.addEventListener("bb-event", handleBudibaseEvent)
+    iframe.contentWindow.addEventListener("keydown", handleKeydownEvent)
  })

+  // remove all iframe event listeners on component destroy
+  onDestroy(() => {
+    if (iframe.contentWindow) {
+      iframe.contentWindow.removeEventListener("bb-event", handleBudibaseEvent)
+      iframe.contentWindow.removeEventListener("keydown", handleKeydownEvent)
+    }
+  })
+
+  const handleBudibaseEvent = event => {
+    const { type, data } = event.detail
+    if (type === "select-component" && data.id) {
+      store.actions.components.select({ _id: data.id })
+    } else if (type === "update-prop") {
+      store.actions.components.updateProp(data.prop, data.value)
+    } else if (type === "delete-component" && data.id) {
+      confirmDeleteComponent(data.id)
+    } else if (type === "preview-loaded") {
+      // Wait for this event to show the client library if intelligent
+      // loading is supported
+      loading = false
+    } else {
+      console.warning(`Client sent unknown event type: ${type}`)
+    }
+  }
+
+  const handleKeydownEvent = event => {
+    if (
+      (event.key === "Delete" || event.key === "Backspace") &&
+      selectedComponentId &&
+      ["input", "textarea"].indexOf(
+        iframe.contentWindow.document.activeElement?.tagName.toLowerCase()
+      ) === -1
+    ) {
+      confirmDeleteComponent(selectedComponentId)
+    }
+  }
+
+  const confirmDeleteComponent = componentId => {
+    idToDelete = componentId
+    confirmDeleteDialog.show()
+  }
+
  const deleteComponent = () => {
    store.actions.components.delete({ _id: idToDelete })
    idToDelete = null
@ -139,11 +168,12 @@
    </div>
  {/if}
  <iframe
-    style="height: 100%; width: 100%"
    title="componentPreview"
    bind:this={iframe}
    srcdoc={template}
    class:hidden={loading || error}
+    class:tablet={$store.previewDevice === "tablet"}
+    class:mobile={$store.previewDevice === "mobile"}
  />
 </div>
 <ConfirmDialog
@ -159,6 +189,8 @@
  .component-container {
    grid-row-start: middle;
    grid-column-start: middle;
+    display: grid;
+    place-items: center;
    position: relative;
    overflow: hidden;
    margin: auto;
@ -199,4 +231,9 @@
    font-weight: 400;
    margin: 0;
  }
+
+  iframe {
+    width: 100%;
+    height: 100%;
+  }
 </style>
--- a/packages/builder/src/components/design/AppPreview/DevicePreviewSelect.svelte
+++ b/packages/builder/src/components/design/AppPreview/DevicePreviewSelect.svelte
@ -0,0 +1,22 @@
+<script>
+  import { ActionGroup, ActionButton } from "@budibase/bbui"
+  import { store } from "builderStore"
+</script>
+
+<ActionGroup compact>
+  <ActionButton
+    icon="DeviceDesktop"
+    selected={$store.previewDevice === "desktop"}
+    on:click={() => store.actions.preview.setDevice("desktop")}
+  />
+  <ActionButton
+    icon="DeviceTablet"
+    selected={$store.previewDevice === "tablet"}
+    on:click={() => store.actions.preview.setDevice("tablet")}
+  />
+  <ActionButton
+    icon="DevicePhone"
+    selected={$store.previewDevice === "mobile"}
+    on:click={() => store.actions.preview.setDevice("mobile")}
+  />
+</ActionGroup>
--- a/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte
+++ b/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte
@ -0,0 +1,140 @@
+<script>
+  import { get } from "svelte/store"
+  import {
+    ActionButton,
+    Modal,
+    ModalContent,
+    Layout,
+    ColorPicker,
+    Label,
+    Select,
+    Button,
+  } from "@budibase/bbui"
+  import { store } from "builderStore"
+  import AppThemeSelect from "./AppThemeSelect.svelte"
+
+  let modal
+
+  const defaultTheme = {
+    primaryColor: "var(--spectrum-global-color-blue-600)",
+    primaryColorHover: "var(--spectrum-global-color-blue-500)",
+    buttonBorderRadius: "16px",
+    navBackground: "var(--spectrum-global-color-gray-100)",
+    navTextColor: "var(--spectrum-global-color-gray-800)",
+  }
+
+  const buttonBorderRadiusOptions = [
+    {
+      label: "None",
+      value: "0",
+    },
+    {
+      label: "Small",
+      value: "4px",
+    },
+    {
+      label: "Medium",
+      value: "8px",
+    },
+    {
+      label: "Large",
+      value: "16px",
+    },
+  ]
+
+  const updateProperty = property => {
+    return e => {
+      store.actions.customTheme.save({
+        ...get(store).customTheme,
+        [property]: e.detail,
+      })
+    }
+  }
+
+  const resetTheme = () => {
+    store.actions.customTheme.save(null)
+  }
+</script>
+
+<div class="container">
+  <ActionButton icon="Brush" on:click={modal.show}>Theme</ActionButton>
+</div>
+<Modal bind:this={modal}>
+  <ModalContent
+    showConfirmButton={false}
+    cancelText="Close"
+    showCloseIcon={false}
+    title="Theme settings"
+  >
+    <Layout noPadding gap="S">
+      <div class="setting">
+        <Label size="L">Theme</Label>
+        <AppThemeSelect />
+      </div>
+      <div class="setting">
+        <Label size="L">Button roundness</Label>
+        <div class="select-wrapper">
+          <Select
+            placeholder={null}
+            value={$store.customTheme?.buttonBorderRadius ||
+              defaultTheme.buttonBorderRadius}
+            on:change={updateProperty("buttonBorderRadius")}
+            options={buttonBorderRadiusOptions}
+          />
+        </div>
+      </div>
+      <div class="setting">
+        <Label size="L">Primary color</Label>
+        <ColorPicker
+          spectrumTheme={$store.theme}
+          value={$store.customTheme?.primaryColor || defaultTheme.primaryColor}
+          on:change={updateProperty("primaryColor")}
+        />
+      </div>
+      <div class="setting">
+        <Label size="L">Primary color (hover)</Label>
+        <ColorPicker
+          spectrumTheme={$store.theme}
+          value={$store.customTheme?.primaryColorHover ||
+            defaultTheme.primaryColorHover}
+          on:change={updateProperty("primaryColorHover")}
+        />
+      </div>
+      <div class="setting">
+        <Label size="L">Navigation bar background color</Label>
+        <ColorPicker
+          spectrumTheme={$store.theme}
+          value={$store.customTheme?.navBackground ||
+            defaultTheme.navBackground}
+          on:change={updateProperty("navBackground")}
+        />
+      </div>
+      <div class="setting">
+        <Label size="L">Navigation bar text color</Label>
+        <ColorPicker
+          spectrumTheme={$store.theme}
+          value={$store.customTheme?.navTextColor || defaultTheme.navTextColor}
+          on:change={updateProperty("navTextColor")}
+        />
+      </div>
+    </Layout>
+    <div slot="footer">
+      <Button secondary quiet on:click={resetTheme}>Reset</Button>
+    </div>
+  </ModalContent>
+</Modal>
+
+<style>
+  .container {
+    padding-right: 8px;
+  }
+  .setting {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .select-wrapper {
+    width: 100px;
+  }
+</style>
--- a/packages/builder/src/components/design/AppPreview/iframeTemplate.js
+++ b/packages/builder/src/components/design/AppPreview/iframeTemplate.js
@ -17,18 +17,14 @@ export default `
        margin: 0;
      }
      html {
-        height: calc(100% - 16px);
-        width: calc(100% - 16px);
+        height: 100%;
+        width: 100%;
        overflow: hidden;
-        margin: 8px;
        display: flex;
        flex-direction: column;
        justify-content: flex-start;
        align-items: stretch;
      }
-      html.loaded {
-        box-shadow: 0 2px 8px -2px rgba(0, 0, 0, 0.1);
-      }
      body {
        flex: 1 1 auto;
        overflow: hidden;
@ -66,7 +62,9 @@ export default `
          screen,
          previewType,
          appId,
-          theme
+          theme,
+          customTheme,
+          previewDevice
        } = parsed

        // Set some flags so the app knows we're in the builder
@ -78,6 +76,8 @@ export default `
        window["##BUDIBASE_PREVIEW_ID##"] = Math.random()
        window["##BUDIBASE_PREVIEW_TYPE##"] = previewType
        window["##BUDIBASE_PREVIEW_THEME##"] = theme
+        window["##BUDIBASE_PREVIEW_CUSTOM_THEME##"] = customTheme
+        window["##BUDIBASE_PREVIEW_DEVICE##"] = previewDevice

        // Initialise app
        try {
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventEditor.svelte
@ -9,11 +9,12 @@
    ActionMenu,
    MenuItem,
  } from "@budibase/bbui"
-  import actionTypes from "./actions"
+  import { getAvailableActions } from "./actions"
  import { generate } from "shortid"

  const flipDurationMs = 150
  const EVENT_TYPE_KEY = "##eventHandlerType"
+  const actionTypes = getAvailableActions()

  export let actions
  export let bindings = []
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventPropertyControl.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/EventPropertyControl.svelte
@ -46,7 +46,9 @@
    }

    automationStore.actions.addBlockToAutomation(newBlock)
-    await automationStore.actions.save($automationStore.selectedAutomation)
+    await automationStore.actions.save(
+      $automationStore.selectedAutomation?.automation
+    )
    parameters.automationId = $automationStore.selectedAutomation.automation._id
    delete parameters.newAutomationName
  }
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/UpdateState.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/UpdateState.svelte
@ -0,0 +1,65 @@
+<script>
+  import { Select, Label, Combobox, Checkbox, Body } from "@budibase/bbui"
+  import { onMount } from "svelte"
+  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import { getAllStateVariables } from "builderStore/dataBinding"
+
+  export let parameters
+  export let bindings = []
+
+  const keyOptions = getAllStateVariables()
+  const typeOptions = [
+    {
+      label: "Set value",
+      value: "set",
+    },
+    {
+      label: "Delete value",
+      value: "delete",
+    },
+  ]
+
+  onMount(() => {
+    if (!parameters.type) {
+      parameters.type = "set"
+    }
+  })
+</script>
+
+<div class="root">
+  <Label small>Type</Label>
+  <Select
+    placeholder={null}
+    bind:value={parameters.type}
+    options={typeOptions}
+  />
+  <Label small>Key</Label>
+  <Combobox bind:value={parameters.key} options={keyOptions} />
+  {#if parameters.type === "set"}
+    <Label small>Value</Label>
+    <DrawerBindableInput
+      {bindings}
+      value={parameters.value}
+      on:change={e => (parameters.value = e.detail)}
+    />
+    <div />
+    <Checkbox bind:value={parameters.persist} text="Persist this value" />
+    <div />
+    <Body size="XS">
+      Persisted values will remain even after reloading the page or closing the
+      browser.
+    </Body>
+  {/if}
+</div>
+
+<style>
+  .root {
+    display: grid;
+    column-gap: var(--spacing-l);
+    row-gap: var(--spacing-s);
+    grid-template-columns: 60px 1fr;
+    align-items: center;
+    max-width: 400px;
+    margin: 0 auto;
+  }
+</style>
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/index.js
@ -1,3 +1,6 @@
+import { store } from "builderStore"
+import { get } from "svelte/store"
+
 import NavigateTo from "./NavigateTo.svelte"
 import SaveRow from "./SaveRow.svelte"
 import DeleteRow from "./DeleteRow.svelte"
@ -8,6 +11,7 @@ import LogOut from "./LogOut.svelte"
 import ClearForm from "./ClearForm.svelte"
 import CloseScreenModal from "./CloseScreenModal.svelte"
 import ChangeFormStep from "./ChangeFormStep.svelte"
+import UpdateStateStep from "./UpdateState.svelte"

 // Defines which actions are available to configure in the front end.
 // Unfortunately the "name" property is used as the identifier so please don't
@ -16,45 +20,56 @@ import ChangeFormStep from "./ChangeFormStep.svelte"
 // be considered as camel case too.
 // There is technical debt here to sanitize all these and standardise them
 // across the packages but it's a breaking change to existing apps.
-export default [
-  {
-    name: "Save Row",
-    component: SaveRow,
-  },
-  {
-    name: "Delete Row",
-    component: DeleteRow,
-  },
-  {
-    name: "Navigate To",
-    component: NavigateTo,
-  },
-  {
-    name: "Execute Query",
-    component: ExecuteQuery,
-  },
-  {
-    name: "Trigger Automation",
-    component: TriggerAutomation,
-  },
-  {
-    name: "Validate Form",
-    component: ValidateForm,
-  },
-  {
-    name: "Log Out",
-    component: LogOut,
-  },
-  {
-    name: "Clear Form",
-    component: ClearForm,
-  },
-  {
-    name: "Close Screen Modal",
-    component: CloseScreenModal,
-  },
-  {
-    name: "Change Form Step",
-    component: ChangeFormStep,
-  },
-]
+export const getAvailableActions = () => {
+  let actions = [
+    {
+      name: "Save Row",
+      component: SaveRow,
+    },
+    {
+      name: "Delete Row",
+      component: DeleteRow,
+    },
+    {
+      name: "Navigate To",
+      component: NavigateTo,
+    },
+    {
+      name: "Execute Query",
+      component: ExecuteQuery,
+    },
+    {
+      name: "Trigger Automation",
+      component: TriggerAutomation,
+    },
+    {
+      name: "Validate Form",
+      component: ValidateForm,
+    },
+    {
+      name: "Log Out",
+      component: LogOut,
+    },
+    {
+      name: "Clear Form",
+      component: ClearForm,
+    },
+    {
+      name: "Close Screen Modal",
+      component: CloseScreenModal,
+    },
+    {
+      name: "Change Form Step",
+      component: ChangeFormStep,
+    },
+  ]
+
+  if (get(store).clientFeatures?.state) {
+    actions.push({
+      name: "Update State",
+      component: UpdateStateStep,
+    })
+  }
+
+  return actions
+}
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
@ -1,22 +1,24 @@
 <script>
  import {
-    DatePicker,
-    Icon,
-    Button,
-    Select,
-    Combobox,
-    Input,
-    DrawerContent,
-    Layout,
    Body,
+    Button,
+    Combobox,
+    DatePicker,
+    DrawerContent,
+    Icon,
+    Input,
+    Layout,
+    Select,
  } from "@budibase/bbui"
  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import BindingPanel from "components/common/bindings/BindingPanel.svelte"
  import { generate } from "shortid"
-  import { OperatorOptions, getValidOperatorsForType } from "helpers/lucene"
+  import { getValidOperatorsForType, OperatorOptions } from "helpers/lucene"

  export let schemaFields
  export let filters = []
  export let bindings = []
+  export let panel = BindingPanel

  const BannedTypes = ["link", "attachment", "formula"]

@ -82,9 +84,7 @@

  const getFieldOptions = field => {
    const schema = schemaFields.find(x => x.name === field)
-    const opt = schema?.constraints?.inclusion || []
-
-    return opt
+    return schema?.constraints?.inclusion || []
  }
 </script>

@ -127,6 +127,7 @@
                title={`Value for "${filter.field}"`}
                value={filter.value}
                placeholder="Value"
+                {panel}
                {bindings}
                on:change={event => (filter.value = event.detail)}
              />
--- a/packages/builder/src/components/start/AppRow.svelte
+++ b/packages/builder/src/components/start/AppRow.svelte
@ -28,7 +28,7 @@
    </Heading>
  </div>
 </div>
-<div>
+<div class="desktop">
  {#if app.updatedAt}
    {processStringSync("Updated {{ duration time 'millisecond' }} ago", {
      time: new Date().getTime() - new Date(app.updatedAt).getTime(),
@ -37,7 +37,7 @@
    Never updated
  {/if}
 </div>
-<div>
+<div class="desktop">
  <StatusLight
    positive={!app.lockedYou && !app.lockedOther}
    notice={app.lockedYou}
@ -52,7 +52,7 @@
    {/if}
  </StatusLight>
 </div>
-<div>
+<div class="desktop">
  <StatusLight active={app.deployed} neutral={!app.deployed}>
    {#if app.deployed}Published{:else}Unpublished{/if}
  </StatusLight>
@ -109,4 +109,10 @@
    cursor: pointer;
    transition: color 130ms ease;
  }
+
+  @media (max-width: 640px) {
+    .desktop {
+      display: none !important;
+    }
+  }
 </style>
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@ -134,7 +134,7 @@
 </script>

 <ModalContent
-  title={template ? "Import app" : "Create new app"}
+  title={template ? "Import app" : "Create app"}
  confirmText={template ? "Import app" : "Create app"}
  onConfirm={createNewApp}
  disabled={!valid}
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@ -6,32 +6,35 @@
  let loaded = false

  $: multiTenancyEnabled = $admin.multiTenancy
-  $: hasAdminUser = !!$admin?.checklist?.adminUser
+  $: hasAdminUser = $admin?.checklist?.adminUser?.checked
  $: tenantSet = $auth.tenantSet
+  $: cloud = $admin.cloud

  onMount(async () => {
-    await admin.init()
    await auth.checkAuth()
+    await admin.init()
    loaded = true
  })

  $: {
-    const apiReady = $admin.loaded && $auth.loaded
-    // if tenant is not set go to it
-    if (loaded && apiReady && multiTenancyEnabled && !tenantSet) {
-      $redirect("./auth/org")
-    }
-    // Force creation of an admin user if one doesn't exist
-    else if (loaded && apiReady && !hasAdminUser) {
-      $redirect("./admin")
+    // We should never see the org or admin user creation screens in the cloud
+    if (!cloud) {
+      const apiReady = $admin.loaded && $auth.loaded
+      // if tenant is not set go to it
+      if (loaded && apiReady && multiTenancyEnabled && !tenantSet) {
+        $redirect("./auth/org")
+      }
+      // Force creation of an admin user if one doesn't exist
+      else if (loaded && apiReady && !hasAdminUser) {
+        $redirect("./admin")
+      }
    }
  }
-
  // Redirect to log in at any time if the user isn't authenticated
  $: {
    if (
      loaded &&
-      hasAdminUser &&
+      (hasAdminUser || cloud) &&
      !$auth.user &&
      !$isActive("./auth") &&
      !$isActive("./invite")
--- a/packages/builder/src/pages/builder/admin/_layout.svelte
+++ b/packages/builder/src/pages/builder/admin/_layout.svelte
@ -6,7 +6,7 @@
  let loaded = false

  onMount(() => {
-    if ($admin?.checklist?.adminUser) {
+    if ($admin?.checklist?.adminUser.checked) {
      $redirect("../")
    } else {
      loaded = true
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@ -92,7 +92,7 @@
        <ActionGroup />
      </div>
      <div class="toprightnav">
-        {#if $admin.sandbox}
+        {#if $admin.cloud}
          <UpgradeModal />
        {/if}
        <VersionModal />
--- a/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte
@ -1,22 +1,50 @@
 <script>
+  import { Heading, Body, Layout, Button, Modal } from "@budibase/bbui"
  import { automationStore } from "builderStore"
  import AutomationPanel from "components/automation/AutomationPanel/AutomationPanel.svelte"
-  import SetupPanel from "components/automation/SetupPanel/SetupPanel.svelte"
+  import CreateAutomationModal from "components/automation/AutomationPanel/CreateAutomationModal.svelte"
+  import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
+  $: automation = $automationStore.automations[0]
+  let modal
+  let webhookModal
 </script>

 <!-- routify:options index=3 -->
 <div class="root">
  <div class="nav">
-    <AutomationPanel />
+    <AutomationPanel {modal} {webhookModal} />
  </div>
  <div class="content">
-    <slot />
+    {#if automation}
+      <slot />
+    {:else}
+      <div class="centered">
+        <div class="main">
+          <Layout gap="S" justifyItems="center">
+            <svg
+              width="60px"
+              height="60px"
+              class="spectrum-Icon"
+              focusable="false"
+            >
+              <use xlink:href="#spectrum-icon-18-WorkflowAdd" />
+            </svg>
+            <Heading size="M">You have no automations</Heading>
+            <Body size="M">Let's fix that. Call the bots!</Body>
+            <Button on:click={() => modal.show()} size="M" cta
+              >Create automation</Button
+            >
+          </Layout>
+        </div>
+      </div>
+    {/if}
  </div>
-  {#if $automationStore.selectedAutomation}
-    <div class="setup">
-      <SetupPanel />
-    </div>
-  {/if}
+  <Modal bind:this={modal}>
+    <CreateAutomationModal {webhookModal} />
+  </Modal>
+  <Modal bind:this={webhookModal} width="30%">
+    <CreateWebhookModal />
+  </Modal>
 </div>

 <style>
@ -24,7 +52,7 @@
    flex: 1 1 auto;
    height: 0;
    display: grid;
-    grid-template-columns: 260px minmax(510px, 1fr) 260px;
+    grid-template-columns: 260px minmax(510px, 1fr);
  }

  .nav {
@ -48,16 +76,20 @@
    gap: var(--spacing-l);
    overflow: hidden;
  }
-
-  .setup {
-    padding: var(--spectrum-global-dimension-size-200);
-    border-left: var(--border-light);
+  .centered {
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    width: 100%;
+    height: 100%;
    display: flex;
    flex-direction: column;
-    justify-content: flex-start;
-    align-items: stretch;
-    gap: var(--spacing-l);
-    background-color: var(--background);
-    overflow-y: auto;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .main {
+    width: 300px;
  }
 </style>
--- a/packages/builder/src/pages/builder/app/[application]/automate/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automate/index.svelte
@ -15,13 +15,3 @@
    }
  })
 </script>
-
-<i>Create your first automation to get started</i>
-
-<style>
-  i {
-    font-size: var(--font-size-m);
-    color: var(--grey-5);
-    margin-top: 2px;
-  }
-</style>
--- a/packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte
@ -14,6 +14,8 @@
  import { findComponent, findComponentPath } from "builderStore/storeUtils"
  import { get } from "svelte/store"
  import AppThemeSelect from "components/design/AppPreview/AppThemeSelect.svelte"
+  import ThemeEditor from "components/design/AppPreview/ThemeEditor.svelte"
+  import DevicePreviewSelect from "components/design/AppPreview/DevicePreviewSelect.svelte"

  // Cache previous values so we don't update the URL more than necessary
  let previousType
@ -150,7 +152,12 @@
    {#if $currentAsset}
      <div class="preview-header">
        <ComponentSelectionList />
-        {#if $store.clientFeatures.spectrumThemes}
+        {#if $store.clientFeatures.devicePreview}
+          <DevicePreviewSelect />
+        {/if}
+        {#if $store.clientFeatures.customThemes}
+          <ThemeEditor />
+        {:else if $store.clientFeatures.spectrumThemes}
          <AppThemeSelect />
        {/if}
      </div>
@ -202,9 +209,19 @@
    padding: var(--spacing-xl) 40px;
  }
  .preview-header {
-    display: grid;
-    grid-template-columns: 1fr 100px;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: flex-start;
+    gap: 1rem;
  }
+  .preview-header > :global(*) {
+    flex: 0 0 auto;
+  }
+  .preview-header > :global(*:first-child) {
+    flex: 1 1 auto;
+  }
+
  .preview-content {
    flex: 1 1 auto;
  }
--- a/packages/builder/src/pages/builder/apps/index.svelte
+++ b/packages/builder/src/pages/builder/apps/index.svelte
@ -41,17 +41,8 @@
    <Page>
      <div class="content">
        <Layout noPadding>
-          <img alt="logo" src={$organisation.logoUrl || Logo} />
-          <div class="info-title">
-            <Layout noPadding gap="XS">
-              <Heading size="L">
-                Hey {$auth.user.firstName || $auth.user.email}
-              </Heading>
-              <Body>
-                Welcome to the {$organisation.company} portal. Below you'll find
-                the list of apps that you have access to.
-              </Body>
-            </Layout>
+          <div class="header">
+            <img alt="logo" src={$organisation.logoUrl || Logo} />
            <ActionMenu align="right">
              <div slot="control" class="avatar">
                <Avatar
@ -81,6 +72,15 @@
              <MenuItem icon="LogOut" on:click={auth.logout}>Log out</MenuItem>
            </ActionMenu>
          </div>
+          <Layout noPadding gap="XS">
+            <Heading size="M">
+              Hey {$auth.user.firstName || $auth.user.email}
+            </Heading>
+            <Body>
+              Welcome to the {$organisation.company} portal. Below you'll find the
+              list of apps that you have access to.
+            </Body>
+          </Layout>
          <Divider />
          {#if publishedApps.length}
            <Heading>Apps</Heading>
@ -137,18 +137,18 @@
    overflow: auto;
  }
  .content {
-    padding: 60px 0;
    width: 100%;
  }
+  .header {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
  img {
    width: 40px;
    margin-bottom: -12px;
  }
-  .info-title {
-    display: grid;
-    grid-template-columns: 1fr auto;
-    grid-gap: var(--spacing-xl);
-  }
  .avatar {
    display: grid;
    grid-template-columns: auto auto;
@ -160,7 +160,6 @@
    filter: brightness(110%);
  }
  .group {
-    margin-top: var(--spacing-s);
  }
  .app {
    display: grid;
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@ -1,5 +1,5 @@
 <script>
-  import { auth } from "stores/portal"
+  import { auth, admin } from "stores/portal"
  import { onMount } from "svelte"
  import { redirect } from "@roxi/routify"

@ -10,6 +10,11 @@
    if ($auth.user && !$auth.user.forceResetPassword) {
      $redirect("../")
    }
+
+    // redirect to account portal for authentication in the cloud
+    if (!$auth.user && $admin.cloud && $admin.accountPortalUrl) {
+      window.location.href = $admin.accountPortalUrl
+    }
  })
 </script>

--- a/packages/builder/src/pages/builder/auth/org.svelte
+++ b/packages/builder/src/pages/builder/auth/org.svelte
@ -8,6 +8,7 @@

  let tenantId = get(auth).tenantSet ? get(auth).tenantId : ""
  $: multiTenancyEnabled = $admin.multiTenancy
+  $: cloud = $admin.cloud

  async function setOrg() {
    if (tenantId == null || tenantId === "") {
@ -25,7 +26,7 @@

  onMount(async () => {
    await auth.checkQueryString()
-    if (!multiTenancyEnabled) {
+    if (!multiTenancyEnabled || cloud) {
      $goto("../")
    } else {
      admin.unload()
--- a/packages/builder/src/pages/builder/portal/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/_layout.svelte
@ -9,9 +9,11 @@
    ActionMenu,
    MenuItem,
    Modal,
+    clickOutside,
  } from "@budibase/bbui"
  import ConfigChecklist from "components/common/ConfigChecklist.svelte"
  import { organisation, auth } from "stores/portal"
+  import { admin as adminStore } from "stores/portal"
  import { onMount } from "svelte"
  import UpdateUserInfoModal from "components/settings/UpdateUserInfoModal.svelte"
  import ChangePasswordModal from "components/settings/ChangePasswordModal.svelte"
@ -20,6 +22,7 @@
  let loaded = false
  let userInfoModal
  let changePasswordModal
+  let mobileMenuVisible = false

  $: menu = buildMenu($auth.isAdmin)

@ -57,9 +60,22 @@
        },
      ])
    }
+
+    // add link to account portal if the user has access
+    if ($auth?.user?.accountPortalAccess) {
+      menu = menu.concat([
+        {
+          title: "Account",
+          href: $adminStore.accountPortalUrl,
+        },
+      ])
+    }
    return menu
  }

+  const showMobileMenu = () => (mobileMenuVisible = true)
+  const hideMobileMenu = () => (mobileMenuVisible = false)
+
  onMount(async () => {
    // Prevent non-builders from accessing the portal
    if ($auth.user) {
@ -75,7 +91,11 @@

 {#if $auth.user && loaded}
  <div class="container">
-    <div class="nav">
+    <div
+      class="nav"
+      class:visible={mobileMenuVisible}
+      use:clickOutside={hideMobileMenu}
+    >
      <Layout paddingX="L" paddingY="L">
        <div class="branding">
          <div class="name" on:click={() => $goto("./apps")}>
@ -89,7 +109,12 @@
        <div class="menu">
          <Navigation>
            {#each menu as { title, href, heading }}
-              <Item selected={$isActive(href)} {href} {heading}>{title}</Item>
+              <Item
+                on:click={hideMobileMenu}
+                selected={$isActive(href)}
+                {href}
+                {heading}>{title}</Item
+              >
            {/each}
          </Navigation>
        </div>
@ -97,30 +122,40 @@
    </div>
    <div class="main">
      <div class="toolbar">
-        <div />
-        <ActionMenu align="right">
-          <div slot="control" class="avatar">
-            <Avatar
-              size="M"
-              initials={$auth.initials}
-              url={$auth.user.pictureUrl}
-            />
-            <Icon size="XL" name="ChevronDown" />
-          </div>
-          <MenuItem icon="UserEdit" on:click={() => userInfoModal.show()}>
-            Update user information
-          </MenuItem>
-          <MenuItem
-            icon="LockClosed"
-            on:click={() => changePasswordModal.show()}
-          >
-            Update password
-          </MenuItem>
-          <MenuItem icon="UserDeveloper" on:click={() => $goto("../apps")}>
-            Close developer mode
-          </MenuItem>
-          <MenuItem icon="LogOut" on:click={auth.logout}>Log out</MenuItem>
-        </ActionMenu>
+        <div class="mobile-toggle">
+          <Icon hoverable name="ShowMenu" on:click={showMobileMenu} />
+        </div>
+        <div class="mobile-logo">
+          <img
+            src={$organisation?.logoUrl || Logo}
+            alt={$organisation?.company || "Budibase"}
+          />
+        </div>
+        <div class="user-dropdown">
+          <ActionMenu align="right">
+            <div slot="control" class="avatar">
+              <Avatar
+                size="M"
+                initials={$auth.initials}
+                url={$auth.user.pictureUrl}
+              />
+              <Icon size="XL" name="ChevronDown" />
+            </div>
+            <MenuItem icon="UserEdit" on:click={() => userInfoModal.show()}>
+              Update user information
+            </MenuItem>
+            <MenuItem
+              icon="LockClosed"
+              on:click={() => changePasswordModal.show()}
+            >
+              Update password
+            </MenuItem>
+            <MenuItem icon="UserDeveloper" on:click={() => $goto("../apps")}>
+              Close developer mode
+            </MenuItem>
+            <MenuItem icon="LogOut" on:click={auth.logout}>Log out</MenuItem>
+          </ActionMenu>
+        </div>
      </div>
      <div class="content">
        <slot />
@ -138,16 +173,20 @@
 <style>
  .container {
    height: 100%;
-    display: grid;
-    grid-template-columns: 250px 1fr;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
    align-items: stretch;
  }
  .nav {
    background: var(--background);
    border-right: var(--border-light);
    overflow: auto;
+    flex: 0 0 auto;
+    width: 250px;
  }
  .main {
+    flex: 1 1 auto;
    display: grid;
    grid-template-rows: auto 1fr;
    overflow: hidden;
@ -181,11 +220,21 @@
  .toolbar {
    background: var(--background);
    border-bottom: var(--border-light);
-    display: grid;
-    grid-template-columns: 250px auto;
+    display: flex;
+    flex-direction: row;
    justify-content: space-between;
-    padding: var(--spacing-m) calc(var(--spacing-xl) * 2);
    align-items: center;
+    padding: var(--spacing-m) calc(var(--spacing-xl) * 2);
+  }
+  .mobile-toggle,
+  .mobile-logo {
+    display: none;
+  }
+  .user-dropdown {
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
  }
  img {
    width: 28px;
@ -199,4 +248,43 @@
  .content {
    overflow: auto;
  }
+
+  @media (max-width: 640px) {
+    .toolbar {
+      background: var(--background);
+      border-bottom: var(--border-light);
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      padding: var(--spacing-m) calc(var(--spacing-xl) * 1.5);
+    }
+
+    .nav {
+      position: absolute;
+      left: -250px;
+      height: 100%;
+      transition: left ease-in-out 230ms;
+      z-index: 100;
+    }
+    .nav.visible {
+      left: 0;
+      box-shadow: 0 0 80px 20px rgba(0, 0, 0, 0.3);
+    }
+
+    .mobile-toggle,
+    .mobile-logo {
+      display: block;
+    }
+
+    .mobile-toggle,
+    .user-dropdown {
+      flex: 1 1 0;
+    }
+
+    /* Reduce BBUI page padding */
+    .content :global(> *) {
+      padding: calc(var(--spacing-xl) * 1.5) !important;
+    }
+  }
 </style>
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@ -201,7 +201,7 @@
        <Heading>Apps</Heading>
        <ButtonGroup>
          <Button secondary on:click={initiateAppImport}>Import app</Button>
-          <Button cta on:click={initiateAppCreation}>Create new app</Button>
+          <Button cta on:click={initiateAppCreation}>Create app</Button>
        </ButtonGroup>
      </div>
      <div class="filter">
@ -347,4 +347,10 @@
    justify-content: center;
    align-items: center;
  }
+
+  @media (max-width: 640px) {
+    .appTable {
+      grid-template-columns: 1fr auto;
+    }
+  }
 </style>
--- a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
@ -272,7 +272,7 @@
  })
 </script>

-<Layout>
+<Layout noPadding>
  <Layout gap="XS" noPadding>
    <Heading size="M">Authentication</Heading>
    <Body>
@ -285,19 +285,17 @@
    <Divider />
    <Layout gap="XS" noPadding>
      <Heading size="S">
-        <div>
+        <div class="provider-title">
          <GoogleLogo />
-          Google
-          <div class="google-save-button">
-            <div>
-              <Button
-                disabled={googleSaveButtonDisabled}
-                size="s"
-                cta
-                on:click={() => save([providers.google])}>Save</Button
-              >
-            </div>
-          </div>
+          <span>Google</span>
+          <Button
+            disabled={googleSaveButtonDisabled}
+            size="s"
+            cta
+            on:click={() => save([providers.google])}
+          >
+            Save
+          </Button>
        </div>
      </Heading>
      <Body size="S">
@ -317,12 +315,8 @@
        </div>
      {/each}
      <div class="form-row">
-        <div class="field">
-          <Label size="L">Activated</Label>
-          <span class="alignedToggle">
-            <Toggle text="" bind:value={providers.google.config.activated} />
-          </span>
-        </div>
+        <Label size="L">Activated</Label>
+        <Toggle text="" bind:value={providers.google.config.activated} />
      </div>
    </Layout>
  {/if}
@ -330,21 +324,19 @@
    <Divider />
    <Layout gap="XS" noPadding>
      <Heading size="S">
-        <div>
+        <div class="provider-title">
          <OidcLogo />
-          OpenID Connect
-          <div class="oidc-save-button">
-            <div>
-              <Button
-                disabled={oidcSaveButtonDisabled}
-                size="s"
-                cta
-                on:click={() => save([providers.oidc])}>Save</Button
-              >
-            </div>
-          </div>
-        </div></Heading
-      >
+          <span>OpenID Connect</span>
+          <Button
+            disabled={oidcSaveButtonDisabled}
+            size="s"
+            cta
+            on:click={() => save([providers.oidc])}
+          >
+            Save
+          </Button>
+        </div>
+      </Heading>
      <Body size="S">
        To allow users to authenticate using OIDC, fill out the fields below.
      </Body>
@ -360,7 +352,8 @@
          />
        </div>
      {/each}
-      <br />
+    </Layout>
+    <Layout gap="XS" noPadding>
      <Body size="S">
        To customize your login button, fill out the fields below.
      </Body>
@ -383,54 +376,37 @@
        on:change={e => onFileSelected(e)}
        bind:this={fileinput}
      />
-    </Layout>
-    <div class="form-row">
-      <div class="field">
+      <div class="form-row">
        <Label size="L">Activated</Label>
-        <span class="alignedToggle">
-          <Toggle
-            text=""
-            bind:value={providers.oidc.config.configs[0].activated}
-          />
-        </span>
+        <Toggle
+          text=""
+          bind:value={providers.oidc.config.configs[0].activated}
+        />
      </div>
-    </div>
+    </Layout>
  {/if}
 </Layout>

 <style>
-  .field {
-    display: flex;
-    align-items: center;
-  }
-
-  .alignedToggle {
-    margin-left: 63%;
-  }
-
  .form-row {
    display: grid;
-    grid-template-columns: 20% 1fr;
+    grid-template-columns: 100px 1fr;
    grid-gap: var(--spacing-l);
    align-items: center;
  }
-  span {
-    display: flex;
-    align-items: center;
-    gap: var(--spacing-s);
-  }

-  input {
+  input[type="file"] {
    display: none;
  }

-  .google-save-button {
-    display: inline-block;
-    margin-left: 400px;
+  .provider-title {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    gap: var(--spacing-m);
  }
-
-  .oidc-save-button {
-    display: inline-block;
-    margin-left: 320px;
+  .provider-title span {
+    flex: 1 1 auto;
  }
 </style>
--- a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte
+++ b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte
@ -71,90 +71,109 @@
  }
 </script>

-<Layout gap="XS" noPadding>
-  <div class="back">
-    <ActionButton
-      on:click={() => $goto("./")}
-      quiet
-      size="S"
-      icon="BackAndroid"
-    >
-      Back to email settings
-    </ActionButton>
+<Layout noPadding>
+  <Layout gap="XS" noPadding>
+    <div>
+      <ActionButton
+        on:click={() => $goto("./")}
+        quiet
+        size="S"
+        icon="BackAndroid"
+      >
+        Back to email settings
+      </ActionButton>
+    </div>
+    <header>
+      <Heading>
+        Email Template: {name}
+      </Heading>
+      <Button cta on:click={saveTemplate}>Save</Button>
+    </header>
+    <Body>
+      {description}
+      <br />
+      Change the email template here. Add dynamic content by using the bindings menu
+      on the right.
+    </Body>
+  </Layout>
+  <div>
+    <Tabs selected="Edit" on:select={fixMountBug}>
+      <Tab title="Edit">
+        <div class="template-editor">
+          <div class="template-text-editor">
+            <Editor
+              editorHeight={640}
+              bind:this={htmlEditor}
+              mode="handlebars"
+              on:change={e => {
+                selectedTemplate.contents = e.detail.value
+              }}
+              value={selectedTemplate?.contents}
+            />
+          </div>
+          <div class="bindings-editor">
+            <Detail size="L">Bindings</Detail>
+            {#if mounted}
+              <Tabs selected="Template">
+                <Tab title="Template">
+                  <TemplateBindings
+                    title="Template Bindings"
+                    bindings={templateBindings}
+                    onBindingClick={setTemplateBinding}
+                  />
+                </Tab>
+                <Tab title="Common">
+                  <TemplateBindings
+                    title="Common Bindings"
+                    bindings={$email?.definitions?.bindings?.common}
+                    onBindingClick={setTemplateBinding}
+                  />
+                </Tab>
+              </Tabs>
+            {/if}
+          </div>
+        </div>
+      </Tab>
+      <Tab title="Preview">
+        <div class="preview">
+          <iframe title="preview" srcdoc={previewContent} />
+        </div>
+      </Tab>
+    </Tabs>
  </div>
-  <header>
-    <Heading>
-      Email Template: {name}
-    </Heading>
-    <Button cta on:click={saveTemplate}>Save</Button>
-  </header>
-  <Detail>Description</Detail>
-  <Body>{description}</Body>
-  <Body
-    >Change the email template here. Add dynamic content by using the bindings
-    menu on the right.</Body
-  >
 </Layout>
-<Tabs selected="Edit" on:select={fixMountBug}>
-  <Tab title="Edit">
-    <div class="template-editor">
-      <Editor
-        editorHeight={800}
-        bind:this={htmlEditor}
-        mode="handlebars"
-        on:change={e => {
-          selectedTemplate.contents = e.detail.value
-        }}
-        value={selectedTemplate?.contents}
-      />
-      <div class="bindings-editor">
-        <Detail size="L">Bindings</Detail>
-        {#if mounted}
-          <Tabs selected="Template">
-            <Tab title="Template">
-              <TemplateBindings
-                title="Template Bindings"
-                bindings={templateBindings}
-                onBindingClick={setTemplateBinding}
-              />
-            </Tab>
-            <Tab title="Common">
-              <TemplateBindings
-                title="Common Bindings"
-                bindings={$email?.definitions?.bindings?.common}
-                onBindingClick={setTemplateBinding}
-              />
-            </Tab>
-          </Tabs>
-        {/if}
-      </div>
-    </div>
-  </Tab>
-  <Tab title="Preview">
-    <div class="preview">
-      <iframe title="preview" srcdoc={previewContent} />
-    </div>
-  </Tab>
-</Tabs>

 <style>
  .template-editor {
-    display: grid;
-    grid-template-columns: 1fr minmax(250px, 20%);
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: stretch;
+    flex-wrap: wrap;
    grid-gap: var(--spacing-xl);
    margin-top: var(--spacing-xl);
  }
+  .template-text-editor {
+    flex: 1 1 0;
+    min-width: 250px;
+  }
+  .bindings-editor {
+    margin-top: var(--spacing-s);
+    max-height: 640px;
+    overflow: auto;
+    flex: 0 0 300px;
+  }

  header {
    display: flex;
    width: 100%;
    justify-content: space-between;
-    margin-top: var(--spacing-l);
+    align-items: flex-start;
  }

  .preview {
-    height: 800px;
-    padding: var(--spacing-xl) 0;
+    height: 640px;
+    margin-top: calc(var(--spacing-xl) + var(--spacing-s));
    position: relative;
  }
  iframe {
--- a/packages/builder/src/pages/builder/portal/manage/email/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/email/index.svelte
@ -107,7 +107,7 @@
  fetchSmtp()
 </script>

-<Layout>
+<Layout noPadding>
  <Layout noPadding gap="XS">
    <Heading size="M">Email</Heading>
    <Body>
@ -186,7 +186,7 @@
 <style>
  .form-row {
    display: grid;
-    grid-template-columns: 25% 1fr;
+    grid-template-columns: 120px 1fr;
    grid-gap: var(--spacing-l);
    align-items: center;
  }
--- a/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
@ -95,7 +95,7 @@

 <Layout noPadding>
  <Layout gap="XS" noPadding>
-    <div class="back">
+    <div>
      <ActionButton
        on:click={() => $goto("./")}
        quiet
--- a/packages/builder/src/pages/builder/portal/manage/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/index.svelte
@ -49,7 +49,7 @@
  }
 </script>

-<Layout>
+<Layout noPadding>
  <Layout gap="XS" noPadding>
    <Heading>Users</Heading>
    <Body>
--- a/Show More
+++ b/Show More