diff --git a/templates/react/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/Create{{pascal_case entry_type.name}}.tsx.hbs b/templates/react/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/Create{{pascal_case entry_type.name}}.tsx.hbs
index bd6fe47ce..3b5e80733 100644
--- a/templates/react/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/Create{{pascal_case entry_type.name}}.tsx.hbs	
+++ b/templates/react/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/Create{{pascal_case entry_type.name}}.tsx.hbs	
@@ -60,7 +60,6 @@ const Create{{pascal_case entry_type.name}}: FC<Create{{pascal_case entry_type.n
         {{else}}
         {{> Vec/edit/render field_name=field_name field_type=field_type widget=widget }}
         {{/if}}
-
       </div>
 
   {{/if}}
diff --git a/templates/react/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/types.ts.hbs b/templates/react/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/types.ts.hbs
index 93009f2e3..1e8d8bf32 100644
--- a/templates/react/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/types.ts.hbs
+++ b/templates/react/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/types.ts.hbs
@@ -22,5 +22,4 @@ export interface {{pascal_case entry_type.name}} { {{#each entry_type.fields}}
   {{snake_case field_name}}: Array<{{> (concat field_type.type "/type") }}>;
   {{/if}}
   {{/each}}
-}
-
+}
\ No newline at end of file
diff --git "a/templates/react/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}Edit{{pascal_case entry_type.name}}.tsx{{\302\241if}}.hbs" "b/templates/react/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}Edit{{pascal_case entry_type.name}}.tsx{{\302\241if}}.hbs"
index 6bce2c300..402526321 100644
--- "a/templates/react/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}Edit{{pascal_case entry_type.name}}.tsx{{\302\241if}}.hbs"	
+++ "b/templates/react/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}Edit{{pascal_case entry_type.name}}.tsx{{\302\241if}}.hbs"	
@@ -99,7 +99,7 @@ const Edit{{pascal_case entry_type.name}}: FC<Edit{{pascal_case entry_type.name}
   }, [currentRecord{{#if link_from_original_to_each_update}}, original{{pascal_case entry_type.name}}Hash{{/if}}]);
 
   useEffect(() => {
-    setIs{{pascal_case entry_type.name}}Valid(true{{#each entry_type.fields}}{{#if widget}}{{#if (eq cardinality "single")}} && {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate=(camel_case field_name) }}{{/if}}{{#if (eq cardinality "vector")}} && {{camel_case field_name}}?.every(e => {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate="e" }}){{/if}}{{/if}}{{/each}});
+    setIs{{pascal_case entry_type.name}}Valid(true{{#each entry_type.fields}}{{#if widget}}{{#if (eq cardinality "single")}} && {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate=(camel_case field_name) }}{{/if}}{{#if (eq cardinality "vector")}} && {{camel_case field_name}}!.every(e => {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate="e" }}){{/if}}{{/if}}{{/each}});
   }, [{{#each entry_type.fields}}{{#if widget}}{{camel_case field_name}}{{#unless @last}}, {{/unless}}{{/if}}{{/each}}]);
 
   return (
@@ -112,7 +112,6 @@ const Edit{{pascal_case entry_type.name}}: FC<Edit{{pascal_case entry_type.name}
         {{else}}
         {{> Vec/edit/render field_name=field_name field_type=field_type widget=widget }}
         {{/if}}
-
       </div>
 
   {{/if}}
diff --git a/templates/react/field-types/Enum/Select/edit/render.hbs b/templates/react/field-types/Enum/Select/edit/render.hbs
index 0f072b056..644851ed0 100644
--- a/templates/react/field-types/Enum/Select/edit/render.hbs
+++ b/templates/react/field-types/Enum/Select/edit/render.hbs
@@ -1,8 +1,7 @@
 <label htmlFor="{{label}}">{{label}}:</label>
-<select name="{{label}}" onChange={ (e) => set{{pascal_case ../variable_to_change}}(e.target.value) }>
-  {{#each field_type.variants}}
-  <option {{#if ../variable_to_read}}selected={ {{../variable_to_read}}.type === '{{pascal_case this}}' }{{/if}} value="{{this}}">
-    {{title_case this}}
-  </option>
-  {{/each}}
-</select>
\ No newline at end of file
+
+<select name="{{label}}" defaultValue={ {{../variable_to_read}}.type } onChange={ (e) => set{{pascal_case ../variable_to_change}}({type: e.target.value as any}) }>
+{{#each field_type.variants}}
+  <option value="{{this}}">{{title_case this}}</option>
+{{/each}}
+</select>
diff --git a/templates/react/field-types/String/TextArea/edit/render.hbs b/templates/react/field-types/String/TextArea/edit/render.hbs
index c84803901..e5f30dd5c 100644
--- a/templates/react/field-types/String/TextArea/edit/render.hbs
+++ b/templates/react/field-types/String/TextArea/edit/render.hbs
@@ -1,5 +1,6 @@
 <label htmlFor="{{label}}">{{label}}</label>
 {{#if (eq cardinality "vector")}}
+
 <textarea
   name="{{label}}"
 {{#if variable_to_read}}
@@ -19,5 +20,6 @@
 >
 </textarea>
 {{else}}
+
 <textarea name="{{label}}" {{#if variable_to_read}}value={ {{variable_to_read}} }{{/if}} onChange={(e) => set{{pascal_case variable_to_change}}(e.target.value)} {{#if required}}required{{/if}}></textarea>
 {{/if}}
\ No newline at end of file
diff --git a/templates/react/field-types/String/TextField/edit/render.hbs b/templates/react/field-types/String/TextField/edit/render.hbs
index 228d7a67f..c03a456f5 100644
--- a/templates/react/field-types/String/TextField/edit/render.hbs
+++ b/templates/react/field-types/String/TextField/edit/render.hbs
@@ -1,5 +1,6 @@
 <label htmlFor="{{label}}">{{label}}</label>
 {{#if (eq cardinality "vector")}}
+
 <input
   type="text"
   name="{{label}}"
@@ -16,5 +17,6 @@
   }}
 />
 {{else}}
+
 <input type="text" name="{{label}}" {{#if variable_to_read}}value={ {{variable_to_read}} }{{/if}} onChange={(e) => set{{pascal_case variable_to_change}}(e.target.value)} />
 {{/if}}
\ No newline at end of file
diff --git a/templates/react/field-types/Timestamp/DateTimePicker/edit/render.hbs b/templates/react/field-types/Timestamp/DateTimePicker/edit/render.hbs
index 62cbf8196..5e73fb698 100644
--- a/templates/react/field-types/Timestamp/DateTimePicker/edit/render.hbs
+++ b/templates/react/field-types/Timestamp/DateTimePicker/edit/render.hbs
@@ -1,5 +1,6 @@
 <label htmlFor="{{label}}">{{label}}</label>
 {{#if (eq cardinality "vector")}}
+
 <input
   name="{{label}}"
   type="datetime-local"
@@ -20,5 +21,6 @@
 {{/if}}
 />
 {{else}}
-<input name="{{label}}" type="datetime-local" {{#if variable_to_read}} value={new Date({{variable_to_read}}! / 1000).toISOString().slice(0, 16)} {{/if}} onChange={(e) => set{{pascal_case variable_to_change}}(Math.floor(new Date(e.target.value).getTime() / 1000))} {{#if required}}required{{/if}} />
+
+<input name="{{label}}" type="datetime-local" {{#if variable_to_read}} value={new Date({{variable_to_read}}! / 1000 - (new Date({{variable_to_read}}! / 1000).getTimezoneOffset() * 60000)).toISOString().slice(0, 16)} {{/if}} onChange={(e) => set{{pascal_case variable_to_change}}(Math.floor(new Date(e.target.value).getTime() / 1000))} {{#if required}}required{{/if}} />
 {{/if}}
\ No newline at end of file
diff --git a/templates/react/field-types/Vec/edit/render.hbs b/templates/react/field-types/Vec/edit/render.hbs
index cf74b7790..327ae8932 100644
--- a/templates/react/field-types/Vec/edit/render.hbs
+++ b/templates/react/field-types/Vec/edit/render.hbs
@@ -3,6 +3,7 @@
 { {{camel_case field_name}}?.map((value, i) => (
   <div key={i}>
     {{> (concat field_type.type "/" widget "/edit/render") label=(pascal_case field_name) variable_to_read="value" variable_to_change=(camel_case field_name) key="i" }}
+
   </div>
 ))}
 
diff --git a/templates/react/field-types/bool/Checkbox/edit/render.hbs b/templates/react/field-types/bool/Checkbox/edit/render.hbs
index 8e63e8966..974653713 100644
--- a/templates/react/field-types/bool/Checkbox/edit/render.hbs
+++ b/templates/react/field-types/bool/Checkbox/edit/render.hbs
@@ -1,5 +1,6 @@
 <label htmlFor="{{label}}">{{label}}</label>
 {{#if (eq cardinality "vector")}}
+
 <input
 {{#if key}}
   key={ {{key}} }
@@ -19,5 +20,6 @@
   }}
 />
 {{else}}
+
 <input type="checkbox" name="{{label}}" checked={ {{variable_to_read}} } onChange={(e) => set{{pascal_case variable_to_change}}(e.target.checked)} />
 {{/if}}
\ No newline at end of file
diff --git a/templates/react/field-types/f32/NumberInput/edit/render.hbs b/templates/react/field-types/f32/NumberInput/edit/render.hbs
index 7c6671b36..e6bf524cb 100644
--- a/templates/react/field-types/f32/NumberInput/edit/render.hbs
+++ b/templates/react/field-types/f32/NumberInput/edit/render.hbs
@@ -1,5 +1,6 @@
 <label htmlFor="{{label}}">{{label}}</label>
 {{#if (eq cardinality "vector")}}
+
 <input
   type="number"
   name="{{label}}"
@@ -14,6 +15,8 @@
       return v;
     }))
   }}
+/>
 {{else}}
+
 <input type="number" name="{{label}}" {{#if variable_to_read}}value={ {{variable_to_read}} }{{/if}} onChange={e => set{{pascal_case variable_to_change}}(parseFloat(e.target.value))} />
 {{/if}}
\ No newline at end of file
diff --git a/templates/react/field-types/i32/NumberInput/edit/render.hbs b/templates/react/field-types/i32/NumberInput/edit/render.hbs
index 46ec6f68b..8a654ffd0 100644
--- a/templates/react/field-types/i32/NumberInput/edit/render.hbs
+++ b/templates/react/field-types/i32/NumberInput/edit/render.hbs
@@ -1,5 +1,6 @@
 <label htmlFor="{{label}}">{{label}}</label>
 {{#if (eq cardinality "vector")}}
+
 <input
   type="number"
   name="{{label}}"
@@ -14,6 +15,8 @@
       return v;
     }))
   }}
+/>
 {{else}}
+
 <input type="number" name="{{label}}" {{#if variable_to_read}}value={ {{variable_to_read}} }{{/if}} onChange={e => set{{pascal_case variable_to_change}}(parseInt(e.target.value))} />
 {{/if}}
\ No newline at end of file
diff --git a/templates/react/field-types/u32/NumberInput/edit/render.hbs b/templates/react/field-types/u32/NumberInput/edit/render.hbs
index c33d87827..1a2bf4352 100644
--- a/templates/react/field-types/u32/NumberInput/edit/render.hbs
+++ b/templates/react/field-types/u32/NumberInput/edit/render.hbs
@@ -1,5 +1,6 @@
 <label htmlFor="{{label}}">{{label}}</label>
 {{#if (eq cardinality "vector")}}
+
 <input
   type="number"
   name="{{label}}"
@@ -15,6 +16,8 @@
       return v;
     }))
   }}
+/>
 {{else}}
+
 <input type="number" name="{{label}}" {{#if variable_to_read}}value={ {{variable_to_read}} }{{/if}} onChange={e => set{{pascal_case variable_to_change}}(parseInt(e.target.value))} />
 {{/if}}
\ No newline at end of file