diff --git a/lerna.json b/lerna.json
index 1102d1e9d0..d761f49f6d 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.9.154-alpha.1",
+  "version": "0.9.156",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index bc890882f7..c2b70119de 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.154-alpha.1",
+  "version": "0.9.156",
   "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 2657593a0c..35ae9f46a7 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.154-alpha.1",
+  "version": "0.9.156",
   "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 44233f152a..e97c1aa4bd 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.154-alpha.1",
+  "version": "0.9.156",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.154-alpha.1",
-    "@budibase/client": "^0.9.154-alpha.1",
+    "@budibase/bbui": "^0.9.156",
+    "@budibase/client": "^0.9.156",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.154-alpha.1",
+    "@budibase/string-templates": "^0.9.156",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
index 9913333054..a52fbdb177 100644
--- a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
@@ -68,5 +68,5 @@
   {/if}
   <ManageAccessButton resourceId={decodeURI(name)} />
   <HideAutocolumnButton bind:hideAutocolumns />
-  <ExportButton {view} />
+  <ExportButton view={view.name} />
 </Table>
diff --git a/packages/builder/src/components/design/AppPreview/iframeTemplate.js b/packages/builder/src/components/design/AppPreview/iframeTemplate.js
index d992be8cd7..58557273f2 100644
--- a/packages/builder/src/components/design/AppPreview/iframeTemplate.js
+++ b/packages/builder/src/components/design/AppPreview/iframeTemplate.js
@@ -64,7 +64,7 @@ export default `
           appId,
           theme,
           customTheme,
-          previewDevice
+          previewDevice,
         } = parsed
 
         // Set some flags so the app knows we're in the builder
diff --git a/packages/builder/src/components/start/TemplateList.svelte b/packages/builder/src/components/start/TemplateList.svelte
index 576415762a..deddd92880 100644
--- a/packages/builder/src/components/start/TemplateList.svelte
+++ b/packages/builder/src/components/start/TemplateList.svelte
@@ -33,7 +33,10 @@
         </div>
       {/each}
       <div class="template start-from-scratch" on:click={() => onSelect(null)}>
-        <div class="background-icon" style={`background: var(--background);`}>
+        <div
+          class="background-icon"
+          style={`background: rgb(50, 50, 50); color: white;`}
+        >
           <Icon name="Add" />
         </div>
         <Heading size="XS">Start from scratch</Heading>
@@ -74,7 +77,7 @@
     align-items: center;
     cursor: pointer;
     border-radius: 4px;
-    background: #1a1a1a;
+    background: var(--background-alt);
     padding: 8px 16px;
   }
 
diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js
index f522095473..7beb25a1b4 100644
--- a/packages/builder/src/stores/portal/auth.js
+++ b/packages/builder/src/stores/portal/auth.js
@@ -56,7 +56,7 @@ export function createAuthStore() {
         analytics.identify(user._id, user)
         analytics.showChat({
           email: user.email,
-          created_at: user.createdAt || Date.now(),
+          created_at: (user.createdAt || Date.now()) / 1000,
           name: user.name,
           user_id: user._id,
           tenant: user.tenantId,
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 62a90b5c6d..32a1fded6d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.154-alpha.1",
+  "version": "0.9.156",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index d4ddb724f3..cab9a8fe65 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.154-alpha.1",
+  "version": "0.9.156",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.154-alpha.1",
+    "@budibase/bbui": "^0.9.156",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.154-alpha.1",
+    "@budibase/string-templates": "^0.9.156",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
diff --git a/packages/client/src/components/MadeInBudibase.svelte b/packages/client/src/components/MadeInBudibase.svelte
new file mode 100644
index 0000000000..2e5d6336f1
--- /dev/null
+++ b/packages/client/src/components/MadeInBudibase.svelte
@@ -0,0 +1,42 @@
+<a
+  href="https://www.budibase.com/?utm_source=budibase-apps-public-screens&utm_medium=badge&utm_campaign=made-in-budibase"
+>
+  <div>
+    <img src="https://i.imgur.com/Xhdt1YP.png" alt="Budibase" />
+    <p>Made In Budibase</p>
+  </div>
+</a>
+
+<style>
+  div {
+    position: absolute;
+    right: 20px;
+    bottom: 20px;
+    padding: 10px;
+    border-radius: 5px;
+    background: var(--spectrum-alias-background-color-primary);
+    z-index: 999999 !important;
+    visibility: visible !important;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border: 1px solid;
+    border-color: var(--spectrum-global-color-gray-300) !important;
+    height: 45px;
+  }
+
+  p {
+    text-decoration: none;
+    color: var(--spectrum-heading-m-text-color);
+  }
+
+  a:visited {
+    text-decoration: none;
+    color: var(--spectrum-heading-m-text-color);
+  }
+
+  img {
+    height: 20px;
+    margin-right: 10px;
+  }
+</style>
diff --git a/packages/server/package.json b/packages/server/package.json
index afe8bebf2c..c1de0be72c 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.154-alpha.1",
+  "version": "0.9.156",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -66,9 +66,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.154-alpha.1",
-    "@budibase/client": "^0.9.154-alpha.1",
-    "@budibase/string-templates": "^0.9.154-alpha.1",
+    "@budibase/auth": "^0.9.156",
+    "@budibase/client": "^0.9.156",
+    "@budibase/string-templates": "^0.9.156",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",
diff --git a/packages/server/src/api/controllers/analytics.js b/packages/server/src/api/controllers/analytics.js
index e6e5d6a748..0c0761840e 100644
--- a/packages/server/src/api/controllers/analytics.js
+++ b/packages/server/src/api/controllers/analytics.js
@@ -21,9 +21,12 @@ exports.endUserPing = async ctx => {
     return
   }
 
-  posthogClient.capture("budibase:end_user_ping", {
-    userId: ctx.user && ctx.user._id,
-    appId: ctx.appId,
+  posthogClient.capture({
+    event: "budibase:end_user_ping",
+    distinctId: ctx.user && ctx.user._id,
+    properties: {
+      appId: ctx.appId,
+    },
   })
 
   ctx.body = {
diff --git a/packages/server/src/api/controllers/view/utils.js b/packages/server/src/api/controllers/view/utils.js
index 1f3b980882..27fccaf47f 100644
--- a/packages/server/src/api/controllers/view/utils.js
+++ b/packages/server/src/api/controllers/view/utils.js
@@ -2,6 +2,8 @@ const {
   ViewNames,
   generateMemoryViewID,
   getMemoryViewParams,
+  DocumentTypes,
+  SEPARATOR,
 } = require("../../../db/utils")
 const env = require("../../../environment")
 
@@ -10,6 +12,11 @@ exports.getView = async (db, viewName) => {
     const designDoc = await db.get("_design/database")
     return designDoc.views[viewName]
   } else {
+    // This is a table view, don't read the view from the DB
+    if (viewName.startsWith(DocumentTypes.TABLE + SEPARATOR)) {
+      return null
+    }
+
     const viewDoc = await db.get(generateMemoryViewID(viewName))
     return viewDoc.view
   }
diff --git a/packages/server/src/middleware/currentapp.js b/packages/server/src/middleware/currentapp.js
index f43345b2fe..99f9d2318c 100644
--- a/packages/server/src/middleware/currentapp.js
+++ b/packages/server/src/middleware/currentapp.js
@@ -45,6 +45,7 @@ module.exports = async (ctx, next) => {
     // retrieving global user gets the right role
     roleId = globalUser.roleId || BUILTIN_ROLE_IDS.BASIC
   }
+
   // nothing more to do
   if (!appId) {
     return next()
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 923ed47404..ef9c4ae10d 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.154-alpha.1",
+  "version": "0.9.156",
   "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 d996413f98..58284e108b 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.154-alpha.1",
+  "version": "0.9.156",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -27,8 +27,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.154-alpha.1",
-    "@budibase/string-templates": "^0.9.154-alpha.1",
+    "@budibase/auth": "^0.9.156",
+    "@budibase/string-templates": "^0.9.156",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",