diff --git a/.env.dev b/.env.dev
new file mode 100755
index 0000000..59c3b29
--- /dev/null
+++ b/.env.dev
@@ -0,0 +1,2 @@
+VITE_APP_TITLE=UDNI tip2toe frontend
+VITE_APIURL=https://phenopacket-stage.scilifelab.se
\ No newline at end of file
diff --git a/src/components/Index.tsx b/src/components/Index.tsx
index fc13322..44b5875 100755
--- a/src/components/Index.tsx
+++ b/src/components/Index.tsx
@@ -53,14 +53,12 @@ export default function Home() {
           </p>
         </div>
         <div className="flex flex-col md:flex-row md:divide-x divide-udni-teal">
-          <div className="w-full p-8   flex flex-col items-center my-5 group">
-            <div className="flex items-center space-x-2">
-              <DocumentPlusIcon className="w-5 text-udni-teal" />{' '}
+          <div className="w-full p-8 flex flex-col items-end my-5 group">
+            <div className="flex flex-col items-start">
+              <div className="flex items-center space-x-2">
+                <DocumentPlusIcon className="w-5 text-udni-teal" />{' '}
               <h3>Start new form</h3>
             </div>
-            <p className="text-gray-600 text-sm">
-              For physicians, geneticists. Start questionnare.
-            </p>
             <label className="mt-4">
               <input
                 type="checkbox"
@@ -88,18 +86,19 @@ export default function Home() {
               Start new
             </Link>
           </div>
-          <div className="w-full p-8   flex flex-col items-center my-5 ">
-            <div className="flex items-center space-x-2">
-              <DocumentArrowDownIcon className="w-5 text-udni-teal" />
-              <h3>Continue form</h3>
-            </div>
-            <p className="text-gray-600 text-sm">
-              Add images, documents to an existing form.
-            </p>
-            <ContinueForm />
+        </div>
+        <div className="w-full p-8   flex flex-col items-start my-5 ">
+          <div className="flex items-center space-x-2">
+            <DocumentArrowDownIcon className="w-5 text-udni-teal" />
+            <h3>Continue form</h3>
           </div>
+          <p className="text-gray-600 text-sm">
+            Continue editing an existing form.
+          </p>
+          <ContinueForm />
         </div>
       </div>
-    </>
+    </div>
+  </>
   );
 }
diff --git a/src/components/questionnaire/EditIndividual.tsx b/src/components/questionnaire/EditIndividual.tsx
index 75f958e..0e1462c 100644
--- a/src/components/questionnaire/EditIndividual.tsx
+++ b/src/components/questionnaire/EditIndividual.tsx
@@ -1,4 +1,4 @@
-import { useContext } from 'react';
+import { useContext, useEffect } from 'react';
 import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
 import { AppContext } from '../../context/AppContext';
@@ -20,6 +20,12 @@ export interface IIndividualFormData {
 }
 
 export default function EditIndividual() {
+ useEffect(() => {
+    return () => {
+      handleSubmit(doSubmit)();
+    };
+  }, []);
+
   const navigate = useNavigate();
   const { nextUrl } = useNextUrl();
 
@@ -128,16 +134,16 @@ export default function EditIndividual() {
       </div>
       <div className="my-4">
         <Input
-          type="number"
-          label="Age of mother at time of referral"
-          {...register('customFormData.motherAge')}
+            type="date"
+            label="Date of birth mother"
+            {...register('customFormData.motherBirthdate')}
         />
       </div>
       <div className="my-4">
         <Input
-          type="number"
-          label="Age of father at time of referral"
-          {...register('customFormData.fatherAge')}
+            type="date"
+            label="Date of birth father"
+            {...register('customFormData.fatherBirthdate')}
         />
       </div>
       <div className="my-4">
@@ -153,6 +159,7 @@ export default function EditIndividual() {
             'Latino',
             'Middle East',
             'Oceanian',
+            'Mixed'
           ].map((x) => ({ label: x, value: x }))}
         />
         {errors?.customFormData?.ethnicity && (