diff --git a/lerna.json b/lerna.json
index c1db9b0eba..3470e54f0f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.0.27",
+  "version": "0.0.29",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/bootstrap-components/package.json b/packages/bootstrap-components/package.json
index 31983def43..23e805c479 100644
--- a/packages/bootstrap-components/package.json
+++ b/packages/bootstrap-components/package.json
@@ -12,7 +12,7 @@
     "publishdev": "yarn build && node ./scripts/publishDev.js"
   },
   "devDependencies": {
-    "@budibase/client": "^0.0.27",
+    "@budibase/client": "^0.0.29",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.15",
     "npm-run-all": "^4.1.5",
@@ -30,7 +30,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.0.27",
+  "version": "0.0.29",
   "license": "MIT",
   "gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e"
 }
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 96a5d322f6..8d9c07c204 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -38,7 +38,7 @@
     ]
   },
   "dependencies": {
-    "@budibase/client": "^0.0.27",
+    "@budibase/client": "^0.0.29",
     "@nx-js/compiler-util": "^2.0.0",
     "codemirror": "^5.51.0",
     "date-fns": "^1.29.0",
diff --git a/packages/builder/src/NoPackage.svelte b/packages/builder/src/NoPackage.svelte
index 188051b42c..c15df26036 100644
--- a/packages/builder/src/NoPackage.svelte
+++ b/packages/builder/src/NoPackage.svelte
@@ -16,7 +16,7 @@
       <div>
         <h4 style="margin-bottom: 20px">Choose an Application</h4>
         {#each $store.apps as app}
-          <a href={`#/${app}`} class="app-link">{app}</a>
+          <a href={`#${app}`} class="app-link">{app}</a>
         {/each}
       </div>
     </div>
diff --git a/packages/builder/src/components/nav/DatabasesList.svelte b/packages/builder/src/components/nav/DatabasesList.svelte
index 422e1b3136..8a40f76599 100644
--- a/packages/builder/src/components/nav/DatabasesList.svelte
+++ b/packages/builder/src/components/nav/DatabasesList.svelte
@@ -1,6 +1,7 @@
 <script>
   import { tick } from "svelte"
   import { store, backendUiStore } from "builderStore"
+  import api from "builderStore/api"
   import getIcon from "../common/icon"
   import { CheckIcon } from "../common/Icons"
 
@@ -13,6 +14,23 @@
     backendUiStore.actions.views.select(views[0])
     backendUiStore.actions.database.select(database)
   }
+
+  async function deleteDatabase(database) {
+    const DELETE_DATABASE_URL = `/_builder/instance/_master/0/api/record/applications/${$store.appId}/instances/${database.id}`
+    const response = await api.delete(DELETE_DATABASE_URL)
+    store.update(state => {
+      state.appInstances = state.appInstances.filter(
+        db => db.id !== database.id
+      )
+      return state
+    })
+  }
+
+  onMount(() => {
+    if ($store.appInstances.length > 0) {
+      selectDatabase($store.appInstances[0])
+    }
+  })
 </script>
 
 <div class="root">
@@ -24,12 +42,15 @@
             <CheckIcon />
           {/if}
         </span>
-
+        <i
+          class="ri-delete-bin-7-line hoverable uk-margin-small-left"
+          on:click={() => deleteDatabase(database)} />
         <button
           class:active={database.id === $backendUiStore.selectedDatabase.id}
           on:click={() => selectDatabase(database)}>
           {database.name}
         </button>
+
       </li>
     {/each}
   </ul>
@@ -53,6 +74,8 @@
 
   li {
     margin: 0.5rem 0;
+    display: flex;
+    align-items: center;
   }
 
   button {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8870733b15..c7dfcb3121 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "budibase",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "Budibase CLI",
   "repository": "https://github.com/Budibase/Budibase",
   "homepage": "https://budibase.com",
@@ -20,8 +20,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/datastores": "^0.0.27",
-    "@budibase/server": "^0.0.27",
+    "@budibase/datastores": "^0.0.29",
+    "@budibase/server": "^0.0.29",
     "@inquirer/password": "^0.0.6-alpha.0",
     "chalk": "^2.4.2",
     "fs-extra": "^8.1.0",
diff --git a/packages/client/package.json b/packages/client/package.json
index 6af3018f49..634883b247 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.esm.mjs",
diff --git a/packages/core/package.json b/packages/core/package.json
index 5313825ef6..90f7b2022b 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/core",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "core javascript library for budibase",
   "main": "dist/budibase-core.umd.js",
   "module": "dist/budibase-core.esm.js",
diff --git a/packages/datastores/package.json b/packages/datastores/package.json
index bc92da3570..46454d5425 100644
--- a/packages/datastores/package.json
+++ b/packages/datastores/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/datastores",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "implementations of all the datastores... azureblob, local etc",
   "main": "index.js",
   "scripts": {
@@ -27,7 +27,7 @@
     "@babel/core": "^7.1.2",
     "@babel/node": "^7.0.0",
     "@babel/preset-env": "^7.1.0",
-    "@budibase/core": "^0.0.27",
+    "@budibase/core": "^0.0.29",
     "es6-promisify": "^6.0.1",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.13",
diff --git a/packages/materialdesign-components/package.json b/packages/materialdesign-components/package.json
index 7328dcfa0b..299dd7bdda 100644
--- a/packages/materialdesign-components/package.json
+++ b/packages/materialdesign-components/package.json
@@ -12,8 +12,8 @@
     "publishdev": "yarn build && node ./scripts/publishDev.js"
   },
   "devDependencies": {
-    "@budibase/client": "^0.0.27",
-    "@budibase/standard-components": "^0.0.27",
+    "@budibase/client": "^0.0.29",
+    "@budibase/standard-components": "^0.0.29",
     "@material/button": "^4.0.0",
     "@material/checkbox": "^4.0.0",
     "@material/data-table": "4.0.0",
@@ -50,7 +50,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.0.27",
+  "version": "0.0.29",
   "license": "MIT",
   "gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e",
   "dependencies": {
diff --git a/packages/materialdesign-components/src/Checkbox/Checkbox.svelte b/packages/materialdesign-components/src/Checkbox/Checkbox.svelte
index 9a6c6119fb..205efd400a 100644
--- a/packages/materialdesign-components/src/Checkbox/Checkbox.svelte
+++ b/packages/materialdesign-components/src/Checkbox/Checkbox.svelte
@@ -68,7 +68,6 @@
 
   function handleOnClick() {
     let item = { _id, checked, label, value }
-    debugger
     if (context === "checkboxgroup") {
       let idx = selectedItems.getItemIdx($selectedItems, _id)
       if (idx > -1) {
diff --git a/packages/materialdesign-components/src/Checkbox/CheckboxGroup.svelte b/packages/materialdesign-components/src/Checkbox/CheckboxGroup.svelte
index 2070e903b8..89449185f2 100644
--- a/packages/materialdesign-components/src/Checkbox/CheckboxGroup.svelte
+++ b/packages/materialdesign-components/src/Checkbox/CheckboxGroup.svelte
@@ -24,7 +24,6 @@
       if (_bb.isBound(_bb.props.value)) {
         _bb.setStateFromBinding(_bb.props.value, value)
       }
-      debugger
       _bb.call(onChange, value)
     }, value)
     _bb.setContext("BBMD:checkbox:selectedItemsStore", selectedItemsStore)
diff --git a/packages/materialdesign-components/src/DatePicker/DatePicker.svelte b/packages/materialdesign-components/src/DatePicker/DatePicker.svelte
index bfc250ede6..f9db97a107 100644
--- a/packages/materialdesign-components/src/DatePicker/DatePicker.svelte
+++ b/packages/materialdesign-components/src/DatePicker/DatePicker.svelte
@@ -98,6 +98,7 @@
 
 <div class="mdc-menu-surface--anchor">
   <Textfield
+    {_bb}
     {label}
     onChange={dateFieldChange}
     value={selectedDate}
diff --git a/packages/materialdesign-components/src/Textfield/Textfield.svelte b/packages/materialdesign-components/src/Textfield/Textfield.svelte
index ace20dbf3f..046c3ebc6e 100644
--- a/packages/materialdesign-components/src/Textfield/Textfield.svelte
+++ b/packages/materialdesign-components/src/Textfield/Textfield.svelte
@@ -129,6 +129,7 @@ TODO:Needs error handling - this will depend on how Budibase handles errors
       {#if renderLeadingIcon}
         {#if useIconButton}
           <IconButton
+            {_bb}
             {icon}
             context="mdc-text-field__icon mdc-text-field__icon--leading"
             onClick={iconButtonClick} />
@@ -152,6 +153,7 @@ TODO:Needs error handling - this will depend on how Budibase handles errors
       {#if renderTrailingIcon}
         {#if useIconButton}
           <IconButton
+            {_bb}
             {icon}
             context="mdc-text-field__icon mdc-text-field__icon--trailing"
             onClick={iconButtonClick} />
diff --git a/packages/server/package.json b/packages/server/package.json
index 5a5b34d25f..4edfe6e1bc 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/server",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "Budibase Web Server",
   "main": "index.js",
   "scripts": {
@@ -16,8 +16,8 @@
   "author": "Michael Shanks",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.0.27",
-    "@budibase/core": "^0.0.27",
+    "@budibase/client": "^0.0.29",
+    "@budibase/core": "^0.0.29",
     "@koa/router": "^8.0.0",
     "fs-extra": "^8.1.0",
     "koa": "^2.7.0",
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index a4055224ff..6d76b20f01 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -12,7 +12,7 @@
     "publishdev": "yarn build && node ./scripts/publishDev.js"
   },
   "devDependencies": {
-    "@budibase/client": "^0.0.27",
+    "@budibase/client": "^0.0.29",
     "@nx-js/compiler-util": "^2.0.0",
     "bcryptjs": "2.4.3",
     "fs-extra": "^8.1.0",
@@ -32,7 +32,7 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.0.27",
+  "version": "0.0.29",
   "license": "MIT",
   "gitHead": "72a77a035eb7c1443b079bf93c29b3e5fe02094e"
 }