diff --git a/packages/builder/cypress/integration/createComponents.spec.js b/packages/builder/cypress/integration/createComponents.spec.js
index d6c471b74f..2e247f7110 100644
--- a/packages/builder/cypress/integration/createComponents.spec.js
+++ b/packages/builder/cypress/integration/createComponents.spec.js
@@ -5,7 +5,7 @@ xcontext('Create Components', () => {
         cy.visit('localhost:4001/_builder')
         // https://on.cypress.io/type
         cy.createApp('Model App', 'Model App Description')
-        cy.createModel('dog', 'name', 'age')
+        cy.createTable('dog', 'name', 'age')
         cy.addRecord('bob', '15')
     })
 
diff --git a/packages/builder/cypress/integration/createTable.spec.js b/packages/builder/cypress/integration/createTable.spec.js
index d44a7cc6d6..7a567af426 100644
--- a/packages/builder/cypress/integration/createTable.spec.js
+++ b/packages/builder/cypress/integration/createTable.spec.js
@@ -1,42 +1,41 @@
-xcontext('Create a Table', () => {
+context('Create a Table', () => {
 
     before(() => {
         cy.visit('localhost:4001/_builder')
-        // https://on.cypress.io/type
         cy.createApp('Table App', 'Table App Description')
     })
 
     // https://on.cypress.io/interacting-with-elements
     it('should create a new Table', () => {
 
-        cy.createTable('dog', 'name', 'age')
+        cy.createTable('dog')
 
         // Check if Table exists
         cy.get('.title').should('have.text', 'dog')
     })
 
-    it('adds a new column to the table', () => {
-        cy.addRecord('bob', '15')
+    // it('adds a new column to the table', () => {
+    //     cy.addRecord('bob', '15')
 
-        cy.contains('bob').should('have.text', 'bob')
-    })
+    //     cy.contains('bob').should('have.text', 'bob')
+    // })
 
-    it('updates a column on the table', () => {
-        cy.addRecord('bob', '15')
+    // it('updates a column on the table', () => {
+    //     cy.addRecord('bob', '15')
 
-        cy.contains('bob').should('have.text', 'bob')
-    })
+    //     cy.contains('bob').should('have.text', 'bob')
+    // })
 
-    it('edits a record', () => {
-        cy.addRecord('bob', '15')
+    // it('edits a record', () => {
+    //     cy.addRecord('bob', '15')
 
-        cy.contains('bob').should('have.text', 'bob')
-    })
+    //     cy.contains('bob').should('have.text', 'bob')
+    // })
 
-    it('deletes a record', () => {
-        cy.addRecord('bob', '15')
+    // it('deletes a record', () => {
+    //     cy.addRecord('bob', '15')
 
-        cy.contains('bob').should('have.text', 'bob')
-    })
+    //     cy.contains('bob').should('have.text', 'bob')
+    // })
 
 })
diff --git a/packages/builder/cypress/integration/createWorkflow.spec.js b/packages/builder/cypress/integration/createWorkflow.spec.js
index ed14ce1487..f341bf86b1 100644
--- a/packages/builder/cypress/integration/createWorkflow.spec.js
+++ b/packages/builder/cypress/integration/createWorkflow.spec.js
@@ -9,7 +9,7 @@ xcontext('Create a workflow', () => {
 
     // https://on.cypress.io/interacting-with-elements
     it('should create a workflow', () => {
-        cy.createModel('dog', 'name', 'age')
+        cy.createTable('dog', 'name', 'age')
 
         cy.contains('workflow').click()
         cy.contains('Create New Workflow').click()
diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js
index abd44d7061..d6e2ce5ad5 100644
--- a/packages/builder/cypress/support/commands.js
+++ b/packages/builder/cypress/support/commands.js
@@ -57,22 +57,28 @@ Cypress.Commands.add("createApp", name => {
     })
 })
 
-Cypress.Commands.add("createModel", modelName => {
+Cypress.Commands.add("createTable", tableName => {
   // Enter model name
   cy.contains("Create New Table").click()
-  cy.get("[data-cy=table-name-input]").type(modelName)
+  cy.get("[placeholder='Table Name']").type(tableName)
 
   // Add 'name' field
-  cy.contains("Add").click()
-  cy.contains("Plain Text").click()
-
-  // Add 'age' field
-  cy.contains("Add").click()
-  cy.contains("Number").click()
-
   cy.contains("Save").click()
+  cy.contains(tableName).should("be.visible")
+})
 
-  cy.contains(modelName).click()
+Cypress.Commands.add("addColumn", (tableName, columnName, type) => {
+  // Select Table
+  cy.contains(tableName).click()
+
+  // Click "Create New Column"
+  // Fill in dropdown
+  //hit save 
+  // assertions
+
+  // Add 'name' field
+  cy.contains("Save").click()
+  cy.contains(modelName).should("be.visible").click()
 })
 
 Cypress.Commands.add("addRecord", (firstField, secondField) => {
diff --git a/packages/builder/src/builderStore/store/backend.js b/packages/builder/src/builderStore/store/backend.js
index 3063c71a82..09227c09a7 100644
--- a/packages/builder/src/builderStore/store/backend.js
+++ b/packages/builder/src/builderStore/store/backend.js
@@ -83,13 +83,16 @@ export const getBackendUiStore = () => {
         await store.actions.models.fetch()
         store.actions.models.select(savedModel)
       },
+      delete: async model => {
+        await api.delete(`/api/models/${model._id}/${model._rev}`)
+        store.update(state => {
+          state.selectedModel = state.models[0] || {} 
+          state.models = state.models.filter(existing => existing._id !== model._id)
+          return state
+        })
+      },
       saveField: ({ originalName, field }) => {
         store.update(state => {
-          // TODO: is this necessary?
-          // if (!state.draftModel.schema) {
-          //   state.draftModel.schema = {}
-          // }
-
           // delete the original if renaming
           delete state.draftModel.schema[originalName]
 
diff --git a/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte b/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte
index 7476e7454e..8bebccd07d 100644
--- a/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte
+++ b/packages/builder/src/components/database/ModelDataTable/ModelDataTable.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from "svelte"
-  import fsort from "fast-sort";
+  import fsort from "fast-sort"
   import { store, backendUiStore } from "builderStore"
   import { Button, Icon } from "@budibase/bbui"
   import Select from "components/common/Select.svelte"
@@ -71,13 +71,15 @@
     <h2 class="title">{$backendUiStore.selectedModel.name}</h2>
     <div class="popovers">
       <ColumnPopover />
-      <RowPopover />
+      {#if Object.keys($backendUiStore.selectedModel.schema).length > 0}
+        <RowPopover />
+      {/if}
     </div>
   </div>
   <table class="uk-table">
     <thead>
       <tr>
-        <th>
+        <th class="edit-header">
           <div>Edit</div>
         </th>
         {#each headers as header}
@@ -146,16 +148,21 @@
     font-size: 14px;
     text-rendering: optimizeLegibility;
     transition: 0.5s all;
+    vertical-align: middle;
   }
 
-  /* thead th div {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  } */
+  .edit-header {
+    width: 100px;
+    cursor: default;
+  }
+
+  .edit-header:hover {
+    color: var(--ink);
+  }
 
   th:hover {
     color: var(--blue);
+    cursor: pointer;
   }
 
   td {
@@ -183,36 +190,7 @@
     display: flex;
   }
 
-  .ri-more-line:hover,
-  .uk-dropdown-nav li:hover {
-    cursor: pointer;
-  }
-
   .no-data {
-    padding: 20px;
-  }
-
-  li {
-    display: flex;
-    align-items: center;
-    border-radius: 5px;
-  }
-
-  i {
-    color: var(--grey-7);
-    margin-right: 8px;
-    font-size: 20px;
-  }
-
-  .label {
-    color: var(--grey-7);
-    font-size: 14px;
-    font-family: inter;
-    font-weight: 400;
-    margin: 12px 0px;
-  }
-  .label:hover {
-    color: var(--ink);
-    cursor: pointer;
+    padding: 14px;
   }
 </style>
diff --git a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditColumn.svelte
index 892d50ac5a..833c49a7ce 100644
--- a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditColumn.svelte
@@ -18,9 +18,8 @@
 
   export let onClosed
   export let field = {}
-  export let columnName
 
-  let originalName = columnName
+  let originalName = field.name
 
   $: required =
     field.constraints &&
@@ -36,10 +35,7 @@
     backendUiStore.update(state => {
       backendUiStore.actions.models.saveField({
         originalName,
-        field: {
-          ...field,
-          name: columnName
-        }
+        field
       })
 
       return state
@@ -49,7 +45,7 @@
 </script>
 
 <div class="actions">
-  <Input placeholder="Name" thin bind:value={columnName} />
+  <Input placeholder="Name" thin bind:value={field.name} />
 
   <Select secondary thin bind:value={field.type}>
     {#each Object.values(FIELDS) as field}
diff --git a/packages/builder/src/components/database/ModelDataTable/modals/DeleteTable.svelte b/packages/builder/src/components/database/ModelDataTable/modals/DeleteTable.svelte
new file mode 100644
index 0000000000..65471a7b28
--- /dev/null
+++ b/packages/builder/src/components/database/ModelDataTable/modals/DeleteTable.svelte
@@ -0,0 +1,64 @@
+<script>
+  import ActionButton from "components/common/ActionButton.svelte"
+  import { notifier } from "builderStore/store/notifications"
+  import { store, backendUiStore } from "builderStore"
+  import * as api from "../api"
+
+  export let table
+  export let onClosed
+
+  function deleteTable() {
+    backendUiStore.actions.models.delete(table)
+  }
+</script>
+
+<section>
+  <div class="content">
+    <heading>
+      <i class="ri-information-line alert" />
+      <h4 class="budibase__title--4">Delete Table</h4>
+    </heading>
+    <p>
+      Are you sure you want to delete this table? All of your data will be
+      permanently removed. This action cannot be undone.
+    </p>
+  </div>
+  <div class="modal-actions">
+    <ActionButton on:click={onClosed}>Cancel</ActionButton>
+    <ActionButton
+      alert
+      on:click={async () => {
+        await backendUiStore.actions.models.delete(table)
+        notifier.danger('Table deleted')
+        onClosed()
+      }}>
+      Delete
+    </ActionButton>
+  </div>
+</section>
+
+<style>
+  .alert {
+    color: rgba(255, 0, 31, 1);
+    background: var(--grey-1);
+    padding: 5px;
+  }
+
+  .modal-actions {
+    padding: 10px;
+    background: var(--grey-1);
+    border-top: 1px solid #ccc;
+  }
+
+  heading {
+    display: flex;
+    align-items: center;
+  }
+  .content {
+    padding: 30px;
+  }
+
+  h4 {
+    margin: 0 0 0 10px;
+  }
+</style>
diff --git a/packages/builder/src/components/database/ModelDataTable/popovers/ColumnHeader.svelte b/packages/builder/src/components/database/ModelDataTable/popovers/ColumnHeader.svelte
index c0862c97cb..edbb56569a 100644
--- a/packages/builder/src/components/database/ModelDataTable/popovers/ColumnHeader.svelte
+++ b/packages/builder/src/components/database/ModelDataTable/popovers/ColumnHeader.svelte
@@ -13,6 +13,9 @@
 
   let editing
 
+  $: sortColumn = $backendUiStore.sort && $backendUiStore.sort.column
+  $: sortDirection = $backendUiStore.sort && $backendUiStore.sort.direction
+
   function showEditor() {
     editing = true
   }
@@ -44,8 +47,8 @@
     <h4>Edit Column</h4>
     <CreateEditColumn
       onClosed={hideEditor}
-      field={field.field}
-      columnName={field.name} />
+      field={field}
+    />
   {:else}
     <ul>
       <li on:click={showEditor}>
@@ -56,14 +59,18 @@
         <Icon name="delete" />
         Delete
       </li>
-      <li on:click={() => sort('asc', field.name)}>
-        <Icon name="sortascending" />
-        Sort A - Z
-      </li>
-      <li on:click={() => sort('desc', field.name)}>
-        <Icon name="sortdescending" />
-        Sort Z - A
-      </li>
+      {#if sortDirection === 'desc' || sortColumn !== field.name}
+        <li on:click={() => sort('asc', field.name)}>
+          <Icon name="sortascending" />
+          Sort A - Z
+        </li>
+      {/if}
+      {#if sortDirection === 'asc' || sortColumn !== field.name}
+        <li on:click={() => sort('desc', field.name)}>
+          <Icon name="sortdescending" />
+          Sort Z - A
+        </li>
+      {/if}
     </ul>
   {/if}
 </DropdownMenu>
diff --git a/packages/builder/src/components/nav/ModelNavigator/CreateEditTable.svelte b/packages/builder/src/components/nav/ModelNavigator/CreateTable.svelte
similarity index 94%
rename from packages/builder/src/components/nav/ModelNavigator/CreateEditTable.svelte
rename to packages/builder/src/components/nav/ModelNavigator/CreateTable.svelte
index 201d6d03c0..f22655f536 100644
--- a/packages/builder/src/components/nav/ModelNavigator/CreateEditTable.svelte
+++ b/packages/builder/src/components/nav/ModelNavigator/CreateTable.svelte
@@ -25,7 +25,10 @@
 <DropdownMenu bind:this={dropdown} {anchor} align="left">
   <div class="container">
     <h4>Create Table</h4>
-    <Input placeholder="Table Name" thin bind:value={name} />
+    <Input
+      placeholder="Table Name"
+      thin
+      bind:value={name} />
   </div>
   <footer>
     <div class="button-margin-3">
diff --git a/packages/builder/src/components/nav/ModelNavigator/EditTable.svelte b/packages/builder/src/components/nav/ModelNavigator/EditTable.svelte
new file mode 100644
index 0000000000..f5b425a4b2
--- /dev/null
+++ b/packages/builder/src/components/nav/ModelNavigator/EditTable.svelte
@@ -0,0 +1,133 @@
+<script>
+  import { getContext } from "svelte"
+  import { backendUiStore } from "builderStore"
+  import { DropdownMenu, Button, Icon, Input, Select } from "@budibase/bbui"
+  import { FIELDS } from "constants/backend"
+  import DeleteTableModal from "components/database/ModelDataTable/modals/DeleteTable.svelte"
+
+  const { open, close } = getContext("simple-modal")
+
+  export let table
+
+  let anchor
+  let dropdown
+
+  let editing
+
+  function showEditor() {
+    editing = true
+  }
+
+  function hideEditor() {
+    dropdown.hide()
+    editing = false
+    close()
+  }
+
+  const deleteTable = () => {
+    open(
+      DeleteTableModal,
+      {
+        onClosed: close,
+        table,
+      },
+      { styleContent: { padding: "0" } }
+    )
+  }
+
+  function save() {}
+</script>
+
+<div bind:this={anchor} on:click={dropdown.show}>
+  <i class="ri-more-line" />
+</div>
+<DropdownMenu bind:this={dropdown} {anchor} align="left">
+  {#if editing}
+    <div class="container">
+      <h4>Edit Table</h4>
+      <Input placeholder="Table Name" thin bind:value={table.name} />
+    </div>
+    <footer>
+      <div class="button-margin-3">
+        <Button secondary on:click={hideEditor}>Cancel</Button>
+      </div>
+      <div class="button-margin-4">
+        <Button primary on:click={save}>Save</Button>
+      </div>
+    </footer>
+  {:else}
+    <ul>
+      <li on:click={showEditor}>
+        <Icon name="edit" />
+        Edit
+      </li>
+      <li on:click={deleteTable}>
+        <Icon name="delete" />
+        Delete
+      </li>
+    </ul>
+  {/if}
+</DropdownMenu>
+
+<style>
+  h4 {
+    padding: var(--spacing-l);
+    margin: 0;
+  }
+
+  ul {
+    list-style: none;
+    padding-left: 0;
+    margin: 0;
+    padding: var(--spacing-s) 0;
+  }
+
+  li {
+    display: flex;
+    font-family: var(--font-sans);
+    font-size: var(--font-size-xs);
+    color: var(--ink);
+    padding: var(--spacing-s) var(--spacing-m);
+    margin: auto 0px;
+    align-items: center;
+    cursor: pointer;
+  }
+
+  li:hover {
+    background-color: var(--grey-2);
+  }
+
+  li:active {
+    color: var(--blue);
+  }
+
+  .container {
+    padding: var(--spacing-l);
+    margin: 0;
+  }
+
+  footer {
+    padding: 20px;
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr 1fr;
+    gap: 20px;
+    background: var(--grey-1);
+    border-bottom-left-radius: 0.5rem;
+    border-bottom-left-radius: 0.5rem;
+  }
+
+  .button-margin-1 {
+    grid-column-start: 1;
+    display: grid;
+  }
+
+  .button-margin-3 {
+    grid-column-start: 3;
+    display: grid;
+  }
+
+  .button-margin-4 {
+    grid-column-start: 4;
+    display: grid;
+  }
+</style>
diff --git a/packages/builder/src/components/nav/ModelNavigator/ListItem.svelte b/packages/builder/src/components/nav/ModelNavigator/ListItem.svelte
index 34fc577b7f..5fb2832162 100644
--- a/packages/builder/src/components/nav/ModelNavigator/ListItem.svelte
+++ b/packages/builder/src/components/nav/ModelNavigator/ListItem.svelte
@@ -21,7 +21,8 @@
     padding: 0 10px 0 10px;
     height: 36px;
     border-radius: 5px;
-    display: flex;
+    display: grid;
+    grid-template-columns: 30px 1fr 20px;
     align-items: center;
     transition: 0.3s background-color;
     color: var(--ink);
diff --git a/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte b/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte
index 60e6125b41..4b912de5b8 100644
--- a/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte
+++ b/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte
@@ -6,7 +6,8 @@
   import { store, backendUiStore } from "builderStore"
   import ListItem from "./ListItem.svelte"
   import { Button } from "@budibase/bbui"
-  import CreateTablePopover from "./CreateEditTable.svelte"
+  import CreateTablePopover from "./CreateTable.svelte"
+  import EditTablePopover from "./EditTable.svelte"
 
   const { open, close } = getContext("simple-modal")
 
@@ -52,8 +53,8 @@
               title={model.name}
               icon="ri-table-fill"
               on:click={() => selectModel(model)}>
-
-              </ListItem>
+              <EditTablePopover table={model} />
+            </ListItem>
           {/each}
         </div>
       </div>
diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js
index 59aafc73b8..dc6f873843 100644
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.js
@@ -65,15 +65,15 @@ export const FIELDS = {
   //     presence: { allowEmpty: true },
   //   },
   // },
-  LINKED_FIELDS: {
-    name: "Linked Fields",
-    icon: "ri-link",
-    type: "link",
-    modelId: null,
-    constraints: {
-      type: "array",
-    },
-  },
+  // LINKED_FIELDS: {
+  //   name: "Linked Fields",
+  //   icon: "ri-link",
+  //   type: "link",
+  //   modelId: null,
+  //   constraints: {
+  //     type: "array",
+  //   },
+  // },
 }
 
 export const BLOCKS = {