diff --git a/configuration/ampathforms/Delivery.json b/configuration/ampathforms/Delivery.json
index c6dc984b..4d84684d 100644
--- a/configuration/ampathforms/Delivery.json
+++ b/configuration/ampathforms/Delivery.json
@@ -32,7 +32,7 @@
 							"label": "Provider:",
 							"type": "encounterProvider",
 							"questionOptions": {
-								"rendering": "ui-select-extended"
+								"rendering": "text"
 							},
 							"id": "encProvider "
 						},
@@ -40,7 +40,8 @@
 							"label": "Location:",
 							"type": "encounterLocation",
 							"questionOptions": {
-								"rendering": "ui-select-extended"
+								"rendering": "encounter-location",
+								"locationTag": "8d4626ca-7abd-42ad-be48-56767bbcf272"
 							},
 							"id": "encLocation"
 						}
@@ -58,6 +59,15 @@
 								"concept": "162054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 								"rendering": "number"
 							}
+						},
+						{
+							"label": "Number of ANC Visits:",
+							"type": "obs",
+							"id": "noOfAncVisits",
+							"questionOptions": {
+								"concept": "1590AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "number"
+							}
 						}
 					]
 				},
@@ -65,6 +75,136 @@
 					"label": "Delivery and Baby Observations",
 					"isExpanded": "true",
 					"questions": [
+						{
+							"label": "Date of Last Menstrual Period(LMP)",
+							"type": "obs",
+							"id": "lastLmpDate",
+							"questionOptions": {
+								"concept": "1427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "date"
+							},
+							"validators": [
+								{
+									"type": "date",
+									"allowFutureDates": "true"
+								}
+							]
+						},
+						{
+							"label": "VDRL/RPR Results:",
+							"type": "obs",
+							"id": "vdrlResults",
+							"questionOptions": {
+								"concept": "299AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "radio",
+								"answers": [
+									{
+										"concept": "703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Positive"
+									},
+									{
+										"concept": "664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Negative"
+									},
+									{
+										"concept": "1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Not Done"
+									}
+								]
+							}
+						},
+						{
+							"label": "Estimated date of Delivery",
+							"type": "obs",
+							"id": "lastDeliveryDate",
+							"questionOptions": {
+								"concept": "5596AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "date"
+							},
+							"validators": [
+								{
+									"type": "date",
+									"allowFutureDates": "true"
+								}
+							]
+						},
+						{
+							"label": "Placenta complete?",
+							"type": "obs",
+							"id": "placentaComplete",
+							"questionOptions": {
+								"concept": "163454AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "radio",
+								"answers": [
+									{
+										"concept": "703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Yes"
+									},
+									{
+										"concept": "664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "No"
+									},
+									{
+										"concept": "1501AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Baby born before arrival"
+									}
+								]
+							}
+						},
+						{
+							"label": "Vagina Examination?",
+							"type": "obs",
+							"id": "vaginalExamination",
+							"questionOptions": {
+								"concept": "160704AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "radio",
+								"answers": [
+									{
+										"concept": "132681AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Normal"
+									},
+									{
+										"concept": "5577AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Episiotomy"
+									},
+									{
+										"concept": "159264AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Vaginal tear"
+									},
+									{
+										"concept": "118935AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "FGM"
+									},
+									{
+										"concept": "139505AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Vaginal warts"
+									}
+								]
+							}
+						},
+						{
+							"label": "Uterotonic given?",
+							"type": "obs",
+							"id": "uterotonicGiven",
+							"questionOptions": {
+								"concept": "1282AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "radio",
+								"answers": [
+									{
+										"concept": "81369AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Oxytocin"
+									},
+									{
+										"concept": "104590AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Carbetocin"
+									},
+									{
+										"concept": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "None"
+									}
+								]
+							}
+						},
 						{
 							"label": "Gestation at birth (in weeks):",
 							"type": "obs",
@@ -127,49 +267,12 @@
 							"required": "true"
 						},
 						{
-							"label": "Placenta complete?",
-							"type": "obs",
-							"id": "placentaComplete",
-							"questionOptions": {
-								"concept": "163454AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "select",
-								"answers": [
-									{
-										"concept": "163455AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Yes"
-									},
-									{
-										"concept": "163456AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "No"
-									}
-								]
-							}
-						},
-						{
-							"label": "Blood Loss:",
+							"label": "Blood loss during delivery in millilitres (mls):",
 							"type": "obs",
 							"id": "bloodLoss",
 							"questionOptions": {
-								"concept": "162092AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "select",
-								"answers": [
-									{
-										"concept": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "None"
-									},
-									{
-										"concept": "1498AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Mild"
-									},
-									{
-										"concept": "1499AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Moderate"
-									},
-									{
-										"concept": "1500AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Severe"
-									}
-								]
+								"concept": "161928AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "text"
 							}
 						},
 						{
@@ -408,6 +511,25 @@
 								]
 							}
 						},
+						{
+							"label": "Chlorhexidine applied on cord stump:",
+							"type": "obs",
+							"id": "deliveryOutcome",
+							"questionOptions": {
+								"concept": "159369AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "select",
+								"answers": [
+									{
+										"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Yes"
+									},
+									{
+										"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "No"
+									}
+								]
+							}
+						},
 						{
 							"label": "Baby details",
 							"type": "obsGroup",
@@ -485,7 +607,7 @@
 										"rendering": "select",
 										"answers": [
 											{
-												"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"concept": "155871AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 												"label": "Yes"
 											},
 											{
@@ -508,7 +630,7 @@
 										"rendering": "select",
 										"answers": [
 											{
-												"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"concept": "84893AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 												"label": "Yes"
 											},
 											{
@@ -526,20 +648,62 @@
 									}
 								},
 								{
-									"label": "Initiated BF in less than 1 hour:",
+									"label": "Given Vitamin K :",
 									"type": "obs",
-									"id": "babyInitiatedBF",
+									"id": "vitaminK",
 									"questionOptions": {
-										"concept": "161543AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"concept": "984AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 										"rendering": "select",
 										"answers": [
+											{
+												"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Yes"
+											},
 											{
 												"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 												"label": "No"
+											}
+										]
+									}
+								},
+								{
+									"label": "Kangaroo Mother care given:",
+									"type": "obs",
+									"id": "kangarooMotherCare",
+									"questionOptions": {
+										"concept": "161094AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"rendering": "select",
+										"answers": [
+											{
+												"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Yes"
 											},
+											{
+												"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "No"
+											},
+											{
+												"concept": "1175AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "N/A"
+											}
+										]
+									}
+								},
+								{
+									"label": "Initiated BF in less than 1 hour:",
+									"type": "obs",
+									"id": "babyInitiatedBF",
+									"questionOptions": {
+										"concept": "161543AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"rendering": "select",
+										"answers": [
 											{
 												"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 												"label": "Yes"
+											},
+											{
+												"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "No"
 											}
 										]
 									},
@@ -660,10 +824,6 @@
 										"concept": "1040AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 										"rendering": "select",
 										"answers": [
-											{
-												"concept": "163611AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-												"label": "Invalid"
-											},
 											{
 												"concept": "703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 												"label": "Positive"
@@ -671,6 +831,10 @@
 											{
 												"concept": "664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 												"label": "Negative"
+											},
+											{
+												"concept": "163611AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Invalid"
 											}
 										]
 									}
@@ -693,77 +857,58 @@
 											}
 										]
 									}
+								},
+								{
+									"label": "Final Results:",
+									"type": "obs",
+									"id": "hivFinalResult",
+									"questionOptions": {
+										"concept": "159427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"rendering": "select",
+										"answers": [
+											{
+												"concept": "703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Positive"
+											},
+											{
+												"concept": "664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Negative"
+											},
+											{
+												"concept": "1138AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Inconclusive"
+											}
+										]
+									}
+								},
+								{
+									"label": "Results given to client:",
+									"type": "obs",
+									"id": "resultsGiven",
+									"questionOptions": {
+										"concept": "164848AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"rendering": "select",
+										"answers": [
+											{
+												"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Yes"
+											},
+											{
+												"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "No"
+											}
+										]
+									}
 								}
 							],
 							"id": "hivTesting"
 						},
 						{
-							"label": "Final Results:",
-							"type": "obs",
-							"id": "hivFinalResult",
-							"questionOptions": {
-								"concept": "159427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "select",
-								"answers": [
-									{
-										"concept": "1138AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Inconclusive"
-									},
-									{
-										"concept": "703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Positive"
-									},
-									{
-										"concept": "664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Negative"
-									}
-								]
-							}
-						},
-						{
-							"label": "On HAART",
-							"type": "obs",
-							"id": "OnHaART",
-							"questionOptions": {
-								"concept": "163783AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "select",
-								"answers": [
-									{
-										"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Yes"
-									},
-									{
-										"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "No"
-									}
-								]
-							}
-						},
-						{
-							"label": "Current Regimen",
+							"label": "HIV Status:",
 							"type": "obs",
-							"id": "CurreNTRegimen",
+							"id": "hivStatus",
 							"questionOptions": {
-								"concept": "164855AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "select",
-								"answers": [
-									{
-										"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Yes"
-									},
-									{
-										"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "No"
-									}
-								]
-							}
-						},
-						{
-							"label": "Results given to client?",
-							"type": "obs",
-							"id": "resultsGiven",
-							"questionOptions": {
-								"concept": "164848AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"concept": "1396AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 								"rendering": "select",
 								"answers": [
 									{
@@ -851,6 +996,52 @@
 								]
 							}
 						},
+						{
+							"label": "Mother started on HAART at maternity ?",
+							"type": "obs",
+							"id": "startedHaartAnc",
+							"questionOptions": {
+								"concept": "166665AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "radio",
+								"answers": [
+									{
+										"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Yes"
+									},
+									{
+										"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "No"
+									},
+									{
+										"concept": "1175AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "N/A"
+									}
+								]
+							}
+						},
+						{
+							"label": "Was mother on HAART during ANC?",
+							"type": "obs",
+							"id": "wasOnHaartAnc",
+							"questionOptions": {
+								"concept": "163783AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "radio",
+								"answers": [
+									{
+										"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Yes"
+									},
+									{
+										"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "No"
+									},
+									{
+										"concept": "1175AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "N/A"
+									}
+								]
+							}
+						},
 						{
 							"label": "AZT for the baby dispensed?",
 							"type": "obs",
@@ -860,7 +1051,7 @@
 								"rendering": "radio",
 								"answers": [
 									{
-										"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"concept": "160123AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 										"label": "Yes"
 									},
 									{
@@ -883,7 +1074,7 @@
 								"rendering": "radio",
 								"answers": [
 									{
-										"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"concept": "80586AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 										"label": "Yes"
 									},
 									{
@@ -925,6 +1116,15 @@
 									}
 								]
 							}
+						},
+						{
+							"label": "Reasons for referral? ",
+							"type": "obs",
+							"id": "referralReason",
+							"questionOptions": {
+								"concept": "164359AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "text"
+							}
 						}
 					]
 				},