diff --git a/packages/builder/src/database/DatabaseRoot.svelte b/packages/builder/src/database/DatabaseRoot.svelte
index 547a62cee0..2109786ee0 100644
--- a/packages/builder/src/database/DatabaseRoot.svelte
+++ b/packages/builder/src/database/DatabaseRoot.svelte
@@ -8,6 +8,7 @@
   import DropdownButton from "../common/DropdownButton.svelte"
   import ActionButton from "../common/ActionButton.svelte"
   import Modal from "../common/Modal.svelte"
+  import * as api from "./ModelDataTable/api"
   import {
     CreateEditRecordModal,
     CreateEditModelModal,
@@ -19,8 +20,11 @@
 
   let selectedRecord
 
-  function selectRecord(record) {
-    selectedRecord = record
+  async function selectRecord(record) {
+    selectedRecord = await api.loadRecord(record.key, {
+      appname: $store.appname,
+      instanceId: $backendUiStore.selectedDatabase.id,
+    })
   }
 
   function onClosed() {
diff --git a/packages/builder/src/database/ModelDataTable/api.js b/packages/builder/src/database/ModelDataTable/api.js
index c4a8062971..0d9f275504 100644
--- a/packages/builder/src/database/ModelDataTable/api.js
+++ b/packages/builder/src/database/ModelDataTable/api.js
@@ -20,6 +20,12 @@ export async function deleteRecord(record, { appname, instanceId }) {
   return response
 }
 
+export async function loadRecord(key, { appname, instanceId }) {
+  const LOAD_RECORDS_URL = `/_builder/instance/${appname}/${instanceId}/api/record${key}`
+  const response = await api.get(LOAD_RECORDS_URL)
+  return await response.json()
+}
+
 export async function saveRecord(record, { appname, instanceId }) {
   let recordBase = { ...record }
 
diff --git a/packages/builder/src/database/ModelDataTable/modals/CreateEditRecord.svelte b/packages/builder/src/database/ModelDataTable/modals/CreateEditRecord.svelte
index 7d00256f3c..68e50db502 100644
--- a/packages/builder/src/database/ModelDataTable/modals/CreateEditRecord.svelte
+++ b/packages/builder/src/database/ModelDataTable/modals/CreateEditRecord.svelte
@@ -5,12 +5,16 @@
   import Modal from "../../../common/Modal.svelte"
   import ActionButton from "../../../common/ActionButton.svelte"
   import Select from "../../../common/Select.svelte"
-  import { getNewRecord, joinKey } from "../../../common/core"
+  import { getNewRecord, joinKey, getExactNodeForKey } from "../../../common/core"
+  import RecordFieldControl from "./RecordFieldControl.svelte"
   import * as api from "../api"
+  import ErrorsBox from "../../../common/ErrorsBox.svelte"
 
   export let record
   export let onClosed
 
+  let errors = []
+  
   const childModelsForModel = compose(
     flatten,
     map("children"),
@@ -25,12 +29,18 @@
     ? childModelsForModel($store.hierarchy)
     : $store.hierarchy.children
 
-  $: selectedModel = selectedModel || models[0]
+  let selectedModel
+  $: {
+    if (record) { 
+      selectedModel = getExactNodeForKey($store.hierarchy)(record.key)
+    } else {
+      selectedModel = selectedModel || models[0]
+    }
+  }
   
   $: modelFields = selectedModel
-    ? selectedModel.fields.map(({ name }) => name)
+    ? selectedModel.fields
     : []
-
   
   function getCurrentCollectionKey(selectedRecord) {
     return selectedRecord
@@ -38,7 +48,7 @@
     : joinKey(selectedModel.collectionName)
   }
 
-  $: editingRecord = editingRecord || record || getNewRecord(selectedModel, getCurrentCollectionKey($backendUiStore.selectedRecord))
+  $: editingRecord = record || editingRecord || getNewRecord(selectedModel, getCurrentCollectionKey($backendUiStore.selectedRecord))
 
   function closed() {
     editingRecord = null
@@ -60,6 +70,7 @@
 
 <div>
   <h4 class="budibase__title--4">Create / Edit Record</h4>
+  <ErrorsBox {errors} />
   <div class="actions">
     <form class="uk-form-stacked">
       {#if !record}
@@ -72,17 +83,11 @@
           </Select>
         </div>
       {/if}
-      {#each modelFields as field}
-        <div class="uk-margin">
-          <label class="uk-form-label" for="form-stacked-text">{field}</label>
-          <div class="uk-form-controls">
-            <input
-              class="uk-input"
-              id="form-stacked-text"
-              type="text"
-              bind:value={editingRecord[field]} />
-          </div>
-        </div>
+      {#each (modelFields || []) as field}
+        <RecordFieldControl 
+          record={editingRecord}
+          {field}
+          {errors} />
       {/each}
     </form>
     <footer>
diff --git a/packages/builder/src/database/ModelDataTable/modals/RecordFieldControl.svelte b/packages/builder/src/database/ModelDataTable/modals/RecordFieldControl.svelte
new file mode 100644
index 0000000000..f6c86c74e9
--- /dev/null
+++ b/packages/builder/src/database/ModelDataTable/modals/RecordFieldControl.svelte
@@ -0,0 +1,69 @@
+<script>
+import Select from "../../../common/Select.svelte"
+
+export let record
+export let field
+export let errors
+
+$: isDropdown = 
+    field.type === "string" 
+    && field.typeOptions.values 
+    && field.typeOptions.values.length > 0
+
+$: isNumber = field.type === "number"
+
+$: isText = 
+  field.type === "string" 
+  && !isDropdown
+
+$: isCheckbox = field.type === "bool"
+
+$: isError = errors && errors.some(e => e.field && e.field === field.name)
+
+$: isDatetime = field.type === "datetime"
+
+</script>
+
+<div class="uk-margin">
+  {#if !isCheckbox}
+  <label class="uk-form-label" for={field.name}>{field.label}</label>
+  {/if}
+  <div class="uk-form-controls">
+    {#if isDropdown}
+      <Select bind:value={record[field.name]}>
+        <option value=""></option>
+        {#each field.typeOptions.values as val}
+          <option value={val}>{val}</option>
+        {/each}
+      </Select>   
+    {:else if isText}
+      <input
+        class="uk-input"
+        class:uk-form-danger={isError}
+        id={field.name}
+        type="text"
+        bind:value={record[field.name]} />
+    {:else if isNumber}
+      <input
+        class="uk-input"
+        class:uk-form-danger={isError}
+        type="number"
+        bind:value={record[field.name]} />
+    {:else if isDatetime}
+      <input
+        class="uk-input"
+        class:uk-form-danger={isError}
+        type="date"
+        bind:value={record[field.name]} />
+    {:else if isCheckbox}
+      <label>
+        <input
+          class="uk-checkbox"
+          class:uk-form-danger={isError}
+          type="checkbox"
+          bind:checked={record[field.name]} >
+          {field.label}
+      </label>
+    {/if}
+  </div>
+</div>
\ No newline at end of file
diff --git a/packages/core/src/types/string.js b/packages/core/src/types/string.js
index 4461eb0a26..c61103273d 100644
--- a/packages/core/src/types/string.js
+++ b/packages/core/src/types/string.js
@@ -37,7 +37,7 @@ const options = {
     isValid: v =>
       v === null || (isArrayOfString(v) && v.length > 0 && v.length < 10000),
     requirementDescription:
-      "'values' must be null (no values) or an arry of at least one string",
+      "'values' must be null (no values) or an array of at least one string",
     parse: s => s,
   },
   allowDeclaredValuesOnly: {