diff --git a/packages/bootstrap-components/src/Form.svelte b/packages/bootstrap-components/src/Form.svelte
index eca4190122..1a849145b9 100644
--- a/packages/bootstrap-components/src/Form.svelte
+++ b/packages/bootstrap-components/src/Form.svelte
@@ -1,5 +1,5 @@
 <script>
-export let containerClass = "";
+
 export let formControls = [];
 
 export let _bb;
@@ -24,7 +24,7 @@ $ : {
                 _bb.insertComponent(
                     _bb.props.formControls[el].control,
                     htmlElements[el],
-                    labelElements[el]);
+                    htmlElements[el].childNodes.find(n => n.tagName === "LABEL"));
             } else {
                 _bb.appendComponent(
                     _bb.props.formControls[el].control,
@@ -38,9 +38,9 @@ $ : {
 </script>
 
 <form>
-    {#each formControls as child, index}
-    <div class="form-group" bind:this={htmlElements[index]}>
-        <label bind:this={labelElements[index]}>{labels[index]}</label>
+    {#each formControls as child, idx}
+    <div class="form-group" bind:this={htmlElements[idx]}>
+        <label>{labels[idx]}</label>
     </div>
     {/each}
 </form>
diff --git a/packages/builder/src/common/Modal.svelte b/packages/builder/src/common/Modal.svelte
index 83479c7596..0f47d553a0 100644
--- a/packages/builder/src/common/Modal.svelte
+++ b/packages/builder/src/common/Modal.svelte
@@ -1,41 +1,41 @@
-<script>
-import UIkit from "uikit";
-
-export let isOpen = false;
-export let onClosed = () => {};
-export let id = "";
-
-let ukModal;
-let listenerAdded = false;
-
-$: {
-    if(ukModal && !listenerAdded) {
-        listenerAdded = true;
-        ukModal.addEventListener("hide", onClosed);
-    }
-
-    if(ukModal) {
-        if(isOpen) {
-            UIkit.modal(ukModal).show();
-        } else {
-            UIkit.modal(ukModal).hide();
-        }
-    }
-}
-
-</script>
-
-<div bind:this={ukModal} uk-modal {id}>
-    <div class="uk-modal-dialog uk-modal-body" uk-overflow-auto>
-        <slot />
-    </div>
-</div>
-
-
-<style>
-
-.uk-modal-dialog {
-    border-radius: .3rem;
-}
-
+<script>
+import UIkit from "uikit";
+
+export let isOpen = false;
+export let onClosed = () => {};
+export let id = "";
+
+let ukModal;
+let listenerAdded = false;
+
+$: {
+    if(ukModal && !listenerAdded) {
+        listenerAdded = true;
+        ukModal.addEventListener("hidden", onClosed);
+    }
+
+    if(ukModal) {
+        if(isOpen) {
+            UIkit.modal(ukModal).show();
+        } else {
+            UIkit.modal(ukModal).hide();
+        }
+    }
+}
+
+</script>
+
+<div bind:this={ukModal} uk-modal {id}>
+    <div class="uk-modal-dialog uk-modal-body" uk-overflow-auto>
+        <slot />
+    </div>
+</div>
+
+
+<style>
+
+.uk-modal-dialog {
+    border-radius: .3rem;
+}
+
 </style>
\ No newline at end of file
diff --git a/packages/builder/src/database/RecordView.svelte b/packages/builder/src/database/RecordView.svelte
index d0a8f7acdb..b6cf351b40 100644
--- a/packages/builder/src/database/RecordView.svelte
+++ b/packages/builder/src/database/RecordView.svelte
@@ -39,6 +39,7 @@ store.subscribe($store => {
         editingField = true;
     }
 
+
     onFinishedFieldEdit = (field) => {
         if(field) {
             store.saveField(field);
@@ -139,7 +140,7 @@ const nameChanged = ev => {
     {/if}
 
     {#if editingField}
-    <Modal bind:isOpen={editingField}>
+    <Modal bind:isOpen={editingField} onClosed={() => onFinishedFieldEdit(false) }>
         <FieldView field={fieldToEdit} 
                    onFinished={onFinishedFieldEdit}
                    allFields={record.fields}