diff --git a/src/renderer/components/blocks/forms/CoBenifetsForm.tsx b/src/renderer/components/blocks/forms/CoBenifetsForm.tsx
index 90132272..7388793f 100644
--- a/src/renderer/components/blocks/forms/CoBenifetsForm.tsx
+++ b/src/renderer/components/blocks/forms/CoBenifetsForm.tsx
@@ -1,10 +1,10 @@
-import { useRef, forwardRef, useImperativeHandle } from 'react';
-import { Formik, Form, FormikProps } from 'formik';
+import { forwardRef, useImperativeHandle, useRef } from 'react';
+import { Form, Formik, FormikProps } from 'formik';
 import { Field, Repeater } from '@/components';
 import * as yup from 'yup';
 import { CoBenefit } from '@/schemas/CoBenefit.schema';
 import { PickList } from '@/schemas/PickList.schema';
-import { validateAndSubmitFieldArrayForm, deepOmit } from '@/utils/formik-utils';
+import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
 
 const validationSchema = yup.object({
   cobenefits: yup.array().of(
@@ -29,7 +29,12 @@ const CoBenefitsForm = forwardRef<CoBenefitsFormRef, CoBenefitsFormProps>(
     const formikRef = useRef<FormikProps<any>>(null);
 
     useImperativeHandle(ref, () => ({
-      submitForm: async () => deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'coBenefits'), ['orgUid', 'warehouseProjectId', 'timeStaged']),
+      submitForm: async () =>
+        deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'coBenefits'), [
+          'orgUid',
+          'warehouseProjectId',
+          'timeStaged',
+        ]),
     }));
 
     return (
@@ -58,6 +63,7 @@ const CoBenefitsForm = forwardRef<CoBenefitsFormRef, CoBenefitsFormProps>(
                     freeform={true}
                     options={picklistOptions?.coBenefits}
                     readonly={readonly}
+                    required={true}
                     initialValue={coBenefit.cobenefit}
                   />
                 </div>
diff --git a/src/renderer/components/blocks/forms/EstimationsForm.tsx b/src/renderer/components/blocks/forms/EstimationsForm.tsx
index 849ae047..87e69dee 100644
--- a/src/renderer/components/blocks/forms/EstimationsForm.tsx
+++ b/src/renderer/components/blocks/forms/EstimationsForm.tsx
@@ -3,7 +3,7 @@ import { Form, Formik, FormikProps } from 'formik';
 import { Field, Repeater } from '@/components';
 import { Estimation } from '@/schemas/Estimation.schema';
 import * as yup from 'yup';
-import { validateAndSubmitFieldArrayForm, deepOmit } from '@/utils/formik-utils';
+import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
 
 const validationSchema = yup.object({
   estimations: yup.array().of(
@@ -27,12 +27,16 @@ export interface EstimationsFormRef {
   submitForm: () => Promise<any>;
 }
 
-const EstimationsForm = forwardRef<EstimationsFormRef, EstimationsFormProps>(
-  ({ readonly = false, data, }, ref) => {
-    const formikRef = useRef<FormikProps<any>>(null);
+const EstimationsForm = forwardRef<EstimationsFormRef, EstimationsFormProps>(({ readonly = false, data }, ref) => {
+  const formikRef = useRef<FormikProps<any>>(null);
 
   useImperativeHandle(ref, () => ({
-    submitForm: async () => deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'estimations'), ['orgUid', 'warehouseProjectId', 'timeStaged']),
+    submitForm: async () =>
+      deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'estimations'), [
+        'orgUid',
+        'warehouseProjectId',
+        'timeStaged',
+      ]),
   }));
 
   return (
@@ -64,6 +68,7 @@ const EstimationsForm = forwardRef<EstimationsFormRef, EstimationsFormProps>(
                   label="Crediting Period Start"
                   type="date"
                   readonly={readonly}
+                  required={true}
                   initialValue={estimation.creditingPeriodStart}
                 />
                 <Field
@@ -71,6 +76,7 @@ const EstimationsForm = forwardRef<EstimationsFormRef, EstimationsFormProps>(
                   label="Crediting Period End"
                   type="date"
                   readonly={readonly}
+                  required={true}
                   initialValue={estimation.creditingPeriodEnd}
                 />
                 <Field
@@ -78,6 +84,7 @@ const EstimationsForm = forwardRef<EstimationsFormRef, EstimationsFormProps>(
                   label="Unit Count"
                   type="number"
                   readonly={readonly}
+                  required={true}
                   initialValue={estimation.unitCount}
                 />
               </div>
diff --git a/src/renderer/components/blocks/forms/IssuancesForm.tsx b/src/renderer/components/blocks/forms/IssuancesForm.tsx
index f0641a05..15700a7f 100644
--- a/src/renderer/components/blocks/forms/IssuancesForm.tsx
+++ b/src/renderer/components/blocks/forms/IssuancesForm.tsx
@@ -1,10 +1,10 @@
-import { forwardRef, useRef, useImperativeHandle } from 'react';
+import { forwardRef, useImperativeHandle, useRef } from 'react';
 import { Form, Formik, FormikProps } from 'formik';
 import * as yup from 'yup';
 import { Field, Repeater, UnitSummary } from '@/components';
 import { Issuance } from '@/schemas/Issuance.schema';
 import { PickList } from '@/schemas/PickList.schema';
-import { validateAndSubmitFieldArrayForm, deepOmit } from '@/utils/formik-utils';
+import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
 
 const validationSchema = yup.object({
   issuances: yup.array().of(
@@ -39,7 +39,12 @@ const IssuancesForm = forwardRef<IssuancesFormRef, IssuancesFormProps>(
     const formikRef = useRef<FormikProps<any>>(null);
 
     useImperativeHandle(ref, () => ({
-      submitForm: async () => deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'issuances'), ['orgUid', 'warehouseProjectId', 'timeStaged']),
+      submitForm: async () =>
+        deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'issuances'), [
+          'orgUid',
+          'warehouseProjectId',
+          'timeStaged',
+        ]),
     }));
 
     return (
@@ -73,6 +78,7 @@ const IssuancesForm = forwardRef<IssuancesFormRef, IssuancesFormProps>(
                       label="Start Date"
                       type="date"
                       readonly={readonly}
+                      required={true}
                       initialValue={issuance.startDate}
                     />
                     <Field
@@ -80,6 +86,7 @@ const IssuancesForm = forwardRef<IssuancesFormRef, IssuancesFormProps>(
                       label="End Date"
                       type="date"
                       readonly={readonly}
+                      required={true}
                       initialValue={issuance.endDate}
                     />
                     <Field
@@ -87,6 +94,7 @@ const IssuancesForm = forwardRef<IssuancesFormRef, IssuancesFormProps>(
                       label="Verification Approach"
                       type="text"
                       readonly={readonly}
+                      required={true}
                       initialValue={issuance.verificationApproach}
                     />
                     <Field
@@ -96,6 +104,7 @@ const IssuancesForm = forwardRef<IssuancesFormRef, IssuancesFormProps>(
                       freeform={true}
                       options={picklistOptions?.verificationBody}
                       readonly={readonly}
+                      required={true}
                       initialValue={issuance.verificationBody || ''}
                     />
                     <Field
@@ -103,6 +112,7 @@ const IssuancesForm = forwardRef<IssuancesFormRef, IssuancesFormProps>(
                       label="Verification Report Date"
                       type="date"
                       readonly={readonly}
+                      required={true}
                       initialValue={issuance.verificationReportDate || null}
                     />
                   </div>
diff --git a/src/renderer/components/blocks/forms/LabelsForm.tsx b/src/renderer/components/blocks/forms/LabelsForm.tsx
index 52bf6aa4..a3926962 100644
--- a/src/renderer/components/blocks/forms/LabelsForm.tsx
+++ b/src/renderer/components/blocks/forms/LabelsForm.tsx
@@ -1,10 +1,10 @@
-import { forwardRef, useRef, useImperativeHandle } from 'react';
+import { forwardRef, useImperativeHandle, useRef } from 'react';
 import { Form, Formik, FormikProps } from 'formik';
 import { Field, Repeater } from '@/components';
 import * as yup from 'yup';
 import { Label } from '@/schemas/Label.schema';
 import { PickList } from '@/schemas/PickList.schema';
-import { validateAndSubmitFieldArrayForm, deepOmit } from '@/utils/formik-utils';
+import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
 
 const validationSchema = yup.object({
   labels: yup.array().of(
@@ -13,14 +13,22 @@ const validationSchema = yup.object({
       labelType: yup.string().required('Label type is required'),
       labelLink: yup.string().url('Must be a valid URL').nullable(),
       validityPeriodStartDate: yup.date().nullable(),
-      validityPeriodEndDate: yup.date().nullable()
+      validityPeriodEndDate: yup
+        .date()
+        .nullable()
         .when('validityPeriodStartDate', (validityPeriodStartDate, schema) =>
-          validityPeriodStartDate ? schema.min(validityPeriodStartDate, 'Validity Period End Date must be after the start date') : schema
+          validityPeriodStartDate
+            ? schema.min(validityPeriodStartDate, 'Validity Period End Date must be after the start date')
+            : schema,
         ),
       creditingPeriodStartDate: yup.date().nullable(),
-      creditingPeriodEndDate: yup.date().nullable()
+      creditingPeriodEndDate: yup
+        .date()
+        .nullable()
         .when('creditingPeriodStartDate', (creditingPeriodStartDate, schema) =>
-          creditingPeriodStartDate ? schema.min(creditingPeriodStartDate, 'Crediting Period End Date must be after the start date') : schema
+          creditingPeriodStartDate
+            ? schema.min(creditingPeriodStartDate, 'Crediting Period End Date must be after the start date')
+            : schema,
         ),
       unitQuantity: yup
         .number()
@@ -41,103 +49,116 @@ export interface LabelsFormRef {
   submitForm: () => Promise<any>;
 }
 
-const LabelsForm = forwardRef<LabelsFormRef, LabelsFormProps>(
-  ({ readonly = false, data, picklistOptions }, ref) => {
-    const formikRef = useRef<FormikProps<any>>(null);
+const LabelsForm = forwardRef<LabelsFormRef, LabelsFormProps>(({ readonly = false, data, picklistOptions }, ref) => {
+  const formikRef = useRef<FormikProps<any>>(null);
 
-    useImperativeHandle(ref, () => ({
-      submitForm: async () => deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'labels'), ['orgUid', 'warehouseProjectId', 'warehouseUnitId', 'timeStaged']),
-    }));
+  useImperativeHandle(ref, () => ({
+    submitForm: async () =>
+      deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'labels'), [
+        'orgUid',
+        'warehouseProjectId',
+        'warehouseUnitId',
+        'timeStaged',
+      ]),
+  }));
 
-    return (
-      <Formik
-        innerRef={formikRef}
-        initialValues={{ labels: data || [] }}
-        validationSchema={validationSchema}
-        onSubmit={(values) => console.log(values)}
-      >
-        {() => (
-          <Form>
-            <Repeater<Label>
-              name="labels"
-              maxNumber={100}
-              minNumber={0}
-              readonly={readonly}
-              initialValue={data || []}
-              itemTemplate={{
-                label: null,
-                labelType: null,
-                labelLink: null,
-                validityPeriodStartDate: null,
-                validityPeriodEndDate: null,
-                creditingPeriodStartDate: null,
-                creditingPeriodEndDate: null,
-                unitQuantity: null
-              }}
-            >
-              {(label: Label, index: number, name: string) => (
-                <>
-                  <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
-                    <Field name={`${name}[${index}].label`} label="Label" type="text" readonly={readonly} initialValue={label.label} />
-                    <Field
-                      name={`${name}[${index}].labelType`}
-                      label="Label Type"
-                      type="picklist"
-                      options={picklistOptions?.labelType}
-                      readonly={readonly}
-                      initialValue={label.labelType}
-                    />
-                    <Field
-                      name={`${name}[${index}].labelLink`}
-                      label="Label Link"
-                      type="link"
-                      readonly={readonly}
-                      initialValue={label.labelLink}
-                    />
-                    <Field
-                      name={`${name}[${index}].validityPeriodStartDate`}
-                      label="Validity Period Start Date"
-                      type="date"
-                      readonly={readonly}
-                      initialValue={label.validityPeriodStartDate}
-                    />
-                    <Field
-                      name={`${name}[${index}].validityPeriodEndDate`}
-                      label="Validity Period End Date"
-                      type="date"
-                      readonly={readonly}
-                      initialValue={label.validityPeriodEndDate}
-                    />
-                    <Field
-                      name={`${name}[${index}].creditingPeriodStartDate`}
-                      label="Crediting Period End Date"
-                      type="date"
-                      readonly={readonly}
-                      initialValue={label.creditingPeriodStartDate}
-                    />
-                    <Field
-                      name={`${name}[${index}].creditingPeriodEndDate`}
-                      label="Crediting Period End Date"
-                      type="date"
-                      readonly={readonly}
-                      initialValue={label.creditingPeriodEndDate}
-                    />
-                    <Field
-                      name={`${name}[${index}].unitQuantity`}
-                      label="Unit Quantity"
-                      type="number"
-                      readonly={readonly}
-                      initialValue={label.unitQuantity}
-                    />
-                  </div>
-                </>
-              )}
-            </Repeater>
-          </Form>
-        )}
-      </Formik>
-    );
-  },
-);
+  return (
+    <Formik
+      innerRef={formikRef}
+      initialValues={{ labels: data || [] }}
+      validationSchema={validationSchema}
+      onSubmit={(values) => console.log(values)}
+    >
+      {() => (
+        <Form>
+          <Repeater<Label>
+            name="labels"
+            maxNumber={100}
+            minNumber={0}
+            readonly={readonly}
+            initialValue={data || []}
+            itemTemplate={{
+              label: null,
+              labelType: null,
+              labelLink: null,
+              validityPeriodStartDate: null,
+              validityPeriodEndDate: null,
+              creditingPeriodStartDate: null,
+              creditingPeriodEndDate: null,
+              unitQuantity: null,
+            }}
+          >
+            {(label: Label, index: number, name: string) => (
+              <>
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
+                  <Field
+                    name={`${name}[${index}].label`}
+                    label="Label"
+                    type="text"
+                    readonly={readonly}
+                    required={true}
+                    initialValue={label.label}
+                  />
+                  <Field
+                    name={`${name}[${index}].labelType`}
+                    label="Label Type"
+                    type="picklist"
+                    options={picklistOptions?.labelType}
+                    readonly={readonly}
+                    required={true}
+                    initialValue={label.labelType}
+                  />
+                  <Field
+                    name={`${name}[${index}].labelLink`}
+                    label="Label Link"
+                    type="link"
+                    readonly={readonly}
+                    initialValue={label.labelLink}
+                  />
+                  <Field
+                    name={`${name}[${index}].validityPeriodStartDate`}
+                    label="Validity Period Start Date"
+                    type="date"
+                    readonly={readonly}
+                    initialValue={label.validityPeriodStartDate}
+                  />
+                  <Field
+                    name={`${name}[${index}].validityPeriodEndDate`}
+                    label="Validity Period End Date"
+                    type="date"
+                    readonly={readonly}
+                    initialValue={label.validityPeriodEndDate}
+                  />
+                  <Field
+                    name={`${name}[${index}].creditingPeriodStartDate`}
+                    label="Crediting Period End Date"
+                    type="date"
+                    readonly={readonly}
+                    initialValue={label.creditingPeriodStartDate}
+                  />
+                  <Field
+                    name={`${name}[${index}].creditingPeriodEndDate`}
+                    label="Crediting Period End Date"
+                    type="date"
+                    readonly={readonly}
+                    initialValue={label.creditingPeriodEndDate}
+                  />
+                  <Field
+                    name={`${name}[${index}].unitQuantity`}
+                    label="Unit Quantity"
+                    type="number"
+                    readonly={readonly}
+                    required={true}
+                    initialValue={label.unitQuantity}
+                  />
+                </div>
+              </>
+            )}
+          </Repeater>
+        </Form>
+      )}
+    </Formik>
+  );
+});
 
 export { LabelsForm };
diff --git a/src/renderer/components/blocks/forms/ProjectForm.tsx b/src/renderer/components/blocks/forms/ProjectForm.tsx
index 930e2e84..b253c49b 100644
--- a/src/renderer/components/blocks/forms/ProjectForm.tsx
+++ b/src/renderer/components/blocks/forms/ProjectForm.tsx
@@ -83,9 +83,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
           const formik = formikRef.current;
           if (formik) {
             const errors = await formik.validateForm(formik.values);
-            formik.setTouched(
-              Object.keys(errors).reduce((acc, key) => ({ ...acc, [key]: true }), {})
-            );
+            formik.setTouched(Object.keys(errors).reduce((acc, key) => ({ ...acc, [key]: true }), {}));
 
             return [errors, formik.values];
           }
@@ -110,6 +108,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     label="Project Name"
                     type="text"
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.projectName || ''}
                   />
                   <Field
@@ -117,6 +116,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     label="External Project Id"
                     type="text"
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.projectId || ''}
                   />
                   <Field
@@ -124,6 +124,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     label="Project Developer"
                     type="text"
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.projectDeveloper || ''}
                   />
                   <Field
@@ -140,6 +141,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     label="Project Link"
                     type="link"
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.projectLink || ''}
                   />
                 </div>
@@ -151,6 +153,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     freeform={true}
                     options={picklistOptions?.projectSector}
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.sector || ''}
                   />
                   <Field
@@ -160,6 +163,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     type="picklist"
                     options={picklistOptions?.projectType}
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.projectType || ''}
                   />
                   <Field
@@ -168,6 +172,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     type="picklist"
                     options={picklistOptions?.projectStatusValues}
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.projectStatus || ''}
                   />
                   <Field
@@ -175,6 +180,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     label="Project Status Date"
                     type="date"
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.projectStatusDate || ''}
                   />
                 </div>
@@ -187,6 +193,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     type="picklist"
                     options={picklistOptions?.coveredByNDC}
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.coveredByNDC || ''}
                   />
                   <Field
@@ -194,6 +201,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     label="NDC Information"
                     type="text"
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.ndcInformation || ''}
                   />
                   <Field
@@ -203,6 +211,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     freeform={true}
                     options={picklistOptions?.registries}
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.currentRegistry || ''}
                   />
                   <Field
@@ -212,6 +221,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     freeform={true}
                     options={picklistOptions?.registries}
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.registryOfOrigin || ''}
                   />
                   <Field
@@ -219,6 +229,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     label="Origin Project ID"
                     type="text"
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.originProjectId || ''}
                   />
                 </div>
@@ -231,6 +242,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     type="picklist"
                     options={picklistOptions?.unitMetric}
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.unitMetric || ''}
                   />
                   <Field
@@ -240,6 +252,7 @@ const ProjectForm: React.FC<ProjectFormProps> = forwardRef<ProjectFormRef, Proje
                     freeform={true}
                     options={picklistOptions?.methodology}
                     readonly={readonly}
+                    required={true}
                     initialValue={data?.methodology || ''}
                   />
                   <Field
diff --git a/src/renderer/components/blocks/forms/ProjectLocationsForm.tsx b/src/renderer/components/blocks/forms/ProjectLocationsForm.tsx
index 1fc5aacc..c2213ddf 100644
--- a/src/renderer/components/blocks/forms/ProjectLocationsForm.tsx
+++ b/src/renderer/components/blocks/forms/ProjectLocationsForm.tsx
@@ -1,10 +1,10 @@
-import { useRef, forwardRef, useImperativeHandle } from 'react';
+import { forwardRef, useImperativeHandle, useRef } from 'react';
 import { Form, Formik, FormikProps } from 'formik';
 import { Field, Repeater } from '@/components';
 import * as yup from 'yup';
 import { ProjectLocation } from '@/schemas/ProjectLocation.schema';
 import { PickList } from '@/schemas/PickList.schema';
-import { validateAndSubmitFieldArrayForm, deepOmit } from '@/utils/formik-utils';
+import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
 
 const validationSchema = yup.object({
   locations: yup.array().of(
@@ -32,7 +32,12 @@ const ProjectLocationsForm = forwardRef<ProjectLocationsFormRef, ProjectLocation
     const formikRef = useRef<FormikProps<any>>(null);
 
     useImperativeHandle(ref, () => ({
-      submitForm: async () => deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'projectLocations'), ['orgUid', 'warehouseProjectId', 'timeStaged']),
+      submitForm: async () =>
+        deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'projectLocations'), [
+          'orgUid',
+          'warehouseProjectId',
+          'timeStaged',
+        ]),
     }));
 
     return (
@@ -54,7 +59,7 @@ const ProjectLocationsForm = forwardRef<ProjectLocationsFormRef, ProjectLocation
                 country: '',
                 geographicIdentifier: '',
                 inCountryRegion: '',
-                fileId: ''
+                fileId: '',
               }}
             >
               {(location, index, name) => (
@@ -65,6 +70,7 @@ const ProjectLocationsForm = forwardRef<ProjectLocationsFormRef, ProjectLocation
                     type="picklist"
                     options={picklistOptions?.countries}
                     readonly={readonly}
+                    required={true}
                     initialValue={location.country}
                   />
                   <Field
@@ -72,6 +78,7 @@ const ProjectLocationsForm = forwardRef<ProjectLocationsFormRef, ProjectLocation
                     label="In-Country Region"
                     type="text"
                     readonly={readonly}
+                    required={true}
                     initialValue={location.inCountryRegion}
                   />
                   <Field
@@ -79,6 +86,7 @@ const ProjectLocationsForm = forwardRef<ProjectLocationsFormRef, ProjectLocation
                     label="Geographic Identifier"
                     type="text"
                     readonly={readonly}
+                    required={true}
                     initialValue={location.geographicIdentifier}
                   />
                   <Field
@@ -86,6 +94,7 @@ const ProjectLocationsForm = forwardRef<ProjectLocationsFormRef, ProjectLocation
                     label="File ID"
                     type="text"
                     readonly={readonly}
+                    required={true}
                     initialValue={location.fileId}
                   />
                 </div>
@@ -95,7 +104,7 @@ const ProjectLocationsForm = forwardRef<ProjectLocationsFormRef, ProjectLocation
         )}
       </Formik>
     );
-  }
+  },
 );
 
 export { ProjectLocationsForm };
diff --git a/src/renderer/components/blocks/forms/RatingsForm.tsx b/src/renderer/components/blocks/forms/RatingsForm.tsx
index 7367c06f..433e66ff 100644
--- a/src/renderer/components/blocks/forms/RatingsForm.tsx
+++ b/src/renderer/components/blocks/forms/RatingsForm.tsx
@@ -1,10 +1,10 @@
-import { forwardRef, useRef, useImperativeHandle } from 'react';
+import { forwardRef, useImperativeHandle, useRef } from 'react';
 import { Form, Formik, FormikProps } from 'formik';
 import { Field, Repeater } from '@/components';
 import * as yup from 'yup';
 import { Rating } from '@/schemas/Rating.schema';
 import { PickList } from '@/schemas/PickList.schema';
-import { validateAndSubmitFieldArrayForm, deepOmit } from '@/utils/formik-utils';
+import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
 
 const validationSchema = yup.object({
   ratings: yup.array().of(
@@ -28,12 +28,16 @@ export interface RatingsFormRef {
   submitForm: () => Promise<any>;
 }
 
-const RatingsForm = forwardRef<RatingsFormRef, RatingsFormProps>(
-  ({ readonly = false, data, picklistOptions }, ref) => {
-    const formikRef = useRef<FormikProps<any>>(null);
+const RatingsForm = forwardRef<RatingsFormRef, RatingsFormProps>(({ readonly = false, data, picklistOptions }, ref) => {
+  const formikRef = useRef<FormikProps<any>>(null);
 
   useImperativeHandle(ref, () => ({
-    submitForm: async () => deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'projectRatings'), ['orgUid', 'warehouseProjectId', 'timeStaged']),
+    submitForm: async () =>
+      deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'projectRatings'), [
+        'orgUid',
+        'warehouseProjectId',
+        'timeStaged',
+      ]),
   }));
 
   return (
@@ -68,6 +72,7 @@ const RatingsForm = forwardRef<RatingsFormRef, RatingsFormProps>(
                     type="picklist"
                     options={picklistOptions?.ratingType}
                     readonly={readonly}
+                    required={true}
                     initialValue={rating.ratingType}
                   />
                   <Field
@@ -75,6 +80,7 @@ const RatingsForm = forwardRef<RatingsFormRef, RatingsFormProps>(
                     label="Rating Lowest"
                     type="text"
                     readonly={readonly}
+                    required={true}
                     initialValue={rating.ratingRangeLowest}
                   />
                   <Field
@@ -82,6 +88,7 @@ const RatingsForm = forwardRef<RatingsFormRef, RatingsFormProps>(
                     label="Rating Highest"
                     type="text"
                     readonly={readonly}
+                    required={true}
                     initialValue={rating.ratingRangeHighest}
                   />
                   <Field
@@ -89,6 +96,7 @@ const RatingsForm = forwardRef<RatingsFormRef, RatingsFormProps>(
                     label="Rating"
                     type="text"
                     readonly={readonly}
+                    required={true}
                     initialValue={rating.rating}
                   />
                   <Field
diff --git a/src/renderer/components/blocks/forms/RelatedProjectsForm.tsx b/src/renderer/components/blocks/forms/RelatedProjectsForm.tsx
index f718c6e1..604487c6 100644
--- a/src/renderer/components/blocks/forms/RelatedProjectsForm.tsx
+++ b/src/renderer/components/blocks/forms/RelatedProjectsForm.tsx
@@ -1,9 +1,9 @@
 import { forwardRef, useImperativeHandle, useRef } from 'react';
 import { Form, Formik, FormikProps } from 'formik';
-import { Field, Repeater, ComponentCenteredSpinner } from '@/components';
+import { ComponentCenteredSpinner, Field, Repeater } from '@/components';
 import * as yup from 'yup';
 import { RelatedProject } from '@/schemas/RelatedProject.schema';
-import { validateAndSubmitFieldArrayForm, deepOmit } from '@/utils/formik-utils';
+import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
 import { useGetProjectOptionsList, useQueryParamState } from '@/hooks';
 
 const validationSchema = yup.object({
@@ -31,7 +31,12 @@ const RelatedProjectsForm = forwardRef<RelatedProjectsFormRef, RelatedProjectsFo
     const [orgUid] = useQueryParamState('orgUid');
 
     useImperativeHandle(ref, () => ({
-      submitForm: async () => deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'relatedProjects'), ['orgUid', 'warehouseProjectId', 'timeStaged']),
+      submitForm: async () =>
+        deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'relatedProjects'), [
+          'orgUid',
+          'warehouseProjectId',
+          'timeStaged',
+        ]),
     }));
 
     const { projects: projectOptions, isLoading } = useGetProjectOptionsList(orgUid);
@@ -68,6 +73,7 @@ const RelatedProjectsForm = forwardRef<RelatedProjectsFormRef, RelatedProjectsFo
                     label="Relationship Type"
                     type="text"
                     readonly={readonly}
+                    required={true}
                     initialValue={relatedProject.relationshipType}
                   />
                   <Field
@@ -75,6 +81,7 @@ const RelatedProjectsForm = forwardRef<RelatedProjectsFormRef, RelatedProjectsFo
                     label="Registry"
                     type="text"
                     readonly={readonly}
+                    required={true}
                     initialValue={relatedProject.registry}
                   />
                   <Field
@@ -83,6 +90,7 @@ const RelatedProjectsForm = forwardRef<RelatedProjectsFormRef, RelatedProjectsFo
                     type="picklist"
                     options={projectOptions}
                     readonly={readonly}
+                    required={true}
                     initialValue={relatedProject.relatedProjectId}
                   />
                 </div>
diff --git a/src/renderer/components/blocks/forms/SplitUnitForm.tsx b/src/renderer/components/blocks/forms/SplitUnitForm.tsx
index 96190ab5..92770a2b 100644
--- a/src/renderer/components/blocks/forms/SplitUnitForm.tsx
+++ b/src/renderer/components/blocks/forms/SplitUnitForm.tsx
@@ -1,10 +1,10 @@
-import { forwardRef, useRef, useImperativeHandle } from 'react';
+import { forwardRef, useImperativeHandle, useRef } from 'react';
 import { Form, Formik, FormikProps } from 'formik';
 import { Field, Repeater } from '@/components';
 import * as yup from 'yup';
 import { UnitSplit } from '@/schemas/Unit.schema';
 import { PickList } from '@/schemas/PickList.schema';
-import { validateAndSubmitFieldArrayForm, deepOmit } from '@/utils/formik-utils';
+import { deepOmit, validateAndSubmitFieldArrayForm } from '@/utils/formik-utils';
 
 const validationSchema = yup.object({
   units: yup.array().of(
@@ -27,89 +27,92 @@ export interface SplitUnitFormRef {
   submitForm: () => Promise<any>;
 }
 
-const SplitUnitForm = forwardRef<SplitUnitFormRef, SplitUnitFormProps>(
-  ({ picklistOptions }, ref) => {
-    const formikRef = useRef<FormikProps<any>>(null);
+const SplitUnitForm = forwardRef<SplitUnitFormRef, SplitUnitFormProps>(({ picklistOptions }, ref) => {
+  const formikRef = useRef<FormikProps<any>>(null);
 
-    useImperativeHandle(ref, () => ({
-      submitForm: async () =>
-        deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'units'), [
-          'orgUid',
-          'warehouseProjectId',
-          'timeStaged',
-        ]),
-    }));
+  useImperativeHandle(ref, () => ({
+    submitForm: async () =>
+      deepOmit(await validateAndSubmitFieldArrayForm(formikRef, 'units'), [
+        'orgUid',
+        'warehouseProjectId',
+        'timeStaged',
+      ]),
+  }));
 
-    return (
-      <Formik
-        innerRef={formikRef}
-        initialValues={{ units: [] }}
-        validationSchema={validationSchema}
-        onSubmit={(values) => console.log(values)}
-      >
-        {() => (
-          <Form>
-            <Repeater<UnitSplit>
-              name="units"
-              maxNumber={5}
-              minNumber={3}
-              readonly={false}
-              initialValue={[
-                {
-                  unitCount: 0,
-                  unitOwner: null,
-                  unitBlockStart: null,
-                  unitBlockEnd: null,
-                  countryJurisdictionOfOwner: null,
-                  inCountryJurisdictionOfOwner: null,
-                },
-                {
-                  unitCount: 0,
-                  unitOwner: null,
-                  unitBlockStart: null,
-                  unitBlockEnd: null,
-                  countryJurisdictionOfOwner: null,
-                  inCountryJurisdictionOfOwner: null,
-                },
-              ]}
-              itemTemplate={{
+  return (
+    <Formik
+      innerRef={formikRef}
+      initialValues={{ units: [] }}
+      validationSchema={validationSchema}
+      onSubmit={(values) => console.log(values)}
+    >
+      {() => (
+        <Form>
+          <Repeater<UnitSplit>
+            name="units"
+            maxNumber={5}
+            minNumber={3}
+            readonly={false}
+            initialValue={[
+              {
                 unitCount: 0,
                 unitOwner: null,
                 unitBlockStart: null,
                 unitBlockEnd: null,
                 countryJurisdictionOfOwner: null,
                 inCountryJurisdictionOfOwner: null,
-              }}
-            >
-              {(_, index, name) => (
-                <>
-                  <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
-                    <span>Record {index}</span>
-                    <Field name={`${name}[${index}].unitCount`} label="# of Units" type="number" />
-                    <Field name={`${name}[${index}].unitOwner`} label="Unit Owner" type="text" />
-                    <Field name={`${name}[${index}].unitBlockStart`} label="Unit Block Start" type="text" />
-                    <Field name={`${name}[${index}].unitBlockEnd`} label="Unit Block End" type="text" />
-                    <Field
-                      name={`${name}[${index}].countryJurisdictionOfOwner`}
-                      label="Country Jurisdiction Of Owner"
-                      type="picklist"
-                      options={picklistOptions?.countries}
-                    />
-                    <Field
-                      name={`${name}[${index}].inCountryJurisdictionOfOwner`}
-                      label="In-Country Jurisdiction Of Owner"
-                      type="picklist"
-                      options={picklistOptions?.countries}
-                    />
-                  </div>
-                </>
-              )}
-            </Repeater>
-          </Form>
-        )}
-      </Formik>
-    );
-  },
-);
+              },
+              {
+                unitCount: 0,
+                unitOwner: null,
+                unitBlockStart: null,
+                unitBlockEnd: null,
+                countryJurisdictionOfOwner: null,
+                inCountryJurisdictionOfOwner: null,
+              },
+            ]}
+            itemTemplate={{
+              unitCount: 0,
+              unitOwner: null,
+              unitBlockStart: null,
+              unitBlockEnd: null,
+              countryJurisdictionOfOwner: null,
+              inCountryJurisdictionOfOwner: null,
+            }}
+          >
+            {(_, index, name) => (
+              <>
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-x-4">
+                  <span>Record {index}</span>
+                  <Field name={`${name}[${index}].unitCount`} required={true} label="# of Units" type="number" />
+                  <Field name={`${name}[${index}].unitOwner`} required={true} label="Unit Owner" type="text" />
+                  <Field
+                    name={`${name}[${index}].unitBlockStart`}
+                    required={true}
+                    label="Unit Block Start"
+                    type="text"
+                  />
+                  <Field name={`${name}[${index}].unitBlockEnd`} required={true} label="Unit Block End" type="text" />
+                  <Field
+                    name={`${name}[${index}].countryJurisdictionOfOwner`}
+                    label="Country Jurisdiction Of Owner"
+                    type="picklist"
+                    options={picklistOptions?.countries}
+                  />
+                  <Field
+                    name={`${name}[${index}].inCountryJurisdictionOfOwner`}
+                    label="In-Country Jurisdiction Of Owner"
+                    type="picklist"
+                    options={picklistOptions?.countries}
+                  />
+                </div>
+              </>
+            )}
+          </Repeater>
+        </Form>
+      )}
+    </Formik>
+  );
+});
 
 export { SplitUnitForm };
diff --git a/src/renderer/components/blocks/forms/UnitForm.tsx b/src/renderer/components/blocks/forms/UnitForm.tsx
index 46164bc8..a5b45917 100644
--- a/src/renderer/components/blocks/forms/UnitForm.tsx
+++ b/src/renderer/components/blocks/forms/UnitForm.tsx
@@ -147,6 +147,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
                   label="Unit Owner"
                   type="text"
                   readonly={readonly}
+                  required={true}
                   initialValue={unit?.unitOwner}
                 />
                 <Field
@@ -154,6 +155,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
                   label="Unit Block Start"
                   type="text"
                   readonly={readonly}
+                  required={true}
                   initialValue={unit?.unitBlockStart}
                 />
 
@@ -162,6 +164,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
                   label="Unit Block End"
                   type="text"
                   readonly={readonly}
+                  required={true}
                   initialValue={unit?.unitBlockEnd}
                 />
 
@@ -170,6 +173,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
                   label="Unit Count"
                   type="number"
                   readonly={readonly}
+                  required={true}
                   initialValue={unit?.unitCount}
                 />
 
@@ -179,6 +183,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
                   type="picklist"
                   options={picklistOptions?.countries}
                   readonly={readonly}
+                  required={true}
                   initialValue={unit?.countryJurisdictionOfOwner}
                 />
 
@@ -188,6 +193,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
                   type="picklist"
                   options={picklistOptions?.countries}
                   readonly={readonly}
+                  required={true}
                   initialValue={unit?.inCountryJurisdictionOfOwner}
                 />
 
@@ -197,6 +203,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
                   type="picklist"
                   options={picklistOptions?.unitType}
                   readonly={readonly}
+                  required={true}
                   initialValue={unit?.unitType}
                 />
 
@@ -206,6 +213,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
                   type="picklist"
                   options={picklistOptions?.unitStatus}
                   readonly={readonly}
+                  required={true}
                   initialValue={unit?.unitStatus}
                 />
 
@@ -214,6 +222,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
                   label="Unit Status Reason"
                   type="text"
                   readonly={readonly}
+                  required={true}
                   initialValue={unit?.unitStatusReason}
                 />
 
@@ -222,6 +231,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
                   label="Vintage Year"
                   type="number"
                   readonly={readonly}
+                  required={true}
                   initialValue={unit?.vintageYear}
                 />
               </div>
@@ -267,6 +277,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
                   type="picklist"
                   options={picklistOptions?.correspondingAdjustmentStatus}
                   readonly={readonly}
+                  required={true}
                   initialValue={unit?.correspondingAdjustmentStatus}
                 />
 
@@ -276,6 +287,7 @@ const UnitForm = forwardRef<UnitFormRef, UnitFormProps>(({ readonly = false, dat
                   type="picklist"
                   options={picklistOptions?.correspondingAdjustmentDeclaration}
                   readonly={readonly}
+                  required={true}
                   initialValue={unit?.correspondingAdjustmentDeclaration}
                 />
               </div>
diff --git a/src/renderer/components/form/Field.tsx b/src/renderer/components/form/Field.tsx
index 7fc8b085..674d53cb 100644
--- a/src/renderer/components/form/Field.tsx
+++ b/src/renderer/components/form/Field.tsx
@@ -13,6 +13,7 @@ interface FieldProps {
   options?: SelectOption[];
   freeform?: boolean;
   readonly?: boolean;
+  required?: boolean;
   initialValue?: any;
   disabled?: boolean;
 }
@@ -45,6 +46,7 @@ const Field: React.FC<FieldProps> = ({
   type,
   options,
   readonly,
+  required,
   initialValue,
   disabled = false,
   freeform = false,
@@ -147,7 +149,12 @@ const Field: React.FC<FieldProps> = ({
 
   return (
     <div className="mb-4">
-      {label && <Label htmlFor={name}>{label}</Label>}
+      {label && (
+        <div className="flex">
+          {!readonly && required && <p className="text-red-600 mr-1">*</p>}
+          <Label htmlFor={name}>{label}</Label>
+        </div>
+      )}
       {renderField()}
       {touched[name] && <p className="text-red-500 text-s italic">{get(errors, name)}</p>}
     </div>