diff --git a/api/src/main/resources/messages.properties b/api/src/main/resources/messages.properties
index f2d5910..9b101cd 100644
--- a/api/src/main/resources/messages.properties
+++ b/api/src/main/resources/messages.properties
@@ -78,7 +78,6 @@ mentalhealth.form.initial.patient.dob = Date of Birth
 mentalhealth.form.initial.patient.neighbourhood = Neighborhood
 mentalhealth.form.initial.patient.landmark = Nearby Landmark (Close to)
 mentalhealth.form.initial.patient.telephone = Telephone
-mentalhealth.form.initial.patient.telephone.format = [format = NN(N)-NNN-NNN-NNNN]
 mentalhealth.form.initial.patient.obs.homeless = Homeless
 mentalhealth.form.initial.patient.obs.not.provided = Not Provided
 mentalhealth.form.initial.patient.obs.yes = Yes
@@ -96,6 +95,7 @@ mentalhealth.form.initial.patient.obs.agree.with.community = Do you agree with C
 mentalhealth.form.initial.patient.obs.treatment.supporter = Accompanying person and telephone
 mentalhealth.form.initial.patient.obs.treatment.supporter.name = Name
 mentalhealth.form.initial.patient.obs.treatment.supporter.telephone = Telephone
+mentalhealth.form.initial.patient.obs.treatment.supporter.telephone.format = [format = NN(N)-NNN-NNN-NNNN]
 mentalhealth.form.initial.patient.obs.treatment.supporter.relationship = Relationship to Patient
 mentalhealth.form.initial.patient.obs.main.complaint = Main Complaint
 mentalhealth.form.initial.patient.obs.reason.consultation = Reason for Consultation
diff --git a/api/src/main/resources/messages_pt.properties b/api/src/main/resources/messages_pt.properties
index da2e0bc..f4b8e60 100644
--- a/api/src/main/resources/messages_pt.properties
+++ b/api/src/main/resources/messages_pt.properties
@@ -77,7 +77,6 @@ mentalhealth.form.initial.patient.dob = DN (DD/MM/AA)
 mentalhealth.form.initial.patient.neighbourhood = Bairro
 mentalhealth.form.initial.patient.landmark = Perto de
 mentalhealth.form.initial.patient.telephone = Telefone paciente
-mentalhealth.form.initial.patient.telephone.format = [formato = NN(N)-NNN-NNN-NNNN]
 mentalhealth.form.initial.patient.obs.homeless = Sem Casa
 mentalhealth.form.initial.patient.obs.not.provided = Não Fornecido
 mentalhealth.form.initial.patient.obs.yes = Sim
@@ -95,6 +94,7 @@ mentalhealth.form.initial.patient.obs.agree.with.community = Concorda com o Segu
 mentalhealth.form.initial.patient.obs.treatment.supporter = Informação de Acompanhante
 mentalhealth.form.initial.patient.obs.treatment.supporter.name = Nome
 mentalhealth.form.initial.patient.obs.treatment.supporter.telephone = Telefone
+mentalhealth.form.initial.patient.obs.treatment.supporter.telephone.format = [formato = NN(N)-NNN-NNN-NNNN]
 mentalhealth.form.initial.patient.obs.treatment.supporter.relationship = Relação
 mentalhealth.form.initial.patient.obs.main.complaint = Queixa Principal
 mentalhealth.form.initial.patient.obs.reason.consultation = Motivo da Consulta
diff --git a/omod/src/main/webapp/resources/htmlforms/follow_up.xml b/omod/src/main/webapp/resources/htmlforms/follow_up.xml
index 0436c25..0b8b3c9 100644
--- a/omod/src/main/webapp/resources/htmlforms/follow_up.xml
+++ b/omod/src/main/webapp/resources/htmlforms/follow_up.xml
@@ -207,6 +207,7 @@
                 <div>
                 	<label for="symptom-assessment-gravity" class="">mentalhealth.form.followup.symptom.assessment.gravity</label>
                    	<select data-concept-id="a3707116-50ff-4c89-bb6b-cd717bf47e03" name="symptom-assessment-gravity" id="symptom-assessment-gravity">
+                   		<option value="np">mentalhealth.form.initial.patient.obs.not.provided</option>
                        	<option data-concept-id="9de4cbbd-27d2-4bf9-88e5-756eccc90b39" value="light">mentalhealth.form.followup.symptom.assessment.gravity.light</option>
                        	<option data-concept-id="e1dac86c-1d5f-11e0-b929-000c29ad1d07" value="moderate">mentalhealth.form.followup.symptom.assessment.gravity.moderate</option>
                        	<option data-concept-id="dccdf8ba-401a-4538-91d8-a4c8ae8f20cb" value="serious">mentalhealth.form.followup.symptom.assessment.gravity.serious</option>
@@ -350,7 +351,7 @@
                 </fieldset>
                 <label for="number-of-days" class="">mentalhealth.form.followup.medication.period</label>
                 <input data-concept-id="591b988b-8f9c-4b99-84d0-d655bd9c1fd5" type="number" name="number-of-days" id="number-of-days" min="1" max="1000"/>
-                <fieldset data-concept-id="bedf475c-459c-40fe-ad72-56f42733739c" id="same-drug-delivered" onChange="setDependentDisabledState(this, 'fieldset[id=same-drug-delivered] input[id=same-drug-delivered-no]', 'fieldset[id=same-drug-delivered] input[id=same-drug-not-delivered]');">
+                <fieldset data-concept-id="bedf475c-459c-40fe-ad72-56f42733739c" id="same-drug-delivered" onChange="setDependentDisabledState(this, 'fieldset[id=same-drug-delivered] input[id=same-drug-delivered-no]', 'fieldset[id=same-drug-delivered] select[id=same-drug-not-delivered]');">
                     <label>mentalhealth.form.followup.medication.same.drug</label>
                     <label for="same-drug-delivered-yes">mentalhealth.form.initial.patient.obs.yes</label>
                     <input data-concept-id="e1d81b62-1d5f-11e0-b929-000c29ad1d07" type="radio" name="same-drug-delivered" id="same-drug-delivered-yes" value="y"/>
@@ -358,6 +359,7 @@
                     <input data-concept-id="e1d81c70-1d5f-11e0-b929-000c29ad1d07" type="radio" name="same-drug-delivered" id="same-drug-delivered-no" value="n"/>
                     <label for="same-drug-not-delivered" class="">mentalhealth.form.followup.medication.if.not.same.reason</label>
                    	<select data-concept-id="b811467d-17e0-4b0b-bbe7-c2413c59a916" name="same-drug-not-delivered" id="same-drug-not-delivered" disabled="true">
+                   		<option value="np">mentalhealth.form.initial.patient.obs.not.provided</option>
                    	   	<option data-concept-id="2e52c1c4-990b-4dbb-a095-8b5fff967e1d" value="not-in-pharmacy">mentalhealth.form.followup.medication.if.not.same.reason.out.of.stock</option>
                        	<option data-concept-id="0f3bec12-550c-477d-96f4-b0e81f9b20de" value="not-in-system">mentalhealth.form.followup.medication.if.not.same.reason.not.in.system</option>
                     </select>
@@ -397,6 +399,7 @@
                 <div>
                     <label for="side-effects-sep" class="">mentalhealth.form.followup.side.effects.sep</label>
                    	<select data-concept-id="2596f5e1-e9c3-48b0-be19-bc415c3ade9b" name="side-effects-sep" id="side-effects-sep">
+                   		<option value="np">mentalhealth.form.initial.patient.obs.not.provided</option>
                    	   	<option data-concept-id="e1d85294-1d5f-11e0-b929-000c29ad1d07" value="none">mentalhealth.form.followup.symptom.assessment.gravity.none</option>
                        	<option data-concept-id="9de4cbbd-27d2-4bf9-88e5-756eccc90b39" value="light">mentalhealth.form.followup.symptom.assessment.gravity.light</option>
                        	<option data-concept-id="e1dac86c-1d5f-11e0-b929-000c29ad1d07" value="moderate">mentalhealth.form.followup.symptom.assessment.gravity.moderate</option>
@@ -407,6 +410,7 @@
                 <div>
                     <label for="side-effects-orthostatic-hypotension" class="">mentalhealth.form.followup.side.effects.orthostatic.hypertension</label>
                    	<select data-concept-id="e90fa65c-9084-11e6-a98e-000c29db4475" name="side-effects-orthostatic-hypotension" id="side-effects-orthostatic-hypotension">
+                   		<option value="np">mentalhealth.form.initial.patient.obs.not.provided</option>
                    	   	<option data-concept-id="e1d85294-1d5f-11e0-b929-000c29ad1d07" value="none">mentalhealth.form.followup.symptom.assessment.gravity.none</option>
                        	<option data-concept-id="9de4cbbd-27d2-4bf9-88e5-756eccc90b39" value="light">mentalhealth.form.followup.symptom.assessment.gravity.light</option>
                        	<option data-concept-id="e1dac86c-1d5f-11e0-b929-000c29ad1d07" value="moderate">mentalhealth.form.followup.symptom.assessment.gravity.moderate</option>
@@ -417,6 +421,7 @@
                 <div>
                     <label for="side-effects-metabolic-syndrome" class="">mentalhealth.form.followup.side.effects.metabolic.syndrome</label>
                    	<select data-concept-id="3694c0fb-de71-4ab9-9a7a-31d43e3f9453" name="side-effects-metabolic-syndrome" id="side-effects-metabolic-syndrome">
+                   		<option value="np">mentalhealth.form.initial.patient.obs.not.provided</option>
                    	   	<option data-concept-id="e1d85294-1d5f-11e0-b929-000c29ad1d07" value="none">mentalhealth.form.followup.symptom.assessment.gravity.none</option>
                        	<option data-concept-id="9de4cbbd-27d2-4bf9-88e5-756eccc90b39" value="light">mentalhealth.form.followup.symptom.assessment.gravity.light</option>
                        	<option data-concept-id="e1dac86c-1d5f-11e0-b929-000c29ad1d07" value="moderate">mentalhealth.form.followup.symptom.assessment.gravity.moderate</option>
@@ -427,6 +432,7 @@
                 <div>
                     <label for="side-effects-gingival-hypertrophy" class="">mentalhealth.form.followup.side.effects.gingival.hypertrophy</label>
                    	<select data-concept-id="18258483-1a35-4422-bc0b-a8ce928ae984" name="side-effects-gingival-hypertrophy" id="side-effects-gingival-hypertrophy">
+                   		<option value="np">mentalhealth.form.initial.patient.obs.not.provided</option>
                    	   	<option data-concept-id="e1d85294-1d5f-11e0-b929-000c29ad1d07" value="none">mentalhealth.form.followup.symptom.assessment.gravity.none</option>
                        	<option data-concept-id="9de4cbbd-27d2-4bf9-88e5-756eccc90b39" value="light">mentalhealth.form.followup.symptom.assessment.gravity.light</option>
                        	<option data-concept-id="e1dac86c-1d5f-11e0-b929-000c29ad1d07" value="moderate">mentalhealth.form.followup.symptom.assessment.gravity.moderate</option>
@@ -437,6 +443,7 @@
                 <div>
                     <label for="side-effects-rash" class="">mentalhealth.form.followup.side.effects.rash</label>
                    	<select data-concept-id="6302c75c-48b7-4146-95b8-966119aaf88c" name="side-effects-rash" id="side-effects-rash">
+                   		<option value="np">mentalhealth.form.initial.patient.obs.not.provided</option>
                    	   	<option data-concept-id="e1d85294-1d5f-11e0-b929-000c29ad1d07" value="none">mentalhealth.form.followup.symptom.assessment.gravity.none</option>
                        	<option data-concept-id="9de4cbbd-27d2-4bf9-88e5-756eccc90b39" value="light">mentalhealth.form.followup.symptom.assessment.gravity.light</option>
                        	<option data-concept-id="e1dac86c-1d5f-11e0-b929-000c29ad1d07" value="moderate">mentalhealth.form.followup.symptom.assessment.gravity.moderate</option>
@@ -447,6 +454,7 @@
                 <div>
                     <label for="side-effects-steven-johnson-syndrome" class="">mentalhealth.form.followup.side.effects.steven.johnson</label>
                    	<select data-concept-id="751000e2-5592-4a44-bf10-5da8e5f1c992" name="side-effects-steven-johnson-syndrome" id="side-effects-steven-johnson-syndrome">
+                   		<option value="np">mentalhealth.form.initial.patient.obs.not.provided</option>
                    	   	<option data-concept-id="e1d85294-1d5f-11e0-b929-000c29ad1d07" value="none">mentalhealth.form.followup.symptom.assessment.gravity.none</option>
                        	<option data-concept-id="9de4cbbd-27d2-4bf9-88e5-756eccc90b39" value="light">mentalhealth.form.followup.symptom.assessment.gravity.light</option>
                        	<option data-concept-id="e1dac86c-1d5f-11e0-b929-000c29ad1d07" value="moderate">mentalhealth.form.followup.symptom.assessment.gravity.moderate</option>
@@ -457,6 +465,7 @@
                 <div>
                     <label for="side-effects-diabetes" class="">mentalhealth.form.followup.side.effects.diabetes</label>
                    	<select data-concept-id="2fe96a54-524e-4144-853b-ef3fd99fd6bf" name="side-effects-diabetes" id="side-effects-diabetes">
+                   		<option value="np">mentalhealth.form.initial.patient.obs.not.provided</option>
                    	   	<option data-concept-id="e1d85294-1d5f-11e0-b929-000c29ad1d07" value="none">mentalhealth.form.followup.symptom.assessment.gravity.none</option>
                        	<option data-concept-id="9de4cbbd-27d2-4bf9-88e5-756eccc90b39" value="light">mentalhealth.form.followup.symptom.assessment.gravity.light</option>
                        	<option data-concept-id="e1dac86c-1d5f-11e0-b929-000c29ad1d07" value="moderate">mentalhealth.form.followup.symptom.assessment.gravity.moderate</option>
diff --git a/omod/src/main/webapp/resources/htmlforms/initial.xml b/omod/src/main/webapp/resources/htmlforms/initial.xml
index be36f7a..531c623 100644
--- a/omod/src/main/webapp/resources/htmlforms/initial.xml
+++ b/omod/src/main/webapp/resources/htmlforms/initial.xml
@@ -281,7 +281,7 @@
                     <label for="companion-name" class="d-block">mentalhealth.form.initial.patient.obs.treatment.supporter.name</label>
                     <input data-concept-id="e1de46a4-1d5f-11e0-b929-000c29ad1d07" type="text" name="companion-name" id="companion-name" autocomplete="off" class=""/>
                     
-                    <label for="companion-telephone-number" class="d-block">mentalhealth.form.initial.patient.obs.treatment.supporter.telephone</label> <label>mentalhealth.form.initial.patient.obs.treatment.supporter.telephone.format</label>
+                    <span class="d-flex flex-fill mt-2"><label for="companion-telephone-number" class="d-block">mentalhealth.form.initial.patient.obs.treatment.supporter.telephone</label> <span style="font-size: small"><label>mentalhealth.form.initial.patient.obs.treatment.supporter.telephone.format</label></span></span>
                     <input data-concept-id="eb23c94a-2c2e-40fa-ab82-22308b1c5f27" type="tel" name="companion-telephone-number" id="companion-telephone-number" pattern="[0-9]{2,3}-[0-9]{3}-[0-9]{3}-[0-9]{4}" autocomplete="off" class=""/>
 
                     <label for="companion-relationship" class="d-block">mentalhealth.form.initial.patient.obs.treatment.supporter.relationship</label>
@@ -558,7 +558,7 @@
                 </table>
             </fieldset>
             <fieldset id="patient-overview" class="form-group tab-pane fade" role="tabpanel">
-                <legend class="ml-5">mentalhealth.form.initial.patient.patient.overview</legend>
+                <label class="ml-5">mentalhealth.form.initial.patient.patient.overview</label>
                 
                     <table id="patient-overview-table" class="ml-5 mr-5">
                         <tr>