diff --git a/lerna.json b/lerna.json
index 1bcec1de4c..cc04032307 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.4",
+  "version": "0.9.5",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/package.json b/package.json
index 71296665c7..380407d48d 100644
--- a/package.json
+++ b/package.json
@@ -40,12 +40,5 @@
     "test:e2e:ci": "lerna run cy:ci",
     "build:docker": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh && cd -",
     "build:docker:staging": "cd hosting/scripts/linux/ && ./release-to-docker-hub.sh staging && cd -"
-  },
-  "dependencies": {
-    "@spectrum-css/actionbutton": "^1.0.1",
-    "@spectrum-css/actiongroup": "^1.0.1",
-    "@spectrum-css/link": "^3.1.1",
-    "@spectrum-css/menu": "^3.0.1",
-    "@spectrum-css/toast": "^3.0.1"
   }
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
index be54f04537..f97b397ab9 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 80adccd4eb..1f5cefdcf0 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 29267f50ff..715dd8e0f1 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.4",
-    "@budibase/client": "^0.9.4",
+    "@budibase/bbui": "^0.9.5",
+    "@budibase/client": "^0.9.5",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.4",
+    "@budibase/string-templates": "^0.9.5",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index 8a83439911..d9ffdda8cf 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -91,14 +91,6 @@
         <DeployModal />
       </div>
     </div>
-    <div class="beta">
-      <Button
-        secondary
-        href="https://github.com/Budibase/budibase/discussions/categories/ideas"
-      >
-        Request feature
-      </Button>
-    </div>
     <slot />
   </div>
 {:catch error}
@@ -200,14 +192,4 @@
   i:hover {
     color: var(--ink);
   }
-
-  .beta {
-    position: absolute;
-    bottom: var(--spacing-m);
-    left: var(--spacing-m);
-    z-index: 1;
-  }
-  .beta :global(button) {
-    background-color: var(--background);
-  }
 </style>
diff --git a/packages/builder/src/pages/builder/portal/manage/_layout.svelte b/packages/builder/src/pages/builder/portal/manage/_layout.svelte
index 356b362b0b..98ae140b25 100644
--- a/packages/builder/src/pages/builder/portal/manage/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/_layout.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Page } from "@budibase/bbui"
   import { auth } from "stores/portal"
-  import { redirect } from "@roxi/routify"
+  import { page, redirect } from "@roxi/routify"
 
   // Only admins allowed here
   $: {
@@ -9,10 +9,12 @@
       $redirect("../")
     }
   }
+
+  $: console.log($page)
 </script>
 
 {#if $auth.isAdmin}
-  <Page>
+  <Page wide={$page.path.includes("email/:template")}>
     <slot />
   </Page>
 {/if}
diff --git a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte
index 182201d2ba..d1001b2d76 100644
--- a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte
+++ b/packages/builder/src/pages/builder/portal/manage/email/[template].svelte
@@ -69,71 +69,69 @@
   }
 </script>
 
-<Page wide>
-  <Layout gap="XS" noPadding>
-    <div class="back">
-      <ActionButton
-        on:click={() => $goto("./")}
-        quiet
-        size="S"
-        icon="BackAndroid"
-      >
-        Back to email settings
-      </ActionButton>
-    </div>
-    <header>
-      <Heading>
-        Email Template: {template}
-      </Heading>
-      <Button cta on:click={saveTemplate}>Save</Button>
-    </header>
-    <Body
-      >Change the email template here. Add dynamic content by using the bindings
-      menu on the right.</Body
+<Layout gap="XS" noPadding>
+  <div class="back">
+    <ActionButton
+      on:click={() => $goto("./")}
+      quiet
+      size="S"
+      icon="BackAndroid"
     >
-  </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>
+      Back to email settings
+    </ActionButton>
+  </div>
+  <header>
+    <Heading>
+      Email Template: {template}
+    </Heading>
+    <Button cta on:click={saveTemplate}>Save</Button>
+  </header>
+  <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>
-    </Tab>
-    <Tab title="Preview">
-      <div class="preview">
-        <iframe srcdoc={previewContent} />
-      </div>
-    </Tab>
-  </Tabs>
-</Page>
+    </div>
+  </Tab>
+  <Tab title="Preview">
+    <div class="preview">
+      <iframe srcdoc={previewContent} />
+    </div>
+  </Tab>
+</Tabs>
 
 <style>
   .template-editor {
diff --git a/packages/builder/src/pages/builder/portal/manage/email/index.svelte b/packages/builder/src/pages/builder/portal/manage/email/index.svelte
index 0e2e2e98fd..44442767a8 100644
--- a/packages/builder/src/pages/builder/portal/manage/email/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/email/index.svelte
@@ -76,71 +76,69 @@
   fetchSmtp()
 </script>
 
-<Page>
-  <Layout>
-    <Layout noPadding gap="XS">
-      <Heading size="M">Email</Heading>
-      <Body>
-        Sending email is not required, but highly recommended for processes such
-        as password recovery. To setup automated auth emails, simply add the
-        values below and click activate.
+<Layout>
+  <Layout noPadding gap="XS">
+    <Heading size="M">Email</Heading>
+    <Body>
+      Sending email is not required, but highly recommended for processes such
+      as password recovery. To setup automated auth emails, simply add the
+      values below and click activate.
+    </Body>
+  </Layout>
+  <Divider />
+  {#if smtpConfig}
+    <Layout gap="XS" noPadding>
+      <Heading size="S">SMTP</Heading>
+      <Body size="S">
+        To allow your app to benefit from automated auth emails, add your SMTP
+        details below.
       </Body>
     </Layout>
-    <Divider />
-    {#if smtpConfig}
-      <Layout gap="XS" noPadding>
-        <Heading size="S">SMTP</Heading>
-        <Body size="S">
-          To allow your app to benefit from automated auth emails, add your SMTP
-          details below.
-        </Body>
-      </Layout>
-      <Layout gap="XS" noPadding>
-        <div class="form-row">
-          <Label size="L">Host</Label>
-          <Input bind:value={smtpConfig.config.host} />
-        </div>
-        <div class="form-row">
-          <Label size="L">Port</Label>
-          <Input type="number" bind:value={smtpConfig.config.port} />
-        </div>
-        <div class="form-row">
-          <Label size="L">User</Label>
-          <Input bind:value={smtpConfig.config.auth.user} />
-        </div>
-        <div class="form-row">
-          <Label size="L">Password</Label>
-          <Input type="password" bind:value={smtpConfig.config.auth.pass} />
-        </div>
-        <div class="form-row">
-          <Label size="L">From email address</Label>
-          <Input type="email" bind:value={smtpConfig.config.from} />
-        </div>
-      </Layout>
-      <div>
-        <Button cta on:click={saveSmtp}>Save</Button>
+    <Layout gap="XS" noPadding>
+      <div class="form-row">
+        <Label size="L">Host</Label>
+        <Input bind:value={smtpConfig.config.host} />
       </div>
-      <Divider />
-      <Layout gap="XS" noPadding>
-        <Heading size="S">Templates</Heading>
-        <Body size="S">
-          Budibase comes out of the box with ready-made email templates to help
-          with user onboarding. Please refrain from changing the links.
-        </Body>
-      </Layout>
-      <Table
-        {customRenderers}
-        data={$email.templates}
-        schema={templateSchema}
-        {loading}
-        on:click={({ detail }) => $goto(`./${detail.purpose}`)}
-        allowEditRows={false}
-        allowSelectRows={false}
-        allowEditColumns={false}
-      />
-    {/if}
-  </Layout>
-</Page>
+      <div class="form-row">
+        <Label size="L">Port</Label>
+        <Input type="number" bind:value={smtpConfig.config.port} />
+      </div>
+      <div class="form-row">
+        <Label size="L">User</Label>
+        <Input bind:value={smtpConfig.config.auth.user} />
+      </div>
+      <div class="form-row">
+        <Label size="L">Password</Label>
+        <Input type="password" bind:value={smtpConfig.config.auth.pass} />
+      </div>
+      <div class="form-row">
+        <Label size="L">From email address</Label>
+        <Input type="email" bind:value={smtpConfig.config.from} />
+      </div>
+    </Layout>
+    <div>
+      <Button cta on:click={saveSmtp}>Save</Button>
+    </div>
+    <Divider />
+    <Layout gap="XS" noPadding>
+      <Heading size="S">Templates</Heading>
+      <Body size="S">
+        Budibase comes out of the box with ready-made email templates to help
+        with user onboarding. Please refrain from changing the links.
+      </Body>
+    </Layout>
+    <Table
+      {customRenderers}
+      data={$email.templates}
+      schema={templateSchema}
+      {loading}
+      on:click={({ detail }) => $goto(`./${detail.purpose}`)}
+      allowEditRows={false}
+      allowSelectRows={false}
+      allowEditColumns={false}
+    />
+  {/if}
+</Layout>
 
 <style>
   .form-row {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 73da05ec0b..b34517d471 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -11,6 +11,12 @@
   "scripts": {
     "build": "pkg . --out-path build"
   },
+  "pkg": {
+    "targets": [
+      "node14"
+    ],
+    "outputPath": "build"
+  },
   "dependencies": {
     "axios": "^0.21.1",
     "chalk": "^4.1.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 236a5dabbd..6644873cb5 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -18,13 +18,13 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.9.4",
+    "@budibase/string-templates": "^0.9.5",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.9.4",
+    "@budibase/standard-components": "^0.9.5",
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
     "fs-extra": "^8.1.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index eaf2f37805..996318cb0b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -55,9 +55,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.4",
-    "@budibase/client": "^0.9.4",
-    "@budibase/string-templates": "^0.9.4",
+    "@budibase/auth": "^0.9.5",
+    "@budibase/client": "^0.9.5",
+    "@budibase/string-templates": "^0.9.5",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
@@ -107,7 +107,7 @@
     "zlib": "1.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.9.4",
+    "@budibase/standard-components": "^0.9.5",
     "@jest/test-sequencer": "^24.8.0",
     "docker-compose": "^0.23.6",
     "eslint": "^6.8.0",
diff --git a/packages/server/src/api/controllers/application.js b/packages/server/src/api/controllers/application.js
index 7b61d8dee1..a8e1a5d973 100644
--- a/packages/server/src/api/controllers/application.js
+++ b/packages/server/src/api/controllers/application.js
@@ -92,10 +92,6 @@ async function createInstance(template) {
     // https://docs.couchdb.org/en/master/ddocs/views/collation.html#collation-specification
     views: {},
   })
-  // add view for linked rows
-  await createLinkView(appId)
-  await createRoutingView(appId)
-  await createAllSearchIndex(appId)
 
   // replicate the template data to the instance DB
   // this is currently very hard to test, downloading and importing template files
@@ -110,6 +106,11 @@ async function createInstance(template) {
     await db.put(USERS_TABLE_SCHEMA)
   }
 
+  // add view for linked rows
+  await createLinkView(appId)
+  await createRoutingView(appId)
+  await createAllSearchIndex(appId)
+
   return { _id: appId }
 }
 
diff --git a/packages/server/src/api/controllers/automation.js b/packages/server/src/api/controllers/automation.js
index 20e54fe238..c9c8759fd6 100644
--- a/packages/server/src/api/controllers/automation.js
+++ b/packages/server/src/api/controllers/automation.js
@@ -65,7 +65,10 @@ async function checkForCronTriggers({ appId, oldAuto, newAuto }) {
   // need to create cron job
   else if (isCronTrigger(newAuto) && cronTriggerActivated) {
     const job = await triggers.automationQueue.add(
-      { automation: newAuto, event: { appId } },
+      {
+        automation: newAuto,
+        event: { appId, timestamp: Date.now() },
+      },
       { repeat: { cron: newTrigger.inputs.cron } }
     )
     // Assign cron job ID from bull so we can remove it later if the cron trigger is removed
diff --git a/packages/server/src/automations/triggers.js b/packages/server/src/automations/triggers.js
index 812c601fa7..332710a3e4 100644
--- a/packages/server/src/automations/triggers.js
+++ b/packages/server/src/automations/triggers.js
@@ -216,7 +216,15 @@ const BUILTIN_DEFINITIONS = {
         },
         required: ["cron"],
       },
-      outputs: {},
+      outputs: {
+        properties: {
+          timestamp: {
+            type: "number",
+            description: "Timestamp the cron was executed",
+          },
+        },
+        required: ["timestamp"],
+      },
     },
     type: "TRIGGER",
   },
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 811d7eacfc..17dce44c83 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -29,11 +29,11 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.9.4",
+  "version": "0.9.5",
   "license": "MIT",
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc",
   "dependencies": {
-    "@budibase/bbui": "^0.9.4",
+    "@budibase/bbui": "^0.9.5",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
     "apexcharts": "^3.22.1",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 3ed19ad37b..c59cff5615 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 0e777ded5d..74829bb236 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.4",
-    "@budibase/string-templates": "^0.9.4",
+    "@budibase/auth": "^0.9.5",
+    "@budibase/string-templates": "^0.9.5",
     "@koa/router": "^8.0.0",
     "aws-sdk": "^2.811.0",
     "bcryptjs": "^2.4.3",
diff --git a/yarn.lock b/yarn.lock
index f344bd8338..8678a07d03 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -824,31 +824,6 @@
     estree-walker "^1.0.1"
     micromatch "^4.0.2"
 
-"@spectrum-css/actionbutton@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577"
-  integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw==
-
-"@spectrum-css/actiongroup@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c"
-  integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA==
-
-"@spectrum-css/link@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb"
-  integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA==
-
-"@spectrum-css/menu@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe"
-  integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg==
-
-"@spectrum-css/toast@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796"
-  integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg==
-
 "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"