diff --git a/packages/builder/src/builderStore/store/backend.js b/packages/builder/src/builderStore/store/backend.js
index 16fd12ada4..ddd0174c09 100644
--- a/packages/builder/src/builderStore/store/backend.js
+++ b/packages/builder/src/builderStore/store/backend.js
@@ -1,5 +1,5 @@
 import { writable } from "svelte/store"
-import { cloneDeep } from "lodash/fp";
+import { cloneDeep } from "lodash/fp"
 import api from "../api"
 
 export const getBackendUiStore = () => {
@@ -12,8 +12,8 @@ export const getBackendUiStore = () => {
     draftModel: {},
     tabs: {
       SETUP_PANEL: "SETUP",
-      NAVIGATION_PANEL: "NAVIGATE"
-    }
+      NAVIGATION_PANEL: "NAVIGATE",
+    },
   }
 
   const store = writable(INITIAL_BACKEND_UI_STATE)
@@ -28,7 +28,7 @@ export const getBackendUiStore = () => {
         store.update(state => {
           state.selectedDatabase = db
           if (models && models.length > 0) {
-            store.actions.models.select(models[0]);
+            store.actions.models.select(models[0])
           }
           state.models = models
           state.views = views
@@ -49,24 +49,25 @@ export const getBackendUiStore = () => {
         }),
     },
     models: {
-      select: model => store.update(state => {
-        state.selectedModel = model;
-        state.draftModel = cloneDeep(model);
-        state.selectedField = ""
-        state.selectedView = `all_${model._id}`
-        state.tabs.SETUP_PANEL = "SETUP"
-        return state;
-      }),
+      select: model =>
+        store.update(state => {
+          state.selectedModel = model
+          state.draftModel = cloneDeep(model)
+          state.selectedField = ""
+          state.selectedView = `all_${model._id}`
+          state.tabs.SETUP_PANEL = "SETUP"
+          return state
+        }),
       save: async ({ instanceId, model }) => {
-        const updatedModel = cloneDeep(model);
+        const updatedModel = cloneDeep(model)
 
         // TODO: refactor
         for (let key in updatedModel.schema) {
           const field = updatedModel.schema[key]
-          if (field.name && field.name !== key) { 
-            updatedModel.schema[field.name] = field 
-            delete updatedModel.schema[key];
-          } 
+          if (field.name && field.name !== key) {
+            updatedModel.schema[field.name] = field
+            delete updatedModel.schema[key]
+          }
         }
 
         const SAVE_MODEL_URL = `/api/${instanceId}/models`
@@ -78,8 +79,10 @@ export const getBackendUiStore = () => {
           if (!model._id) {
             state.models = [...state.models, savedModel]
           } else {
-            const existingIdx = state.models.findIndex(({ _id }) => _id === model._id);
-            state.models.splice(existingIdx, 1, savedModel);
+            const existingIdx = state.models.findIndex(
+              ({ _id }) => _id === model._id
+            )
+            state.models.splice(existingIdx, 1, savedModel)
             state.models = state.models
           }
 
@@ -95,7 +98,7 @@ export const getBackendUiStore = () => {
 
           state.draftModel.schema = {
             ...state.draftModel.schema,
-            [field.name]: field
+            [field.name]: field,
           }
 
           state.selectedField = field.name
@@ -103,7 +106,7 @@ export const getBackendUiStore = () => {
           state.tabs.NAVIGATION_PANEL = "NAVIGATE"
 
           return state
-        });
+        })
       },
     },
     views: {
diff --git a/packages/builder/src/components/common/Block.svelte b/packages/builder/src/components/common/Block.svelte
index 168834b5a8..0d4cb1b9e2 100644
--- a/packages/builder/src/components/common/Block.svelte
+++ b/packages/builder/src/components/common/Block.svelte
@@ -30,7 +30,7 @@
   i {
     font-size: 30px;
   }
-  
+
   span {
     font-size: 14px;
     text-align: center;
@@ -53,5 +53,4 @@
   .tertiary {
     background: var(--white);
   }
-
 </style>
diff --git a/packages/builder/src/components/common/LinkedRecordSelector.svelte b/packages/builder/src/components/common/LinkedRecordSelector.svelte
index 18adfda61e..b4787773b3 100644
--- a/packages/builder/src/components/common/LinkedRecordSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRecordSelector.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { onMount } from "svelte";
+  import { onMount } from "svelte"
   import { backendUiStore } from "builderStore"
   import api from "builderStore/api"
 
@@ -19,7 +19,7 @@
   })
 
   function linkRecord(record) {
-    linkedRecords.push(record);
+    linkedRecords.push(record)
   }
 </script>
 
@@ -65,4 +65,4 @@
     font-size: 14px;
     word-break: break-word;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte
index 7c31ea3bf3..f96e2530a6 100644
--- a/packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte
+++ b/packages/builder/src/components/database/ModelDataTable/modals/CreateEditRecord.svelte
@@ -1,7 +1,7 @@
 <script>
   import { onMount } from "svelte"
   import { store, backendUiStore } from "builderStore"
-  import { notifier } from "@beyonk/svelte-notifications";
+  import { notifier } from "@beyonk/svelte-notifications"
   import { compose, map, get, flatten } from "lodash/fp"
   import ActionButton from "components/common/ActionButton.svelte"
   import LinkedRecordSelector from "components/common/LinkedRecordSelector.svelte"
@@ -64,7 +64,7 @@
     backendUiStore.update(state => {
       state.selectedView = state.selectedView
       onClosed()
-      notifier.success("Record created successfully.");
+      notifier.success("Record created successfully.")
       return state
     })
   }
@@ -76,7 +76,7 @@
   <form on:submit|preventDefault class="uk-form-stacked">
     {#each modelSchema as [key, meta]}
       <div class="uk-margin">
-        {#if meta.type === "link"}
+        {#if meta.type === 'link'}
           <LinkedRecordSelector modelId={meta.modelId} />
         {:else}
           <RecordFieldControl
diff --git a/packages/builder/src/components/nav/HierarchyRow.svelte b/packages/builder/src/components/nav/HierarchyRow.svelte
index 22bff89b80..3baacd208e 100644
--- a/packages/builder/src/components/nav/HierarchyRow.svelte
+++ b/packages/builder/src/components/nav/HierarchyRow.svelte
@@ -3,9 +3,7 @@
   import { store, backendUiStore } from "builderStore"
   import { cloneDeep } from "lodash/fp"
   import getIcon from "../common/icon"
-  import {
-    CreateEditViewModal,
-  } from "components/database/ModelDataTable/modals"
+  import { CreateEditViewModal } from "components/database/ModelDataTable/modals"
   import api from "builderStore/api"
 
   const { open, close } = getContext("simple-modal")
diff --git a/packages/builder/src/components/nav/ModelNavigator/BlockNavigator.svelte b/packages/builder/src/components/nav/ModelNavigator/BlockNavigator.svelte
index 7ca8d56372..ed6e58ee54 100644
--- a/packages/builder/src/components/nav/ModelNavigator/BlockNavigator.svelte
+++ b/packages/builder/src/components/nav/ModelNavigator/BlockNavigator.svelte
@@ -1,6 +1,6 @@
 <script>
   import * as blockDefinitions from "constants/backend"
-  import { backendUiStore } from "builderStore";
+  import { backendUiStore } from "builderStore"
   import Block from "components/common/Block.svelte"
 
   const HEADINGS = [
diff --git a/packages/builder/src/components/nav/ModelNavigator/EmptyModel.svelte b/packages/builder/src/components/nav/ModelNavigator/EmptyModel.svelte
index fa6b7d095a..8ea1f4ac79 100644
--- a/packages/builder/src/components/nav/ModelNavigator/EmptyModel.svelte
+++ b/packages/builder/src/components/nav/ModelNavigator/EmptyModel.svelte
@@ -1,11 +1,11 @@
 <script>
-  import { backendUiStore } from "builderStore";
-	import { fade } from 'svelte/transition';
-  import { FIELDS, BLOCKS, MODELS } from "constants/backend";
-  import Block from "components/common/Block.svelte";
+  import { backendUiStore } from "builderStore"
+  import { fade } from "svelte/transition"
+  import { FIELDS, BLOCKS, MODELS } from "constants/backend"
+  import Block from "components/common/Block.svelte"
 
   function addNewField(field) {
-    backendUiStore.actions.models.addField(field);
+    backendUiStore.actions.models.addField(field)
   }
 </script>
 
@@ -20,7 +20,11 @@
     <p>Blocks are pre-made fields and help you build your model quicker.</p>
     <div class="blocks">
       {#each Object.values(FIELDS) as field}
-        <Block primary title={field.name} icon={field.icon} on:click={() => addNewField(field)} />
+        <Block
+          primary
+          title={field.name}
+          icon={field.icon}
+          on:click={() => addNewField(field)} />
       {/each}
     </div>
   </div>
@@ -30,7 +34,11 @@
     <p>Blocks are pre-made fields and help you build your model quicker.</p>
     <div class="blocks">
       {#each Object.values(BLOCKS) as field}
-        <Block secondary title={field.name} icon={field.icon} on:click={() => addNewField(field)} />
+        <Block
+          secondary
+          title={field.name}
+          icon={field.icon}
+          on:click={() => addNewField(field)} />
       {/each}
     </div>
   </div>
@@ -78,4 +86,4 @@
     grid-auto-columns: 110px;
     grid-gap: 20px;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte b/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte
index b0b0d9ca24..3d9aeb64fd 100644
--- a/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte
+++ b/packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte
@@ -1,6 +1,6 @@
 <script>
   import { getContext } from "svelte"
-	import { slide } from 'svelte/transition';
+  import { slide } from "svelte/transition"
   import { Switcher } from "@budibase/bbui"
   import { goto } from "@sveltech/routify"
   import { store, backendUiStore } from "builderStore"
@@ -21,7 +21,7 @@
     },
   ]
 
-  $: selectedTab = $backendUiStore.tabs.NAVIGATION_PANEL 
+  $: selectedTab = $backendUiStore.tabs.NAVIGATION_PANEL
 
   function selectModel(model, fieldName) {
     backendUiStore.actions.models.select(model)
@@ -30,7 +30,7 @@
       backendUiStore.update(state => {
         state.selectedField = fieldName
         return state
-      });
+      })
     }
   }
 
@@ -47,10 +47,14 @@
   {#if $backendUiStore.selectedDatabase && $backendUiStore.selectedDatabase._id}
     <div class="hierarchy">
       <div class="components-list-container">
-        <Switcher headings={HEADINGS} bind:value={$backendUiStore.tabs.NAVIGATION_PANEL}>
+        <Switcher
+          headings={HEADINGS}
+          bind:value={$backendUiStore.tabs.NAVIGATION_PANEL}>
           {#if selectedTab === 'NAVIGATE'}
-          <Button secondary wide on:click={setupForNewModel}>Create New Model</Button>
-          <div class="hierarchy-items-container">
+            <Button secondary wide on:click={setupForNewModel}>
+              Create New Model
+            </Button>
+            <div class="hierarchy-items-container">
               {#each $backendUiStore.models as model}
                 <ListItem
                   selected={!$backendUiStore.selectedField && model._id === $backendUiStore.selectedModel._id}
diff --git a/packages/builder/src/components/nav/ModelSetupNav/ModelFieldEditor.svelte b/packages/builder/src/components/nav/ModelSetupNav/ModelFieldEditor.svelte
index d76e782ee7..f5b4b39392 100644
--- a/packages/builder/src/components/nav/ModelSetupNav/ModelFieldEditor.svelte
+++ b/packages/builder/src/components/nav/ModelSetupNav/ModelFieldEditor.svelte
@@ -38,44 +38,42 @@
   </div>
 </div>
 
-  <div class="info">
-    <div class="field">
-      <label>Required</label>
-      <input type="checkbox" />
-    </div>
+<div class="info">
+  <div class="field">
+    <label>Required</label>
+    <input type="checkbox" />
+  </div>
 
-    {#if field.type === 'string'}
-      <NumberBox
-        label="Max Length"
-        bind:value={field.constraints.length.maximum} />
-      <ValuesList
-        label="Categories"
-        bind:values={field.constraints.inclusion} />
-    {:else if field.type === 'datetime'}
-      <DatePicker
-        label="Min Value"
-        bind:value={field.constraints.datetime.earliest} />
-      <DatePicker
-        label="Max Value"
-        bind:value={field.constraints.datetime.latest} />
-    {:else if field.type === 'number'}
-      <NumberBox
-        label="Min Value"
-        bind:value={field.constraints.numericality.greaterThanOrEqualTo} />
-      <NumberBox
-        label="Max Value"
-        bind:value={field.constraints.numericality.lessThanOrEqualTo} />
-    {:else if field.type === 'link'}
-      <div class="field">
-        <label>Link</label>
-        <select class="budibase__input" bind:value={field.modelId}>
-          <option value={''} />
-          {#each $backendUiStore.models as model}
-            <option value={model._id}>{model.name}</option>
-          {/each}
-        </select>
-      </div>
-    {/if}
+  {#if field.type === 'string'}
+    <NumberBox
+      label="Max Length"
+      bind:value={field.constraints.length.maximum} />
+    <ValuesList label="Categories" bind:values={field.constraints.inclusion} />
+  {:else if field.type === 'datetime'}
+    <DatePicker
+      label="Min Value"
+      bind:value={field.constraints.datetime.earliest} />
+    <DatePicker
+      label="Max Value"
+      bind:value={field.constraints.datetime.latest} />
+  {:else if field.type === 'number'}
+    <NumberBox
+      label="Min Value"
+      bind:value={field.constraints.numericality.greaterThanOrEqualTo} />
+    <NumberBox
+      label="Max Value"
+      bind:value={field.constraints.numericality.lessThanOrEqualTo} />
+  {:else if field.type === 'link'}
+    <div class="field">
+      <label>Link</label>
+      <select class="budibase__input" bind:value={field.modelId}>
+        <option value={''} />
+        {#each $backendUiStore.models as model}
+          <option value={model._id}>{model.name}</option>
+        {/each}
+      </select>
+    </div>
+  {/if}
 </div>
 
 <style>
diff --git a/packages/builder/src/components/nav/ModelSetupNav/ModelSetupNav.svelte b/packages/builder/src/components/nav/ModelSetupNav/ModelSetupNav.svelte
index 2407ee7f60..5f7275e0e5 100644
--- a/packages/builder/src/components/nav/ModelSetupNav/ModelSetupNav.svelte
+++ b/packages/builder/src/components/nav/ModelSetupNav/ModelSetupNav.svelte
@@ -25,8 +25,8 @@
 
   $: edited =
     $backendUiStore.selectedField ||
-    $backendUiStore.draftModel &&
-    $backendUiStore.draftModel.name !== $backendUiStore.selectedModel.name
+    ($backendUiStore.draftModel &&
+      $backendUiStore.draftModel.name !== $backendUiStore.selectedModel.name)
 
   async function deleteModel() {
     const model = $backendUiStore.selectedModel
diff --git a/packages/builder/src/components/nav/ModelSetupNav/index.js b/packages/builder/src/components/nav/ModelSetupNav/index.js
index 39fb8755d3..e772d21707 100644
--- a/packages/builder/src/components/nav/ModelSetupNav/index.js
+++ b/packages/builder/src/components/nav/ModelSetupNav/index.js
@@ -1 +1 @@
-export { default as ModelSetupNav } from "./ModelSetupNav.svelte";
\ No newline at end of file
+export { default as ModelSetupNav } from "./ModelSetupNav.svelte"
diff --git a/packages/builder/src/components/userInterface/Colorpicker/ButtonGroup.svelte b/packages/builder/src/components/userInterface/Colorpicker/ButtonGroup.svelte
index f9c402ac81..bacb7ced34 100644
--- a/packages/builder/src/components/userInterface/Colorpicker/ButtonGroup.svelte
+++ b/packages/builder/src/components/userInterface/Colorpicker/ButtonGroup.svelte
@@ -1,12 +1,21 @@
 <script>
-  import FlatButton from "./FlatButton.svelte";
+  import FlatButton from "./FlatButton.svelte"
 
-  export let format = "hex";
-  export let onclick = format => {};
+  export let format = "hex"
+  export let onclick = format => {}
 
-  let colorFormats = ["hex", "rgb", "hsl"];
+  let colorFormats = ["hex", "rgb", "hsl"]
 </script>
 
+<div class="flatbutton-group">
+  {#each colorFormats as text}
+    <FlatButton
+      selected={format === text}
+      {text}
+      on:click={() => onclick(text)} />
+  {/each}
+</div>
+
 <style>
   .flatbutton-group {
     font-weight: 500;
@@ -16,12 +25,3 @@
     justify-content: center;
   }
 </style>
-
-<div class="flatbutton-group">
-  {#each colorFormats as text}
-    <FlatButton
-      selected={format === text}
-      {text}
-      on:click={() => onclick(text)} />
-  {/each}
-</div>
diff --git a/packages/builder/src/components/userInterface/Colorpicker/Colorpicker.svelte b/packages/builder/src/components/userInterface/Colorpicker/Colorpicker.svelte
index 936756f403..9813c9ff28 100644
--- a/packages/builder/src/components/userInterface/Colorpicker/Colorpicker.svelte
+++ b/packages/builder/src/components/userInterface/Colorpicker/Colorpicker.svelte
@@ -1,123 +1,79 @@
 <script>
-  import { onMount, createEventDispatcher } from "svelte";
+  import { onMount, createEventDispatcher } from "svelte"
 
   import {
     getColorFormat,
     convertToHSVA,
-    convertHsvaToFormat
-  } from "./utils.js";
-  import Slider from "./Slider.svelte";
-  import Palette from "./Palette.svelte";
-  import ButtonGroup from "./ButtonGroup.svelte";
-  import Input from "./Input.svelte";
+    convertHsvaToFormat,
+  } from "./utils.js"
+  import Slider from "./Slider.svelte"
+  import Palette from "./Palette.svelte"
+  import ButtonGroup from "./ButtonGroup.svelte"
+  import Input from "./Input.svelte"
 
-  export let value = "#3ec1d3ff";
-  export let format = "hexa";
+  export let value = "#3ec1d3ff"
+  export let format = "hexa"
 
-  let h = null;
-  let s = null;
-  let v = null;
-  let a = null;
+  let h = null
+  let s = null
+  let v = null
+  let a = null
 
-  const dispatch = createEventDispatcher();
+  const dispatch = createEventDispatcher()
 
   onMount(() => {
     if (format) {
       convertAndSetHSVA()
     }
-  });
+  })
 
   function convertAndSetHSVA() {
-    let hsva = convertToHSVA(value, format);
-    setHSVA(hsva);
+    let hsva = convertToHSVA(value, format)
+    setHSVA(hsva)
   }
 
   function setHSVA([hue, sat, val, alpha]) {
-    h = hue;
-    s = sat;
-    v = val;
-    a = alpha;
+    h = hue
+    s = sat
+    v = val
+    a = alpha
   }
 
   //fired by choosing a color from the palette
   function setSaturationAndValue({ detail }) {
-    s = detail.s;
-    v = detail.v;
-    value = convertHsvaToFormat([h, s, v, a], format);
+    s = detail.s
+    v = detail.v
+    value = convertHsvaToFormat([h, s, v, a], format)
     dispatch("change", value)
   }
 
   function setHue(hue) {
-    h = hue;
-    value = convertHsvaToFormat([h, s, v, a], format);    
+    h = hue
+    value = convertHsvaToFormat([h, s, v, a], format)
   }
 
   function setAlpha(alpha) {
-    a = alpha === "1.00" ? "1" :alpha;
-    value = convertHsvaToFormat([h, s, v, a], format);    
+    a = alpha === "1.00" ? "1" : alpha
+    value = convertHsvaToFormat([h, s, v, a], format)
   }
 
   function changeFormatAndConvert(f) {
-    format = f;
+    format = f
     console.log(f)
-    value = convertHsvaToFormat([h, s, v, a], format);
+    value = convertHsvaToFormat([h, s, v, a], format)
   }
 
   function handleColorInput(text) {
     let f = getColorFormat(text)
-    if(f) {
-      format = f;
+    if (f) {
+      format = f
       value = text
       convertAndSetHSVA()
       dispatch("change", value)
     }
   }
-
 </script>
 
-<style>
-  .colorpicker-container {
-    display: flex;
-    font-size: 11px;
-    font-weight: 400;
-    flex-direction: column;
-    height: 300px;
-    width: 250px;
-    background: #ffffff;
-    border-radius: 2px;
-    box-shadow: 0 0.15em 1.5em 0 rgba(0,0,0,.1), 0 0 1em 0 rgba(0,0,0,.03);
-  }
-
-  .control-panel {
-    display: flex;
-    flex-direction: column;
-    padding: 8px;
-    background: white;
-    border: 1px solid #d2d2d2
-  }
-
-  .alpha-hue-panel {
-    display: grid;
-    grid-template-columns: 25px 1fr;
-    grid-gap: 15px;
-    justify-content: center;
-    align-items: center;
-  }
-
-  .selected-color {
-    width: 30px;
-    height: 30px;
-    border-radius: 50%;
-    border: 1px solid #dedada;
-  }
-
-  .format-input-panel {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-  }
-</style>
-
 <div class="colorpicker-container">
 
   <Palette on:change={setSaturationAndValue} {h} {s} {v} {a} />
@@ -143,3 +99,47 @@
   </div>
 
 </div>
+
+<style>
+  .colorpicker-container {
+    display: flex;
+    font-size: 11px;
+    font-weight: 400;
+    flex-direction: column;
+    height: 300px;
+    width: 250px;
+    background: #ffffff;
+    border-radius: 2px;
+    box-shadow: 0 0.15em 1.5em 0 rgba(0, 0, 0, 0.1),
+      0 0 1em 0 rgba(0, 0, 0, 0.03);
+  }
+
+  .control-panel {
+    display: flex;
+    flex-direction: column;
+    padding: 8px;
+    background: white;
+    border: 1px solid #d2d2d2;
+  }
+
+  .alpha-hue-panel {
+    display: grid;
+    grid-template-columns: 25px 1fr;
+    grid-gap: 15px;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .selected-color {
+    width: 30px;
+    height: 30px;
+    border-radius: 50%;
+    border: 1px solid #dedada;
+  }
+
+  .format-input-panel {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+</style>
diff --git a/packages/builder/src/components/userInterface/Colorpicker/Colorpreview.svelte b/packages/builder/src/components/userInterface/Colorpicker/Colorpreview.svelte
index fa880b6292..1f637f7483 100644
--- a/packages/builder/src/components/userInterface/Colorpicker/Colorpreview.svelte
+++ b/packages/builder/src/components/userInterface/Colorpicker/Colorpreview.svelte
@@ -1,143 +1,170 @@
 <script>
-    import Colorpicker from "./Colorpicker.svelte"
-    import {createEventDispatcher, afterUpdate, beforeUpdate} from "svelte"
-    import {buildStyle} from "./helpers.js"
-    import { fade } from 'svelte/transition';
-    import {getColorFormat} from "./utils.js"
+  import Colorpicker from "./Colorpicker.svelte"
+  import { createEventDispatcher, afterUpdate, beforeUpdate } from "svelte"
+  import { buildStyle } from "./helpers.js"
+  import { fade } from "svelte/transition"
+  import { getColorFormat } from "./utils.js"
 
-    export let value = "#3ec1d3ff"
-    export let open = false;
-    export let width = "25px"
-    export let height = "25px"
+  export let value = "#3ec1d3ff"
+  export let open = false
+  export let width = "25px"
+  export let height = "25px"
 
-    let format = "hexa";
-    let dimensions = {top: 0, left: 0}
-    let colorPreview = null
+  let format = "hexa"
+  let dimensions = { top: 0, left: 0 }
+  let colorPreview = null
 
-    let previewHeight = null    
-    let previewWidth = null
-    let pickerWidth = 250
-    let pickerHeight = 300
+  let previewHeight = null
+  let previewWidth = null
+  let pickerWidth = 250
+  let pickerHeight = 300
 
-    let anchorEl = null
-    let parentNodes = [];
-    let errorMsg = null
+  let anchorEl = null
+  let parentNodes = []
+  let errorMsg = null
 
-    $: previewStyle = buildStyle({width, height, background: value})
-    $: errorPreviewStyle = buildStyle({width, height})
-    $: pickerStyle = buildStyle({top: `${dimensions.top}px`, left: `${dimensions.left}px`})    
+  $: previewStyle = buildStyle({ width, height, background: value })
+  $: errorPreviewStyle = buildStyle({ width, height })
+  $: pickerStyle = buildStyle({
+    top: `${dimensions.top}px`,
+    left: `${dimensions.left}px`,
+  })
 
-    const dispatch = createEventDispatcher()
+  const dispatch = createEventDispatcher()
 
-    beforeUpdate(() => {
-       format = getColorFormat(value)
-       if(!format) {
-           errorMsg = `Colorpicker - ${value} is an unknown color format. Please use a hex, rgb or hsl value`
-           console.error(errorMsg)
-       }else{
-           errorMsg = null
-       }
-    })
-
-    afterUpdate(() => {
-        if(colorPreview && colorPreview.offsetParent && !anchorEl) {
-            //Anchor relative to closest positioned ancestor element. If none, then anchor to body
-            anchorEl = colorPreview.offsetParent 
-                let curEl = colorPreview
-                let els = []
-                //Travel up dom tree from preview element to find parent elements that scroll
-                while(!anchorEl.isSameNode(curEl)) {
-                    curEl = curEl.parentNode
-                    let elOverflow = window.getComputedStyle(curEl).getPropertyValue("overflow")                    
-                    if(/scroll|auto/.test(elOverflow)) {
-                        els.push(curEl)
-                    }
-                } 
-                parentNodes = els
-        }
-    })
-
-
-    function openColorpicker(event) {
-        if(colorPreview) {
-            const {top: spaceAbove, width, bottom, right, left: spaceLeft} = colorPreview.getBoundingClientRect()   
-            const {innerHeight, innerWidth} = window
-
-            const {offsetLeft, offsetTop} = colorPreview
-            //get the scrollTop value for all scrollable parent elements 
-            let scrollTop = parentNodes.reduce((scrollAcc, el) => scrollAcc += el.scrollTop, 0);
-
-            const spaceBelow = (innerHeight - spaceAbove) - previewHeight
-            const top = spaceAbove > spaceBelow ? (offsetTop - pickerHeight) - scrollTop : (offsetTop + previewHeight) - scrollTop      
-            
-            //TOO: Testing and Scroll Awareness for x Scroll
-            const spaceRight = (innerWidth - spaceLeft) + previewWidth
-            const left = spaceRight > spaceLeft ? (offsetLeft + previewWidth) + pickerWidth : offsetLeft - pickerWidth
-
-            dimensions = {top, left}
-
-            open = true;        
-        }
+  beforeUpdate(() => {
+    format = getColorFormat(value)
+    if (!format) {
+      errorMsg = `Colorpicker - ${value} is an unknown color format. Please use a hex, rgb or hsl value`
+      console.error(errorMsg)
+    } else {
+      errorMsg = null
     }
+  })
 
-    function onColorChange(color) {
-        value = color.detail;
-        dispatch("change", color.detail)
+  afterUpdate(() => {
+    if (colorPreview && colorPreview.offsetParent && !anchorEl) {
+      //Anchor relative to closest positioned ancestor element. If none, then anchor to body
+      anchorEl = colorPreview.offsetParent
+      let curEl = colorPreview
+      let els = []
+      //Travel up dom tree from preview element to find parent elements that scroll
+      while (!anchorEl.isSameNode(curEl)) {
+        curEl = curEl.parentNode
+        let elOverflow = window
+          .getComputedStyle(curEl)
+          .getPropertyValue("overflow")
+        if (/scroll|auto/.test(elOverflow)) {
+          els.push(curEl)
+        }
+      }
+      parentNodes = els
     }
+  })
+
+  function openColorpicker(event) {
+    if (colorPreview) {
+      const {
+        top: spaceAbove,
+        width,
+        bottom,
+        right,
+        left: spaceLeft,
+      } = colorPreview.getBoundingClientRect()
+      const { innerHeight, innerWidth } = window
+
+      const { offsetLeft, offsetTop } = colorPreview
+      //get the scrollTop value for all scrollable parent elements
+      let scrollTop = parentNodes.reduce(
+        (scrollAcc, el) => (scrollAcc += el.scrollTop),
+        0
+      )
+
+      const spaceBelow = innerHeight - spaceAbove - previewHeight
+      const top =
+        spaceAbove > spaceBelow
+          ? offsetTop - pickerHeight - scrollTop
+          : offsetTop + previewHeight - scrollTop
+
+      //TOO: Testing and Scroll Awareness for x Scroll
+      const spaceRight = innerWidth - spaceLeft + previewWidth
+      const left =
+        spaceRight > spaceLeft
+          ? offsetLeft + previewWidth + pickerWidth
+          : offsetLeft - pickerWidth
+
+      dimensions = { top, left }
+
+      open = true
+    }
+  }
+
+  function onColorChange(color) {
+    value = color.detail
+    dispatch("change", color.detail)
+  }
 </script>
 
 <div class="color-preview-container">
-    {#if !errorMsg}
-        <div bind:this={colorPreview} bind:clientHeight={previewHeight} bind:clientWidth={previewWidth} class="color-preview" style={previewStyle} on:click={openColorpicker}></div>
-        {#if open}
-        <div class="picker-container" bind:clientHeight={pickerHeight} bind:clientWidth={pickerWidth} style={pickerStyle}>
-            <Colorpicker on:change={onColorChange} {format} {value} />
-        </div>
-        <div on:click|self={() => open = false} class="overlay"></div>
-        {/if}
-    {:else}
-        <div class="color-preview preview-error" style={errorPreviewStyle}>
-            <span>&times;</span>
-        </div>
+  {#if !errorMsg}
+    <div
+      bind:this={colorPreview}
+      bind:clientHeight={previewHeight}
+      bind:clientWidth={previewWidth}
+      class="color-preview"
+      style={previewStyle}
+      on:click={openColorpicker} />
+    {#if open}
+      <div
+        class="picker-container"
+        bind:clientHeight={pickerHeight}
+        bind:clientWidth={pickerWidth}
+        style={pickerStyle}>
+        <Colorpicker on:change={onColorChange} {format} {value} />
+      </div>
+      <div on:click|self={() => (open = false)} class="overlay" />
     {/if}
+  {:else}
+    <div class="color-preview preview-error" style={errorPreviewStyle}>
+      <span>&times;</span>
+    </div>
+  {/if}
 </div>
 
-
 <style>
-    .color-preview-container{
-        display: flex;
-        flex-flow: row nowrap;
-        height: fit-content;
-    }
+  .color-preview-container {
+    display: flex;
+    flex-flow: row nowrap;
+    height: fit-content;
+  }
 
-    .color-preview {
-        flex: 1;
-        border-radius: 3px;
-        border: 1px solid #dedada;
-    }
+  .color-preview {
+    flex: 1;
+    border-radius: 3px;
+    border: 1px solid #dedada;
+  }
 
-    .preview-error {
-        background: #cccccc;
-        color: #808080;
-        text-align: center;
-        font-size: 18px;
-        cursor: not-allowed;
-    }
+  .preview-error {
+    background: #cccccc;
+    color: #808080;
+    text-align: center;
+    font-size: 18px;
+    cursor: not-allowed;
+  }
 
-    .picker-container {
-        position: absolute;
-        z-index: 3;
-        width: fit-content;
-        height: fit-content;
-    }
+  .picker-container {
+    position: absolute;
+    z-index: 3;
+    width: fit-content;
+    height: fit-content;
+  }
 
-    .overlay{
-        position: fixed;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        z-index: 2;        
-    }
+  .overlay {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 2;
+  }
 </style>
-
diff --git a/packages/builder/src/components/userInterface/Colorpicker/FlatButton.svelte b/packages/builder/src/components/userInterface/Colorpicker/FlatButton.svelte
index af1ea5e945..48e2e12c30 100644
--- a/packages/builder/src/components/userInterface/Colorpicker/FlatButton.svelte
+++ b/packages/builder/src/components/userInterface/Colorpicker/FlatButton.svelte
@@ -1,8 +1,10 @@
 <script>
-  export let text = "";
-  export let selected = false;
+  export let text = ""
+  export let selected = false
 </script>
 
+<div class="flatbutton" class:selected on:click>{text}</div>
+
 <style>
   .flatbutton {
     padding: 3px 15px;
@@ -22,5 +24,3 @@
     border: none;
   }
 </style>
-
-<div class="flatbutton" class:selected on:click>{text}</div>
diff --git a/packages/builder/src/components/userInterface/Colorpicker/Input.svelte b/packages/builder/src/components/userInterface/Colorpicker/Input.svelte
index 04966c1f30..4316204c84 100644
--- a/packages/builder/src/components/userInterface/Colorpicker/Input.svelte
+++ b/packages/builder/src/components/userInterface/Colorpicker/Input.svelte
@@ -1,7 +1,11 @@
 <script>
-  export let value = "";
+  export let value = ""
 </script>
 
+<div>
+  <input on:input type="text" {value} maxlength="25" />
+</div>
+
 <style>
   div {
     display: flex;
@@ -22,7 +26,3 @@
     border: 1px solid #dadada;
   }
 </style>
-
-<div>
-  <input on:input type="text" {value} maxlength="25" />
-</div>
diff --git a/packages/builder/src/components/userInterface/Colorpicker/Palette.svelte b/packages/builder/src/components/userInterface/Colorpicker/Palette.svelte
index 01a614124c..6454c84b92 100644
--- a/packages/builder/src/components/userInterface/Colorpicker/Palette.svelte
+++ b/packages/builder/src/components/userInterface/Colorpicker/Palette.svelte
@@ -1,41 +1,54 @@
 <script>
-  import { onMount, createEventDispatcher } from "svelte";
+  import { onMount, createEventDispatcher } from "svelte"
 
   const dispatch = createEventDispatcher()
 
-  export let h = 0;
-  export let s = 0;
-  export let v = 0;
-  export let a = 1;
+  export let h = 0
+  export let s = 0
+  export let v = 0
+  export let a = 1
 
-  let palette;
-
-  let paletteHeight, paletteWidth = 0;
+  let palette
 
+  let paletteHeight,
+    paletteWidth = 0
 
   function handleClick(event) {
-    const { left, top } = palette.getBoundingClientRect();
-    let clickX = (event.clientX - left)
-    let clickY = (event.clientY - top)
-    if((clickX > 0 && clickY > 0) && (clickX < paletteWidth && clickY < paletteHeight)) {
+    const { left, top } = palette.getBoundingClientRect()
+    let clickX = event.clientX - left
+    let clickY = event.clientY - top
+    if (
+      clickX > 0 &&
+      clickY > 0 &&
+      clickX < paletteWidth && clickY < paletteHeight
+    ) {
       let s = (clickX / paletteWidth) * 100
-      let v = 100 - ((clickY / paletteHeight) * 100)
-      dispatch("change", {s, v})
+      let v = 100 - (clickY / paletteHeight) * 100
+      dispatch("change", { s, v })
     }
-
   }
 
-  $: pickerX = (s * paletteWidth) / 100;
-  $: pickerY =  paletteHeight * ((100 - v) / 100)
+  $: pickerX = (s * paletteWidth) / 100
+  $: pickerY = paletteHeight * ((100 - v) / 100)
 
   $: paletteGradient = `linear-gradient(to top, rgba(0, 0, 0, 1), transparent),
     linear-gradient(to left, hsla(${h}, 100%, 50%, ${a}), rgba(255, 255, 255, ${a}))
-  `;
-  $: style = `background: ${paletteGradient};`;
+  `
+  $: style = `background: ${paletteGradient};`
 
   $: pickerStyle = `transform: translate(${pickerX - 8}px, ${pickerY - 8}px);`
 </script>
 
+<div
+  bind:this={palette}
+  bind:clientHeight={paletteHeight}
+  bind:clientWidth={paletteWidth}
+  on:click={handleClick}
+  class="palette"
+  {style}>
+  <div class="picker" style={pickerStyle} />
+</div>
+
 <style>
   .palette {
     position: relative;
@@ -54,7 +67,3 @@
     border-radius: 50%;
   }
 </style>
-
-<div bind:this={palette} bind:clientHeight={paletteHeight} bind:clientWidth={paletteWidth} on:click={handleClick} class="palette" {style}>
-  <div class="picker" style={pickerStyle} />
-</div>
diff --git a/packages/builder/src/components/userInterface/Colorpicker/Slider.svelte b/packages/builder/src/components/userInterface/Colorpicker/Slider.svelte
index ec8d99248d..761f2c7acb 100644
--- a/packages/builder/src/components/userInterface/Colorpicker/Slider.svelte
+++ b/packages/builder/src/components/userInterface/Colorpicker/Slider.svelte
@@ -1,36 +1,47 @@
 <script>
-  import { onMount, createEventDispatcher } from "svelte";
-  import dragable from "./drag.js";
+  import { onMount, createEventDispatcher } from "svelte"
+  import dragable from "./drag.js"
 
-  export let value = 1;
-  export let type = "hue";
+  export let value = 1
+  export let type = "hue"
 
-  const dispatch = createEventDispatcher();
+  const dispatch = createEventDispatcher()
 
-  let slider;
-  let sliderWidth = 0;
+  let slider
+  let sliderWidth = 0
 
   function handleClick(mouseX) {
-    const { left, width } = slider.getBoundingClientRect();
-    let clickPosition = mouseX - left;
+    const { left, width } = slider.getBoundingClientRect()
+    let clickPosition = mouseX - left
 
     let percentageClick = (clickPosition / sliderWidth).toFixed(2)
-    
+
     if (percentageClick >= 0 && percentageClick <= 1) {
-      let value =
-        type === "hue"
-          ? 360 * percentageClick
-          : percentageClick;
-      dispatch("change", value);
+      let value = type === "hue" ? 360 * percentageClick : percentageClick
+      dispatch("change", value)
     }
   }
 
   $: thumbPosition =
-    type === "hue" ? sliderWidth * (value / 360) : sliderWidth * value;
+    type === "hue" ? sliderWidth * (value / 360) : sliderWidth * value
 
-  $: style = `transform: translateX(${thumbPosition - 6}px);`;
+  $: style = `transform: translateX(${thumbPosition - 6}px);`
 </script>
 
+<div
+  bind:this={slider}
+  bind:clientWidth={sliderWidth}
+  on:click={event => handleClick(event.clientX)}
+  class="color-format-slider"
+  class:hue={type === 'hue'}
+  class:alpha={type === 'alpha'}>
+  <div
+    use:dragable
+    on:drag={e => handleClick(e.detail)}
+    class="slider-thumb"
+    {style} />
+</div>
+
 <style>
   .color-format-slider {
     position: relative;
@@ -68,20 +79,6 @@
     border: 1px solid #777676;
     border-radius: 50%;
     background-color: #ffffff;
-    cursor:grab;
+    cursor: grab;
   }
 </style>
-
-<div
-  bind:this={slider}
-  bind:clientWidth={sliderWidth}
-  on:click={event => handleClick(event.clientX)}
-  class="color-format-slider"
-  class:hue={type === 'hue'}
-  class:alpha={type === 'alpha'}>
-  <div
-    use:dragable
-    on:drag={e => handleClick(e.detail)}
-    class="slider-thumb"
-    {style} />
-</div>
diff --git a/packages/builder/src/components/userInterface/DesignView.svelte b/packages/builder/src/components/userInterface/DesignView.svelte
index 6826bddc5c..97cf9bb40f 100644
--- a/packages/builder/src/components/userInterface/DesignView.svelte
+++ b/packages/builder/src/components/userInterface/DesignView.svelte
@@ -31,26 +31,26 @@
     <FlatButtonGroup value={selectedCategory} {buttonProps} {onChange} />
   </div>
 
-<div class="positioned-wrapper">
-  <div class="design-view-property-groups">
-    {#if propertyGroupNames.length > 0}
-      {#each propertyGroupNames as groupName}
-        <PropertyGroup
-          name={groupName}
-          properties={getProperties(groupName)}
-          styleCategory={selectedCategory}
-          {onStyleChanged}
-          {componentDefinition}
-          {componentInstance} />
-      {/each}
-    {:else}
-      <div class="no-design">
-        <span>This component does not have any design properties</span>
-      </div>
-    {/if}
+  <div class="positioned-wrapper">
+    <div class="design-view-property-groups">
+      {#if propertyGroupNames.length > 0}
+        {#each propertyGroupNames as groupName}
+          <PropertyGroup
+            name={groupName}
+            properties={getProperties(groupName)}
+            styleCategory={selectedCategory}
+            {onStyleChanged}
+            {componentDefinition}
+            {componentInstance} />
+        {/each}
+      {:else}
+        <div class="no-design">
+          <span>This component does not have any design properties</span>
+        </div>
+      {/if}
+    </div>
   </div>
 </div>
-</div>
 
 <style>
   .design-view-container {
@@ -64,7 +64,7 @@
     flex: 0 0 50px;
   }
 
-  .positioned-wrapper{
+  .positioned-wrapper {
     position: relative;
     display: flex;
     min-height: 0;
diff --git a/packages/builder/src/components/userInterface/PropertyControl.svelte b/packages/builder/src/components/userInterface/PropertyControl.svelte
index 159efdd08e..7098803adc 100644
--- a/packages/builder/src/components/userInterface/PropertyControl.svelte
+++ b/packages/builder/src/components/userInterface/PropertyControl.svelte
@@ -12,7 +12,7 @@
     if (v.target) {
       let val = props.valueKey ? v.target[props.valueKey] : v.target.value
       onChange(key, val)
-    }else if(v.detail) {
+    } else if (v.detail) {
       onChange(key, v.detail)
     } else {
       onChange(key, v)
diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js
index 7cd7aeae31..16749b3d9d 100644
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.js
@@ -1,5 +1,3 @@
-const FIELD_TYPES = ["string", "number", "boolean"]
-
 export const FIELDS = {
   PLAIN_TEXT: {
     name: "Plain Text",
@@ -30,52 +28,52 @@ export const FIELDS = {
       presence: false,
     },
   },
-  // OPTIONS: {
-  //   name: "Options",
-  //   icon: "ri-list-check-2",
-  //   type: "options",
-  //   constraints: {
-  //     type: "string",
-  //     presence: false,
-  //   },
-  // },
-  // DATETIME: {
-  //   name: "Date/Time",
-  //   icon: "ri-calendar-event-fill",
-  //   type: "datetime",
-  //   constraints: {
-  //     type: "date",
-  //     datetime: {},
-  //     presence: false,
-  //   },
-  // },
-  // IMAGE: {
-  //   name: "File",
-  //   icon: "ri-image-line",
-  //   type: "file",
-  //   constraints: {
-  //     type: "string",
-  //     presence: false,
-  //   },
-  // },
-  // FILE: {
-  //   name: "Image",
-  //   icon: "ri-file-line",
-  //   type: "file",
-  //   constraints: {
-  //     type: "string",
-  //     presence: false,
-  //   },
-  // },
-  // DATA_LINK: {
-  //   name: "Data Links",
-  //   icon: "ri-link",
-  //   type: "link",
-  //   modelId: null,
-  //   constraints: {
-  //     type: "array",
-  //   }
-  // },
+  OPTIONS: {
+    name: "Options",
+    icon: "ri-list-check-2",
+    type: "options",
+    constraints: {
+      type: "string",
+      presence: false,
+    },
+  },
+  DATETIME: {
+    name: "Date/Time",
+    icon: "ri-calendar-event-fill",
+    type: "datetime",
+    constraints: {
+      type: "date",
+      datetime: {},
+      presence: false,
+    },
+  },
+  IMAGE: {
+    name: "File",
+    icon: "ri-image-line",
+    type: "file",
+    constraints: {
+      type: "string",
+      presence: false,
+    },
+  },
+  FILE: {
+    name: "Image",
+    icon: "ri-file-line",
+    type: "file",
+    constraints: {
+      type: "string",
+      presence: false,
+    },
+  },
+  DATA_LINK: {
+    name: "Data Links",
+    icon: "ri-link",
+    type: "link",
+    modelId: null,
+    constraints: {
+      type: "array",
+    },
+  },
 }
 
 export const BLOCKS = {
@@ -115,11 +113,7 @@ export const BLOCKS = {
     constraints: {
       type: "string",
       presence: false,
-      inclusion: [
-        "low",
-        "medium",
-        "high"
-    ]
+      inclusion: ["low", "medium", "high"],
     },
   },
   END_DATE: {
@@ -157,7 +151,7 @@ export const BLOCKS = {
     modelId: null,
     constraints: {
       type: "array",
-    }
+    },
   },
 }
 
@@ -168,15 +162,15 @@ export const MODELS = {
     name: "Contacts",
     schema: {
       Name: BLOCKS.NAME,
-      "Phone Number": BLOCKS.PHONE_NUMBER
-    }
+      "Phone Number": BLOCKS.PHONE_NUMBER,
+    },
   },
   RECIPES: {
     icon: "ri-link",
     name: "Recipes",
     schema: {
       Name: BLOCKS.NAME,
-      "Phone Number": BLOCKS.PHONE_NUMBER
-    }
-  }
+      "Phone Number": BLOCKS.PHONE_NUMBER,
+    },
+  },
 }
diff --git a/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/_layout.svelte b/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/_layout.svelte
index 0385342cef..4fa864ce7a 100644
--- a/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/_layout.svelte
@@ -1 +1 @@
-<slot />
\ No newline at end of file
+<slot />
diff --git a/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte b/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte
index 915c355cb8..02c11441f0 100644
--- a/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte
+++ b/packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { getContext } from "svelte"
-  import { Button } from "@budibase/bbui";
+  import { Button } from "@budibase/bbui"
   import EmptyModel from "components/nav/ModelNavigator/EmptyModel.svelte"
   import ModelDataTable from "components/database/ModelDataTable"
   import { store, backendUiStore } from "builderStore"
@@ -10,7 +10,7 @@
 
   const { open, close } = getContext("simple-modal")
 
-  $: selectedModel = $backendUiStore.selectedModel 
+  $: selectedModel = $backendUiStore.selectedModel
 
   const createNewRecord = () => {
     open(