diff --git a/app/Service/Forms/FormSubmissionFormatter.php b/app/Service/Forms/FormSubmissionFormatter.php
index a885a8db..a9a2465c 100644
--- a/app/Service/Forms/FormSubmissionFormatter.php
+++ b/app/Service/Forms/FormSubmissionFormatter.php
@@ -203,7 +203,9 @@ class FormSubmissionFormatter
                 $field['value'] = $data[$field['id']] ? 'Yes' : 'No';
             } elseif ($field['type'] == 'date') {
                 $dateFormat = ($field['date_format'] ?? 'dd/MM/yyyy') == 'dd/MM/yyyy' ? 'd/m/Y' : 'm/d/Y';
-                $dateFormat .= (isset($field['with_time']) && $field['with_time']) ? ' H:i' : '';
+                if (isset($field['with_time']) && $field['with_time']) {
+                    $dateFormat .= (isset($field['time_format']) && $field['time_format'] == 24) ? ' H:i' : ' g:ia';
+                }
                 if (is_array($data[$field['id']])) {
                     $field['value'] = isset($data[$field['id']][1]) ? (new Carbon($data[$field['id']][0]))->format($dateFormat)
                         . ' - ' . (new Carbon($data[$field['id']][1]))->format($dateFormat) : (new Carbon($data[$field['id']][0]))->format($dateFormat);
diff --git a/client/components/forms/DateInput.vue b/client/components/forms/DateInput.vue
index 4643218c..fdee6f77 100644
--- a/client/components/forms/DateInput.vue
+++ b/client/components/forms/DateInput.vue
@@ -64,6 +64,7 @@
           v-if="props.dateRange"
           v-model.range="modeledValue"
           :mode="props.withTime ? 'dateTime' : 'date'"
+          :is24hr="props.timeFormat == '24'"
           is-required
           borderless
           :min-date="minDate"
@@ -76,6 +77,7 @@
           v-else
           v-model="modeledValue"
           :mode="props.withTime ? 'dateTime' : 'date'"
+          :is24hr="props.timeFormat == '24'"
           is-required
           borderless
           :min-date="minDate"
@@ -112,6 +114,7 @@ const props = defineProps({
   disablePastDates: { type: Boolean, default: false },
   disableFutureDates: { type: Boolean, default: false },
   dateFormat: { type: String, default: 'dd/MM/yyyy' },
+  timeFormat: { type: String, default: '24' },
   outputDateFormat: { type: String, default: 'yyyy-MM-dd\'T\'HH:mm:ssXXX' },
   isDark: { type: Boolean, default: false }
 })
@@ -190,8 +193,9 @@ const clear = () => {
 const formattedDate = (value) => {
   if (props.withTime) {
     try {
-      return format(new Date(value), props.dateFormat + ' HH:mm')
+      return format(new Date(value), props.dateFormat + (props.timeFormat == 12 ? ' p':' HH:mm'))
     } catch (e) {
+      console.log(e)
       return ''
     }
   }
diff --git a/client/components/forms/FlatSelectInput.vue b/client/components/forms/FlatSelectInput.vue
index 8a4cb326..a417bee2 100644
--- a/client/components/forms/FlatSelectInput.vue
+++ b/client/components/forms/FlatSelectInput.vue
@@ -22,9 +22,11 @@
         },
       ]"
     >
-      <div
-        v-for="(option, index) in options"
-        v-if="options && options.length"
+    <template
+      v-if="options && options.length"
+    >
+     <div
+        v-for="(option) in options"
         :key="option[optionKey]"
         :role="multiple?'checkbox':'radio'"
         :aria-checked="isSelected(option[optionKey])"
@@ -67,6 +69,7 @@
           {{ option[displayKey] }}
         </p>
       </div>
+    </template>
       <div
         v-else
         :class="[
diff --git a/client/components/open/forms/OpenFormField.vue b/client/components/open/forms/OpenFormField.vue
index 7a1fbf10..187bda16 100644
--- a/client/components/open/forms/OpenFormField.vue
+++ b/client/components/open/forms/OpenFormField.vue
@@ -306,6 +306,7 @@ export default {
         inputProperties.searchable = (inputProperties.options.length > 4)
       } else if (field.type === 'date') {
         inputProperties.dateFormat = field.date_format
+        inputProperties.timeFormat = field.time_format
         if (field.with_time) {
           inputProperties.withTime = true
         }
diff --git a/client/components/open/forms/components/FormSubmissions.vue b/client/components/open/forms/components/FormSubmissions.vue
index 4fa254c0..600be353 100644
--- a/client/components/open/forms/components/FormSubmissions.vue
+++ b/client/components/open/forms/components/FormSubmissions.vue
@@ -163,12 +163,11 @@
 <script>
 import Fuse from 'fuse.js'
 import clonedeep from 'clone-deep'
-import VSwitch from '../../../forms/components/VSwitch.vue'
 import OpenTable from '../../tables/OpenTable.vue'
 
 export default {
   name: 'FormSubmissions',
-  components: {OpenTable, VSwitch},
+  components: {OpenTable},
   props: {},
 
   setup() {
diff --git a/client/components/open/forms/fields/components/FieldOptions.vue b/client/components/open/forms/fields/components/FieldOptions.vue
index 23daa1f2..986471a0 100644
--- a/client/components/open/forms/fields/components/FieldOptions.vue
+++ b/client/components/open/forms/fields/components/FieldOptions.vue
@@ -254,6 +254,14 @@
         :searchable="true"
         help="Make sure to select the same timezone you're using in Notion. Leave blank otherwise."
       />
+      <flat-select-input
+        v-if="field.with_time"
+        name="time_format"
+        class="mt-4"
+        :form="field"
+        :options="timeFormatOptions"
+        label="Time format"
+      />
       <flat-select-input
         name="date_format"
         class="mt-4"
@@ -413,6 +421,7 @@
         name="prefill"
         class="mt-3"
         :form="field"
+        :time-format="field.time_format"
         :with-time="field.with_time === true"
         :date-range="field.date_range === true"
         label="Pre-filled value"
@@ -645,6 +654,10 @@ export default {
         }
       })
     },
+    timeFormatOptions() {
+      return [{ name: '13:00', value: '24', },
+      { name: '01:00 PM', value: '12', },]
+    },
     displayBasedOnAdvanced() {
       if (this.field.generates_uuid || this.field.generates_auto_increment_id) {
         return false
@@ -755,7 +768,7 @@ export default {
         this.field.disable_future_dates = false
         this.field.disable_past_dates = false
       } else {
-        this.field.prefill = null
+        this.field.prefill = this.field.prefill ?? null
       }
     },
     onFieldAllowCreationChange(val) {
@@ -823,7 +836,8 @@ export default {
           max_char_limit: 2000
         },
         date: {
-          date_format: this.dateFormatOptions[0].value
+          date_format: this.dateFormatOptions[0].value,
+          time_format: this.timeFormatOptions[0].value
         }
       }
       if (this.field.type in defaultFieldValues) {
diff --git a/client/components/open/tables/components/OpenDate.vue b/client/components/open/tables/components/OpenDate.vue
index a5049573..0d48c7de 100644
--- a/client/components/open/tables/components/OpenDate.vue
+++ b/client/components/open/tables/components/OpenDate.vue
@@ -39,9 +39,10 @@ export default {
     formattedDate(val) {
       if (!val) return ''
       const dateFormat = _has(this.property, 'date_format') ? this.property.date_format : 'dd/MM/yyyy'
+      const timeFormat = _has(this.property, 'time_format') ? this.property.time_format : '24'
       if (this.property?.with_time) {
         try {
-          return format(new Date(val), dateFormat + ' HH:mm')
+          return format(new Date(val), dateFormat + (timeFormat == 12 ? ' p':' HH:mm'))
         } catch (e) {
           return ''
         }
diff --git a/client/public/widgets/iframe.js b/client/public/widgets/iframe.js
index 8afc2eef..62aee9da 100644
--- a/client/public/widgets/iframe.js
+++ b/client/public/widgets/iframe.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
 !function (e) {
   var n, i, t, o, r, a, s, l, f, c, d, u, m, g
 
diff --git a/client/public/widgets/iframe.min.js b/client/public/widgets/iframe.min.js
index 3bc2026c..eeb8ed63 100644
--- a/client/public/widgets/iframe.min.js
+++ b/client/public/widgets/iframe.min.js
@@ -1 +1,2 @@
+/* eslint-disable */
 !function(e){var n,t,i,o,r,a,s,l,f,c,d,u,m,g;function h(){return window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver}function p(e,n,t){e.addEventListener(n,t,!1)}function b(e,n,t){e.removeEventListener(n,t,!1)}function y(e){return c[e]?c[e].log:t}function v(e,n){_("log",e,n,y(e))}function $(e,n){_("info",e,n,y(e))}function w(e,n){_("warn",e,n,!0)}function _(e,n,t,i){var o,a;!0===i&&"object"==typeof window.console&&console[e](r+"["+(a="Host page: "+(o=n),a=window.top!==window.self?window.parentIFrame&&window.parentIFrame.getId?window.parentIFrame.getId()+": "+o:"Nested host page: "+o:a)+"]",t)}function x(e){function n(){t("Height"),t("Width"),W(function(){O(L),I(j),h("onResized",L)},L,"init")}function t(e){var n=Number(c[j]["max"+e]),t=Number(c[j]["min"+e]),e=e.toLowerCase(),i=Number(L[e]);v(j,"Checking "+e+" is in range "+t+"-"+n),i<t&&(i=t,v(j,"Set "+e+" to min value")),n<i&&(i=n,v(j,"Set "+e+" to max value")),L[e]=""+i}function i(e){return P.slice(P.indexOf(":")+o+e)}function l(e,n){var t,i,o;t=function(){var t,i;T("Send Page Info","pageInfo:"+(t=document.body.getBoundingClientRect(),JSON.stringify({iframeHeight:(i=L.iframe.getBoundingClientRect()).height,iframeWidth:i.width,clientHeight:Math.max(document.documentElement.clientHeight,window.innerHeight||0),clientWidth:Math.max(document.documentElement.clientWidth,window.innerWidth||0),offsetTop:parseInt(i.top-t.top,10),offsetLeft:parseInt(i.left-t.left,10),scrollTop:window.pageYOffset,scrollLeft:window.pageXOffset,documentHeight:document.documentElement.clientHeight,documentWidth:document.documentElement.clientWidth,windowHeight:window.innerHeight,windowWidth:window.innerWidth})),e,n)},i=32,m[o=n]||(m[o]=setTimeout(function(){m[o]=null,t()},i))}function f(e){return e=e.getBoundingClientRect(),M(j),{x:Math.floor(Number(e.left)+Number(s.x)),y:Math.floor(Number(e.top)+Number(s.y))}}function d(e){var n=e?f(L.iframe):{x:0,y:0},t={x:Number(L.width)+n.x,y:Number(L.height)+n.y};v(j,"Reposition requested from iFrame (offset x:"+n.x+" y:"+n.y+")"),window.top===window.self?(s=t,u(),v(j,"--")):window.parentIFrame?window.parentIFrame["scrollTo"+(e?"Offset":"")](t.x,t.y):w(j,"Unable to scroll to requested position, window.parentIFrame not found")}function u(){!1===h("onScroll",s)?R():I(j)}function g(e){var n,t={};t=0===Number(L.width)&&0===Number(L.height)?{x:(n=i(9).split(":"))[1],y:n[0]}:{x:L.width,y:L.height},h(e,{iframe:L.iframe,screenX:Number(t.x),screenY:Number(t.y),type:L.type})}function h(e,n){return k(j,e,n)}var y,_,x,z,H,S,P=e.data,L={},j=null;if("[iFrameResizerChild]Ready"===P)for(var A in c)T("iFrame requested init",C(A),c[A].iframe,A);else r===(""+P).slice(0,a)&&P.slice(a).split(":")[0]in c?(c[j=(L=(_=(y=P.slice(a).split(":"))[1]?parseInt(y[1],10):0,z=getComputedStyle(x=c[y[0]]&&c[y[0]].iframe),{iframe:x,id:y[0],height:_+function(e){if("border-box"!==e.boxSizing)return 0;var n=e.paddingTop?parseInt(e.paddingTop,10):0,e=e.paddingBottom?parseInt(e.paddingBottom,10):0;return n+e}(z)+function(e){if("border-box"!==e.boxSizing)return 0;var n=e.borderTopWidth?parseInt(e.borderTopWidth,10):0,e=e.borderBottomWidth?parseInt(e.borderBottomWidth,10):0;return n+e}(z),width:y[2],type:y[3]})).id]&&(c[j].loaded=!0),(S=L.type in{true:1,false:1,undefined:1})&&v(j,"Ignoring init message from meta parent page"),!S&&(S=!0,c[H=j]||(S=!1,w(L.type+" No settings for "+H+". Message was: "+P)),S)&&(v(j,"Received: "+P),H=!0,null===L.iframe&&(w(j,"IFrame ("+L.id+") not found"),H=!1),H&&function n(){var t=e.origin,i=c[j]&&c[j].checkOrigin;if(i&&""+t!="null"&&!function(){if(i.constructor!==Array)return e=c[j]&&c[j].remoteHost,v(j,"Checking connection is from: "+e),t===e;var e,n=0,o=!1;for(v(j,"Checking connection is from allowed list of origins: "+i);n<i.length;n++)if(i[n]===t){o=!0;break}return o}())throw Error("Unexpected message received from: "+t+" for "+L.iframe.id+". Message was: "+e.data+". This error can be disabled by setting the checkOrigin: false option or by providing of array of trusted domains.");return 1}()&&function e(){var t,o,r,a;switch(c[j]&&c[j].firstRun&&c[j]&&(c[j].firstRun=!1),L.type){case"close":F(L.iframe);break;case"message":o=i(6),v(j,"onMessage passed: {iframe: "+L.iframe.id+", message: "+o+"}"),h("onMessage",{iframe:L.iframe,message:JSON.parse(o)}),v(j,"--");break;case"mouseenter":g("onMouseEnter");break;case"mouseleave":g("onMouseLeave");break;case"autoResize":c[j].autoResize=JSON.parse(i(9));break;case"scrollTo":d(!1);break;case"scrollToOffset":d(!0);break;case"pageInfo":l(c[j]&&c[j].iframe,j),t=j,m("Add ",p),c[t]&&(c[t].stopPageInfo=y);break;case"pageInfoStop":c[j]&&c[j].stopPageInfo&&(c[j].stopPageInfo(),delete c[j].stopPageInfo);break;case"inPageLink":i(9),a=decodeURIComponent(r=r.split("#")[1]||""),(a=document.getElementById(a)||document.getElementsByName(a)[0])?(a=f(a),v(j,"Moving to in page link (#"+r+") at x: "+a.x+" y: "+a.y),s={x:a.x,y:a.y},u(),v(j,"--")):window.top===window.self?v(j,"In page link #"+r+" not found"):window.parentIFrame?window.parentIFrame.moveToAnchor(r):v(j,"In page link #"+r+" not found and window.parentIFrame not found");break;case"reset":E(L);break;case"init":n(),h("onInit",L.iframe);break;default:0===Number(L.width)&&0===Number(L.height)?w("Unsupported message received ("+L.type+"), this is likely due to the iframe containing a later version of iframe-resizer than the parent page"):n()}function m(e,n){function i(){c[t]?l(c[t].iframe,t):y()}["scroll","resize"].forEach(function(o){v(t,e+o+" listener for sendPageInfo"),n(window,o,i)})}function y(){m("Remove ",b)}}())):$(j,"Ignored: "+P)}function k(e,n,t){var i=null,o=null;if(c[e]){if("function"!=typeof(i=c[e][n]))throw TypeError(n+" on iFrame["+e+"] is not a function");o=i(t)}return o}function z(e){delete c[e=e.id]}function F(e){var n=e.id;if(!1===k(n,"onClose",n))v(n,"Close iframe cancelled by onClose event");else{v(n,"Removing iFrame: "+n);try{e.parentNode&&e.parentNode.removeChild(e)}catch(t){w(t)}k(n,"onClosed",n),v(n,"--"),z(e)}}function M(n){null===s&&v(n,"Get page position: "+(s={x:window.pageXOffset===e?document.documentElement.scrollLeft:window.pageXOffset,y:window.pageYOffset===e?document.documentElement.scrollTop:window.pageYOffset}).x+","+s.y)}function I(e){null!==s&&(window.scrollTo(s.x,s.y),v(e,"Set page position: "+s.x+","+s.y),R())}function R(){s=null}function E(e){v(e.id,"Size reset requested by "+("init"===e.type?"host page":"iFrame")),M(e.id),W(function(){O(e),T("reset","reset",e.iframe,e.id)},e,"reset")}function O(e){function n(n){var o;o=n,e.id?(e.iframe.style[o]=e[o]+"px",v(e.id,"IFrame ("+t+") "+o+" set to "+e[o]+"px")):v("undefined","messageData id not set"),function n(o){var r;function a(){Object.keys(c).forEach(function(e){var n;function t(e){return"0px"===(c[n]&&c[n].iframe.style[e])}c[n=e]&&null!==c[n].iframe.offsetParent&&(t("height")||t("width"))&&T("Visibility change","resize",c[n].iframe,n)})}!i&&"0"===e[o]&&(i=!0,v(t,"Hidden iFrame detected, creating visibility listener"),o=h())&&(r=document.querySelector("body"),new o(function e(n){v("window","Mutation observed: "+n[0].target+" "+n[0].type),S(a,16)}).observe(r,{attributes:!0,attributeOldValue:!1,characterData:!0,characterDataOldValue:!1,childList:!0,subtree:!0}))}(n)}var t=e.iframe.id;c[t]&&(c[t].sizeHeight&&n("height"),c[t].sizeWidth)&&n("width")}function W(e,n,t){t!==n.type&&l&&!window.jasmine?(v(n.id,"Requesting animation frame"),l(e)):e()}function T(e,n,t,i,o){var a,s=!1;c[i=i||t.id]&&(t&&"contentWindow"in t&&null!==t.contentWindow?(a=c[i]&&c[i].targetOrigin,v(i,"["+e+"] Sending msg to iframe["+i+"] ("+n+") targetOrigin: "+a),t.contentWindow.postMessage(r+n,a)):w(i,"["+e+"] IFrame("+i+") not found"),o&&c[i]&&c[i].warningTimeout&&(c[i].msgTimeout=setTimeout(function(){!c[i]||c[i].loaded||s||(s=!0,w(i,"IFrame has not responded within "+c[i].warningTimeout/1e3+" seconds. Check iFrameResizer.contentWindow.js has been loaded in iFrame. This message can be ignored if everything is working, or you can set the warningTimeout option to a higher value or zero to suppress this warning."))},c[i].warningTimeout)))}function C(e){return e+":"+c[e].bodyMarginV1+":"+c[e].sizeWidth+":"+c[e].log+":"+c[e].interval+":"+c[e].enablePublicMethods+":"+c[e].autoResize+":"+c[e].bodyMargin+":"+c[e].heightCalculationMethod+":"+c[e].bodyBackground+":"+c[e].bodyPadding+":"+c[e].tolerance+":"+c[e].inPageLinks+":"+c[e].resizeFrom+":"+c[e].widthCalculationMethod+":"+c[e].mouseEvents}function H(i,o){function r(e){var n=e.split("Callback");2===n.length&&(this[n="on"+n[0].charAt(0).toUpperCase()+n[0].slice(1)]=this[e],delete this[e],w(l,"Deprecated: '"+e+"' has been renamed '"+n+"'. The old method will be removed in the next major version."))}var a,s,l=function(e){var r;if("string"!=typeof e)throw TypeError("Invaild id for iFrame. Expected String");return""===e&&(i.id=(r=o&&o.id||u.id+n++,null!==document.getElementById(r)&&(r+=n++),e=r),t=(o||{}).log,v(e,"Added missing iframe ID: "+e+" ("+i.src+")")),e}(i.id);if(l in c&&"iFrameResizer"in i)w(l,"Ignored iFrame, already setup.");else{switch(function e(n){if(n=n||{},c[l]=Object.create(null),c[l].iframe=i,c[l].firstRun=!0,c[l].remoteHost=i.src&&i.src.split("/").slice(0,3).join("/"),"object"!=typeof n)throw TypeError("Options is not an object");Object.keys(n).forEach(r,n);var t,o=n;for(t in u)Object.prototype.hasOwnProperty.call(u,t)&&(c[l][t]=(Object.prototype.hasOwnProperty.call(o,t)?o:u)[t]);c[l]&&(c[l].targetOrigin=!0!==c[l].checkOrigin||""===(n=c[l].remoteHost)||null!==n.match(/^(about:blank|javascript:|file:\/\/)/)?"*":n)}(o),v(l,"IFrame scrolling "+(c[l]&&c[l].scrolling?"enabled":"disabled")+" for "+l),i.style.overflow=!1===(c[l]&&c[l].scrolling)?"hidden":"auto",c[l]&&c[l].scrolling){case"omit":break;case!0:i.scrolling="yes";break;case!1:i.scrolling="no";break;default:i.scrolling=c[l]?c[l].scrolling:"no"}m("Height"),m("Width"),d("maxHeight"),d("minHeight"),d("maxWidth"),d("minWidth"),"number"!=typeof(c[l]&&c[l].bodyMargin)&&"0"!==(c[l]&&c[l].bodyMargin)||(c[l].bodyMarginV1=c[l].bodyMargin,c[l].bodyMargin=c[l].bodyMargin+"px"),a=C(l),(s=h())&&i.parentNode&&new s(function(e){e.forEach(function(e){Array.prototype.slice.call(e.removedNodes).forEach(function(e){e===i&&F(i)})})}).observe(i.parentNode,{childList:!0}),p(i,"load",function(){var n,t;T("iFrame.onload",a,i,e,!0),n=c[l]&&c[l].firstRun,t=c[l]&&c[l].heightCalculationMethod in f,!n&&t&&E({iframe:i,height:0,width:0,type:"init"})}),T("init",a,i,e,!0),c[l]&&(c[l].iframe.iFrameResizer={close:F.bind(null,c[l].iframe),removeListeners:z.bind(null,c[l].iframe),resize:T.bind(null,"Window resize","resize",c[l].iframe),moveToAnchor:function(e){T("Move to anchor","moveToAnchor:"+e,c[l].iframe,l)},sendMessage:function(e){T("Send Message","message:"+(e=JSON.stringify(e)),c[l].iframe,l)}})}function d(e){var n=c[l][e];1/0!==n&&0!==n&&(i.style[e]="number"==typeof n?n+"px":n,v(l,"Set "+e+" = "+i.style[e]))}function m(e){if(c[l]["min"+e]>c[l]["max"+e])throw Error("Value for min"+e+" can not be greater than max"+e)}}function S(e,n){null===d&&(d=setTimeout(function(){d=null,e()},n))}function P(){"hidden"!==document.visibilityState&&(v("document","Trigger event: Visibility change"),S(function(){L("Tab Visible","resize")},16))}function L(e,n){Object.keys(c).forEach(function(t){var i;c[i=t]&&"parent"===c[i].resizeFrom&&c[i].autoResize&&!c[i].firstRun&&T(e,n,c[t].iframe,t)})}function j(){function n(e,n){if(n){if(!n.tagName)throw TypeError("Object is not a valid DOM element");if("IFRAME"!==n.tagName.toUpperCase())throw TypeError("Expected <IFRAME> tag, found <"+n.tagName+">");H(n,e),t.push(n)}}for(var t,i=["moz","webkit","o","ms"],o=0;o<i.length&&!l;o+=1)l=window[i[o]+"RequestAnimationFrame"];return l?l=l.bind(window):v("setup","RequestAnimationFrame not supported"),p(window,"message",x),p(window,"resize",function(){var e;v("window","Trigger event: "+(e="resize")),S(function(){L("Window "+e,"resize")},16)}),p(document,"visibilitychange",P),p(document,"-webkit-visibilitychange",P),function(i,o){var r;switch(t=[],(r=i)&&r.enablePublicMethods&&w("enablePublicMethods option has been removed, public methods are now always available in the iFrame"),typeof o){case"undefined":case"string":Array.prototype.forEach.call(document.querySelectorAll(o||"iframe"),n.bind(e,i));break;case"object":n(i,o);break;default:throw TypeError("Unexpected data type ("+typeof o+")")}return t}}"undefined"!=typeof window&&(n=0,i=t=!1,o=7,a=(r="[iFrameSizer]").length,s=null,l=window.requestAnimationFrame,f=Object.freeze({max:1,scroll:1,bodyScroll:1,documentElementScroll:1}),c={},d=null,u=Object.freeze({autoResize:!0,bodyBackground:null,bodyMargin:null,bodyMarginV1:8,bodyPadding:null,checkOrigin:!0,inPageLinks:!1,enablePublicMethods:!0,heightCalculationMethod:"bodyOffset",id:"iFrameResizer",interval:32,log:!1,maxHeight:1/0,maxWidth:1/0,minHeight:0,minWidth:0,mouseEvents:!0,resizeFrom:"parent",scrolling:!1,sizeHeight:!0,sizeWidth:!1,warningTimeout:5e3,tolerance:0,widthCalculationMethod:"scroll",onClose:function(){return!0},onClosed:function(){},onInit:function(){},onMessage:function(){w("onMessage function not defined")},onMouseEnter:function(){},onMouseLeave:function(){},onResized:function(){},onScroll:function(){return!0}}),m={},window.jQuery!==e&&((g=window.jQuery).fn?g.fn.iFrameResize||(g.fn.iFrameResize=function(e){return this.filter("iframe").each(function(n,t){H(t,e)}).end()}):$("","Unable to bind to jQuery, it is not fully loaded.")),"function"==typeof define&&define.amd?define([],j):"object"==typeof module&&"object"==typeof module.exports&&(module.exports=j()),window.iFrameResize=window.iFrameResize||j())}();function initEmbed(e){e&&(window.addEventListener("message",function(n){n.data?.type==="form-submitted"&&n.data?.form?.slug===e&&n.data?.form?.redirect_target_url&&(window.top.location.href=n.data.form.redirect_target_url)}),document.addEventListener("DOMContentLoaded",function(){iFrameResize({log:!1,checkOrigin:!1},"#"+e)}))}
\ No newline at end of file
diff --git a/client/public/widgets/iframeResize.min.js b/client/public/widgets/iframeResize.min.js
index f0ed43f2..ddab8b85 100644
--- a/client/public/widgets/iframeResize.min.js
+++ b/client/public/widgets/iframeResize.min.js
@@ -1 +1,2 @@
+/* eslint-disable */
 !function(e){var n,i,t,o,r,a,s,l,f,c,d,u,m,g;function h(){return window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver}function p(e,n,i){e.addEventListener(n,i,!1)}function b(e,n,i){e.removeEventListener(n,i,!1)}function y(e){return c[e]?c[e].log:i}function v(e,n){_("log",e,n,y(e))}function $(e,n){_("info",e,n,y(e))}function w(e,n){_("warn",e,n,!0)}function _(e,n,i,t){var o,a;!0===t&&"object"==typeof window.console&&console[e](r+"["+(a="Host page: "+(o=n),a=window.top!==window.self?window.parentIFrame&&window.parentIFrame.getId?window.parentIFrame.getId()+": "+o:"Nested host page: "+o:a)+"]",i)}function x(e){function n(){i("Height"),i("Width"),O(function(){E(j),I(L),h("onResized",j)},j,"init")}function i(e){var n=Number(c[L]["max"+e]),i=Number(c[L]["min"+e]),e=e.toLowerCase(),t=Number(j[e]);v(L,"Checking "+e+" is in range "+i+"-"+n),t<i&&(t=i,v(L,"Set "+e+" to min value")),n<t&&(t=n,v(L,"Set "+e+" to max value")),j[e]=""+t}function t(e){return P.slice(P.indexOf(":")+o+e)}function l(e,n){var i,t,o;i=function(){var i,t;T("Send Page Info","pageInfo:"+(i=document.body.getBoundingClientRect(),JSON.stringify({iframeHeight:(t=j.iframe.getBoundingClientRect()).height,iframeWidth:t.width,clientHeight:Math.max(document.documentElement.clientHeight,window.innerHeight||0),clientWidth:Math.max(document.documentElement.clientWidth,window.innerWidth||0),offsetTop:parseInt(t.top-i.top,10),offsetLeft:parseInt(t.left-i.left,10),scrollTop:window.pageYOffset,scrollLeft:window.pageXOffset,documentHeight:document.documentElement.clientHeight,documentWidth:document.documentElement.clientWidth,windowHeight:window.innerHeight,windowWidth:window.innerWidth})),e,n)},t=32,m[o=n]||(m[o]=setTimeout(function(){m[o]=null,i()},t))}function f(e){return e=e.getBoundingClientRect(),M(L),{x:Math.floor(Number(e.left)+Number(s.x)),y:Math.floor(Number(e.top)+Number(s.y))}}function d(e){var n=e?f(j.iframe):{x:0,y:0},i={x:Number(j.width)+n.x,y:Number(j.height)+n.y};v(L,"Reposition requested from iFrame (offset x:"+n.x+" y:"+n.y+")"),window.top===window.self?(s=i,u(),v(L,"--")):window.parentIFrame?window.parentIFrame["scrollTo"+(e?"Offset":"")](i.x,i.y):w(L,"Unable to scroll to requested position, window.parentIFrame not found")}function u(){!1===h("onScroll",s)?R():I(L)}function g(e){var n,i={};i=0===Number(j.width)&&0===Number(j.height)?{x:(n=t(9).split(":"))[1],y:n[0]}:{x:j.width,y:j.height},h(e,{iframe:j.iframe,screenX:Number(i.x),screenY:Number(i.y),type:j.type})}function h(e,n){return k(L,e,n)}var y,_,x,z,H,S,P=e.data,j={},L=null;if("[iFrameResizerChild]Ready"===P)for(var A in c)T("iFrame requested init",C(A),c[A].iframe,A);else r===(""+P).slice(0,a)&&P.slice(a).split(":")[0]in c?(c[L=(j=(_=(y=P.slice(a).split(":"))[1]?parseInt(y[1],10):0,z=getComputedStyle(x=c[y[0]]&&c[y[0]].iframe),{iframe:x,id:y[0],height:_+function(e){if("border-box"!==e.boxSizing)return 0;var n=e.paddingTop?parseInt(e.paddingTop,10):0,e=e.paddingBottom?parseInt(e.paddingBottom,10):0;return n+e}(z)+function(e){if("border-box"!==e.boxSizing)return 0;var n=e.borderTopWidth?parseInt(e.borderTopWidth,10):0,e=e.borderBottomWidth?parseInt(e.borderBottomWidth,10):0;return n+e}(z),width:y[2],type:y[3]})).id]&&(c[L].loaded=!0),(S=j.type in{true:1,false:1,undefined:1})&&v(L,"Ignoring init message from meta parent page"),!S&&(S=!0,c[H=L]||(S=!1,w(j.type+" No settings for "+H+". Message was: "+P)),S)&&(v(L,"Received: "+P),H=!0,null===j.iframe&&(w(L,"IFrame ("+j.id+") not found"),H=!1),H&&function n(){var i=e.origin,t=c[L]&&c[L].checkOrigin;if(t&&""+i!="null"&&!function(){if(t.constructor!==Array)return e=c[L]&&c[L].remoteHost,v(L,"Checking connection is from: "+e),i===e;var e,n=0,o=!1;for(v(L,"Checking connection is from allowed list of origins: "+t);n<t.length;n++)if(t[n]===i){o=!0;break}return o}())throw Error("Unexpected message received from: "+i+" for "+j.iframe.id+". Message was: "+e.data+". This error can be disabled by setting the checkOrigin: false option or by providing of array of trusted domains.");return 1}()&&function e(){var i,o,r,a,m;switch(c[L]&&c[L].firstRun&&c[L]&&(c[L].firstRun=!1),j.type){case"close":F(j.iframe);break;case"message":o=t(6),v(L,"onMessage passed: {iframe: "+j.iframe.id+", message: "+o+"}"),h("onMessage",{iframe:j.iframe,message:JSON.parse(o)}),v(L,"--");break;case"mouseenter":g("onMouseEnter");break;case"mouseleave":g("onMouseLeave");break;case"autoResize":c[L].autoResize=JSON.parse(t(9));break;case"scrollTo":d(!1);break;case"scrollToOffset":d(!0);break;case"pageInfo":l(c[L]&&c[L].iframe,L),i=L,y("Add ",p),c[i]&&(c[i].stopPageInfo=$);break;case"pageInfoStop":c[L]&&c[L].stopPageInfo&&(c[L].stopPageInfo(),delete c[L].stopPageInfo);break;case"inPageLink":t(9),m=decodeURIComponent(a=a.split("#")[1]||""),(m=document.getElementById(m)||document.getElementsByName(m)[0])?(m=f(m),v(L,"Moving to in page link (#"+a+") at x: "+m.x+" y: "+m.y),s={x:m.x,y:m.y},u(),v(L,"--")):window.top===window.self?v(L,"In page link #"+a+" not found"):window.parentIFrame?window.parentIFrame.moveToAnchor(a):v(L,"In page link #"+a+" not found and window.parentIFrame not found");break;case"reset":W(j);break;case"init":n(),h("onInit",j.iframe);break;default:0===Number(j.width)&&0===Number(j.height)?w("Unsupported message received ("+j.type+"), this is likely due to the iframe containing a later version of iframe-resizer than the parent page"):n()}function y(e,n){function t(){c[i]?l(c[i].iframe,i):$()}["scroll","resize"].forEach(function(o){v(i,e+o+" listener for sendPageInfo"),n(window,o,t)})}function $(){y("Remove ",b)}}())):$(L,"Ignored: "+P)}function k(e,n,i){var t=null,o=null;if(c[e]){if("function"!=typeof(t=c[e][n]))throw TypeError(n+" on iFrame["+e+"] is not a function");o=t(i)}return o}function z(e){delete c[e=e.id]}function F(e){var n=e.id;if(!1===k(n,"onClose",n))v(n,"Close iframe cancelled by onClose event");else{v(n,"Removing iFrame: "+n);try{e.parentNode&&e.parentNode.removeChild(e)}catch(i){w(i)}k(n,"onClosed",n),v(n,"--"),z(e)}}function M(n){null===s&&v(n,"Get page position: "+(s={x:window.pageXOffset===e?document.documentElement.scrollLeft:window.pageXOffset,y:window.pageYOffset===e?document.documentElement.scrollTop:window.pageYOffset}).x+","+s.y)}function I(e){null!==s&&(window.scrollTo(s.x,s.y),v(e,"Set page position: "+s.x+","+s.y),R())}function R(){s=null}function W(e){v(e.id,"Size reset requested by "+("init"===e.type?"host page":"iFrame")),M(e.id),O(function(){E(e),T("reset","reset",e.iframe,e.id)},e,"reset")}function E(e){function n(n){var o;o=n,e.id?(e.iframe.style[o]=e[o]+"px",v(e.id,"IFrame ("+i+") "+o+" set to "+e[o]+"px")):v("undefined","messageData id not set"),function n(o){var r;function a(){Object.keys(c).forEach(function(e){var n;function i(e){return"0px"===(c[n]&&c[n].iframe.style[e])}c[n=e]&&null!==c[n].iframe.offsetParent&&(i("height")||i("width"))&&T("Visibility change","resize",c[n].iframe,n)})}!t&&"0"===e[o]&&(t=!0,v(i,"Hidden iFrame detected, creating visibility listener"),o=h())&&(r=document.querySelector("body"),new o(function e(n){v("window","Mutation observed: "+n[0].target+" "+n[0].type),S(a,16)}).observe(r,{attributes:!0,attributeOldValue:!1,characterData:!0,characterDataOldValue:!1,childList:!0,subtree:!0}))}(n)}var i=e.iframe.id;c[i]&&(c[i].sizeHeight&&n("height"),c[i].sizeWidth)&&n("width")}function O(e,n,i){i!==n.type&&l&&!window.jasmine?(v(n.id,"Requesting animation frame"),l(e)):e()}function T(e,n,i,t,o){var a,s=!1;c[t=t||i.id]&&(i&&"contentWindow"in i&&null!==i.contentWindow?(a=c[t]&&c[t].targetOrigin,v(t,"["+e+"] Sending msg to iframe["+t+"] ("+n+") targetOrigin: "+a),i.contentWindow.postMessage(r+n,a)):w(t,"["+e+"] IFrame("+t+") not found"),o&&c[t]&&c[t].warningTimeout&&(c[t].msgTimeout=setTimeout(function(){!c[t]||c[t].loaded||s||(s=!0,w(t,"IFrame has not responded within "+c[t].warningTimeout/1e3+" seconds. Check iFrameResizer.contentWindow.js has been loaded in iFrame. This message can be ignored if everything is working, or you can set the warningTimeout option to a higher value or zero to suppress this warning."))},c[t].warningTimeout)))}function C(e){return e+":"+c[e].bodyMarginV1+":"+c[e].sizeWidth+":"+c[e].log+":"+c[e].interval+":"+c[e].enablePublicMethods+":"+c[e].autoResize+":"+c[e].bodyMargin+":"+c[e].heightCalculationMethod+":"+c[e].bodyBackground+":"+c[e].bodyPadding+":"+c[e].tolerance+":"+c[e].inPageLinks+":"+c[e].resizeFrom+":"+c[e].widthCalculationMethod+":"+c[e].mouseEvents}function H(t,o){function r(e){var n=e.split("Callback");2===n.length&&(this[n="on"+n[0].charAt(0).toUpperCase()+n[0].slice(1)]=this[e],delete this[e],w(l,"Deprecated: '"+e+"' has been renamed '"+n+"'. The old method will be removed in the next major version."))}var a,s,l=function(e){var r;if("string"!=typeof e)throw TypeError("Invaild id for iFrame. Expected String");return""===e&&(t.id=(r=o&&o.id||u.id+n++,null!==document.getElementById(r)&&(r+=n++),e=r),i=(o||{}).log,v(e,"Added missing iframe ID: "+e+" ("+t.src+")")),e}(t.id);if(l in c&&"iFrameResizer"in t)w(l,"Ignored iFrame, already setup.");else{switch(function e(n){if(n=n||{},c[l]=Object.create(null),c[l].iframe=t,c[l].firstRun=!0,c[l].remoteHost=t.src&&t.src.split("/").slice(0,3).join("/"),"object"!=typeof n)throw TypeError("Options is not an object");Object.keys(n).forEach(r,n);var i,o=n;for(i in u)Object.prototype.hasOwnProperty.call(u,i)&&(c[l][i]=(Object.prototype.hasOwnProperty.call(o,i)?o:u)[i]);c[l]&&(c[l].targetOrigin=!0!==c[l].checkOrigin||""===(n=c[l].remoteHost)||null!==n.match(/^(about:blank|javascript:|file:\/\/)/)?"*":n)}(o),v(l,"IFrame scrolling "+(c[l]&&c[l].scrolling?"enabled":"disabled")+" for "+l),t.style.overflow=!1===(c[l]&&c[l].scrolling)?"hidden":"auto",c[l]&&c[l].scrolling){case"omit":break;case!0:t.scrolling="yes";break;case!1:t.scrolling="no";break;default:t.scrolling=c[l]?c[l].scrolling:"no"}m("Height"),m("Width"),d("maxHeight"),d("minHeight"),d("maxWidth"),d("minWidth"),"number"!=typeof(c[l]&&c[l].bodyMargin)&&"0"!==(c[l]&&c[l].bodyMargin)||(c[l].bodyMarginV1=c[l].bodyMargin,c[l].bodyMargin=c[l].bodyMargin+"px"),a=C(l),(s=h())&&t.parentNode&&new s(function(e){e.forEach(function(e){Array.prototype.slice.call(e.removedNodes).forEach(function(e){e===t&&F(t)})})}).observe(t.parentNode,{childList:!0}),p(t,"load",function(){var n,i;T("iFrame.onload",a,t,e,!0),n=c[l]&&c[l].firstRun,i=c[l]&&c[l].heightCalculationMethod in f,!n&&i&&W({iframe:t,height:0,width:0,type:"init"})}),T("init",a,t,e,!0),c[l]&&(c[l].iframe.iFrameResizer={close:F.bind(null,c[l].iframe),removeListeners:z.bind(null,c[l].iframe),resize:T.bind(null,"Window resize","resize",c[l].iframe),moveToAnchor:function(e){T("Move to anchor","moveToAnchor:"+e,c[l].iframe,l)},sendMessage:function(e){T("Send Message","message:"+(e=JSON.stringify(e)),c[l].iframe,l)}})}function d(e){var n=c[l][e];1/0!==n&&0!==n&&(t.style[e]="number"==typeof n?n+"px":n,v(l,"Set "+e+" = "+t.style[e]))}function m(e){if(c[l]["min"+e]>c[l]["max"+e])throw Error("Value for min"+e+" can not be greater than max"+e)}}function S(e,n){null===d&&(d=setTimeout(function(){d=null,e()},n))}function P(){"hidden"!==document.visibilityState&&(v("document","Trigger event: Visibility change"),S(function(){j("Tab Visible","resize")},16))}function j(e,n){Object.keys(c).forEach(function(i){var t;c[t=i]&&"parent"===c[t].resizeFrom&&c[t].autoResize&&!c[t].firstRun&&T(e,n,c[i].iframe,i)})}function L(){function n(e,n){if(n){if(!n.tagName)throw TypeError("Object is not a valid DOM element");if("IFRAME"!==n.tagName.toUpperCase())throw TypeError("Expected <IFRAME> tag, found <"+n.tagName+">");H(n,e),i.push(n)}}for(var i,t=["moz","webkit","o","ms"],o=0;o<t.length&&!l;o+=1)l=window[t[o]+"RequestAnimationFrame"];return l?l=l.bind(window):v("setup","RequestAnimationFrame not supported"),p(window,"message",x),p(window,"resize",function(){var e;v("window","Trigger event: "+(e="resize")),S(function(){j("Window "+e,"resize")},16)}),p(document,"visibilitychange",P),p(document,"-webkit-visibilitychange",P),function(t,o){var r;switch(i=[],(r=t)&&r.enablePublicMethods&&w("enablePublicMethods option has been removed, public methods are now always available in the iFrame"),typeof o){case"undefined":case"string":Array.prototype.forEach.call(document.querySelectorAll(o||"iframe"),n.bind(e,t));break;case"object":n(t,o);break;default:throw TypeError("Unexpected data type ("+typeof o+")")}return i}}"undefined"!=typeof window&&(n=0,t=i=!1,o=7,a=(r="[iFrameSizer]").length,s=null,l=window.requestAnimationFrame,f=Object.freeze({max:1,scroll:1,bodyScroll:1,documentElementScroll:1}),c={},d=null,u=Object.freeze({autoResize:!0,bodyBackground:null,bodyMargin:null,bodyMarginV1:8,bodyPadding:null,checkOrigin:!0,inPageLinks:!1,enablePublicMethods:!0,heightCalculationMethod:"bodyOffset",id:"iFrameResizer",interval:32,log:!1,maxHeight:1/0,maxWidth:1/0,minHeight:0,minWidth:0,mouseEvents:!0,resizeFrom:"parent",scrolling:!1,sizeHeight:!0,sizeWidth:!1,warningTimeout:5e3,tolerance:0,widthCalculationMethod:"scroll",onClose:function(){return!0},onClosed:function(){},onInit:function(){},onMessage:function(){w("onMessage function not defined")},onMouseEnter:function(){},onMouseLeave:function(){},onResized:function(){},onScroll:function(){return!0}}),m={},window.jQuery!==e&&((g=window.jQuery).fn?g.fn.iFrameResize||(g.fn.iFrameResize=function(e){return this.filter("iframe").each(function(n,i){H(i,e)}).end()}):$("","Unable to bind to jQuery, it is not fully loaded.")),"function"==typeof define&&define.amd?define([],L):"object"==typeof module&&"object"==typeof module.exports&&(module.exports=L()),window.iFrameResize=window.iFrameResize||L())}()