diff --git a/lerna.json b/lerna.json
index c6a99591de..5d5fb16e81 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.1.17",
+  "version": "0.1.19",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/builder/cypress/integration/createTable.spec.js b/packages/builder/cypress/integration/createTable.spec.js
index c744eb7e4f..214727ab7d 100644
--- a/packages/builder/cypress/integration/createTable.spec.js
+++ b/packages/builder/cypress/integration/createTable.spec.js
@@ -38,10 +38,10 @@ context('Create a Table', () => {
     it('edits a record', () => {
         cy.get("tbody .ri-more-line").click()
         cy.get("[data-cy=edit-row]").click()
-        cy.get(".actions input").type("updatedRecord")
+        cy.get(".actions input").type("Updated")
         cy.contains("Save").click()
 
-        cy.contains('updatedRecord').should('have.text', 'updatedRecord')
+        cy.contains('RoverUpdated').should('have.text', 'RoverUpdated')
     })
 
     it('deletes a record', () => {
@@ -49,7 +49,7 @@ context('Create a Table', () => {
         cy.get("[data-cy=delete-row]").click()
         cy.get(".modal-actions").contains("Delete").click()
 
-        cy.contains('updatedRecord').should('not.exist')
+        cy.contains('RoverUpdated').should('not.exist')
     })
 
     it('deletes a column', () => {
diff --git a/packages/builder/package.json b/packages/builder/package.json
index e223397508..07b3287f18 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -58,7 +58,7 @@
   },
   "dependencies": {
     "@budibase/bbui": "^1.24.1",
-    "@budibase/client": "^0.1.17",
+    "@budibase/client": "^0.1.19",
     "@budibase/colorpicker": "^1.0.1",
     "@sentry/browser": "5.19.1",
     "@svelteschool/svelte-forms": "^0.7.0",
diff --git a/packages/builder/src/builderStore/store/backend.js b/packages/builder/src/builderStore/store/backend.js
index 80f931686b..6e75323b6d 100644
--- a/packages/builder/src/builderStore/store/backend.js
+++ b/packages/builder/src/builderStore/store/backend.js
@@ -93,7 +93,13 @@ export const getBackendUiStore = () => {
       saveField: ({ originalName, field }) => {
         store.update(state => {
           // delete the original if renaming
-          delete state.draftModel.schema[originalName]
+          if (originalName) {
+            delete state.draftModel.schema[originalName]
+            state.draftModel._rename = {
+              old: originalName,
+              updated: field.name,
+            }
+          }
 
           state.draftModel.schema[field.name] = cloneDeep(field)
 
diff --git a/packages/builder/src/components/database/DataTable/ModelDataTable.svelte b/packages/builder/src/components/database/DataTable/ModelDataTable.svelte
index 6233e8cc19..25f9c1e78e 100644
--- a/packages/builder/src/components/database/DataTable/ModelDataTable.svelte
+++ b/packages/builder/src/components/database/DataTable/ModelDataTable.svelte
@@ -45,9 +45,9 @@
   $: sort = $backendUiStore.sort
   $: sorted = sort ? fsort(data)[sort.direction](sort.column) : data
 
-  $: headers = Object.keys($backendUiStore.selectedModel.schema).filter(
-    id => !INTERNAL_HEADERS.includes(id)
-  )
+  $: headers = Object.keys($backendUiStore.selectedModel.schema)
+    .sort()
+    .filter(id => !INTERNAL_HEADERS.includes(id))
 
   $: schema = $backendUiStore.selectedModel.schema
 </script>
@@ -178,7 +178,6 @@
 
   .popovers {
     display: flex;
-    gap: var(--spacing-m);
   }
 
   .no-data {
diff --git a/packages/builder/src/components/database/DataTable/Table.svelte b/packages/builder/src/components/database/DataTable/Table.svelte
index 8068a270cb..bbed4a6be3 100644
--- a/packages/builder/src/components/database/DataTable/Table.svelte
+++ b/packages/builder/src/components/database/DataTable/Table.svelte
@@ -132,7 +132,10 @@
 
   .popovers {
     display: flex;
-    gap: var(--spacing-l);
+  }
+
+  :global(.popovers > div) {
+    margin-right: var(--spacing-m);
   }
 
   .no-data {
diff --git a/packages/builder/src/components/database/DataTable/popovers/View.svelte b/packages/builder/src/components/database/DataTable/popovers/View.svelte
index fce61c9859..40d685d771 100644
--- a/packages/builder/src/components/database/DataTable/popovers/View.svelte
+++ b/packages/builder/src/components/database/DataTable/popovers/View.svelte
@@ -43,7 +43,7 @@
 
 <div bind:this={anchor}>
   <TextButton text small on:click={dropdown.show}>
-    <Icon name="addrow" />
+    <Icon name="view" />
     Create New View
   </TextButton>
 </div>
diff --git a/packages/cli/package.json b/packages/cli/package.json
index bad7db76d8..45aafc54a8 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "budibase",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "Budibase CLI",
   "repository": "https://github.com/Budibase/Budibase",
   "homepage": "https://www.budibase.com",
@@ -17,7 +17,7 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/server": "^0.1.17",
+    "@budibase/server": "^0.1.19",
     "@inquirer/password": "^0.0.6-alpha.0",
     "chalk": "^2.4.2",
     "dotenv": "^8.2.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 49d598fb03..7ee809f47e 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.esm.mjs",
diff --git a/packages/server/package.json b/packages/server/package.json
index 448bff00d7..b3baaf7852 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/server",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -42,7 +42,7 @@
   "author": "Michael Shanks",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.1.17",
+    "@budibase/client": "^0.1.19",
     "@koa/router": "^8.0.0",
     "@sendgrid/mail": "^7.1.1",
     "@sentry/node": "^5.19.2",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 99c92d042c..b42f3edeee 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -13,7 +13,7 @@
     "dev:builder": "rollup -cw"
   },
   "devDependencies": {
-    "@budibase/client": "^0.1.17",
+    "@budibase/client": "^0.1.19",
     "@rollup/plugin-commonjs": "^11.1.0",
     "lodash": "^4.17.15",
     "rollup": "^1.11.0",
@@ -31,7 +31,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.1.17",
+  "version": "0.1.19",
   "license": "MIT",
   "gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691",
   "dependencies": {