diff --git a/configuration/ampathforms/Delivery.json b/configuration/ampathforms/Delivery.json
index 19645e7a..7633cb77 100644
--- a/configuration/ampathforms/Delivery.json
+++ b/configuration/ampathforms/Delivery.json
@@ -32,7 +32,7 @@
 							"label": "Provider:",
 							"type": "encounterProvider",
 							"questionOptions": {
-								"rendering": "text"
+								"rendering": "ui-select-extended"
 							},
 							"id": "encProvider "
 						},
@@ -40,8 +40,7 @@
 							"label": "Location:",
 							"type": "encounterLocation",
 							"questionOptions": {
-								"rendering": "encounter-location",
-								"locationTag": "8d4626ca-7abd-42ad-be48-56767bbcf272"
+								"rendering": "ui-select-extended"
 							},
 							"id": "encLocation"
 						}
@@ -124,6 +123,7 @@
 							"label": "Estimated date of Delivery",
 							"type": "obs",
 							"id": "lastDeliveryDate",
+							"required":"true",
 							"questionOptions": {
 								"concept": "5596AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 								"rendering": "date"
@@ -139,6 +139,7 @@
 							"label": "Placenta complete?",
 							"type": "obs",
 							"id": "placentaComplete",
+							"required":"true",
 							"questionOptions": {
 								"concept": "163454AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 								"rendering": "radio",
@@ -162,6 +163,7 @@
 							"label": "Vagina Examination?",
 							"type": "obs",
 							"id": "vaginalExamination",
+							"required":"true",
 							"questionOptions": {
 								"concept": "160704AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 								"rendering": "radio",
@@ -193,6 +195,7 @@
 							"label": "Uterotonic given?",
 							"type": "obs",
 							"id": "uterotonicGiven",
+							"required":"true",
 							"questionOptions": {
 								"concept": "1282AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 								"rendering": "radio",
@@ -281,7 +284,7 @@
 							"id": "bloodLoss",
 							"questionOptions": {
 								"concept": "161928AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "text"
+								"rendering": "number"
 							}
 						},
 						{
@@ -524,6 +527,7 @@
 							"label": "Chlorhexidine applied on cord stump:",
 							"type": "obs",
 							"id": "deliveryOutcome",
+							"required":"true",
 							"questionOptions": {
 								"concept": "159369AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 								"rendering": "select",
@@ -661,6 +665,7 @@
 									"label": "Given Vitamin K :",
 									"type": "obs",
 									"id": "vitaminK",
+									"required":"true",
 									"questionOptions": {
 										"concept": "984AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 										"rendering": "select",
@@ -680,6 +685,7 @@
 									"label": "Kangaroo Mother care given:",
 									"type": "obs",
 									"id": "kangarooMotherCare",
+									"required":"true",
 									"questionOptions": {
 										"concept": "161094AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 										"rendering": "select",
@@ -925,12 +931,20 @@
 								"rendering": "select",
 								"answers": [
 									{
-										"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Yes"
+										"concept": "703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Positive"
 									},
 									{
-										"concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "No"
+										"concept": "664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Negative"
+									},
+									{
+										"concept": "1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Unknown"
+									},
+									{
+										"concept": "164817AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Known Positive"
 									}
 								]
 							}
@@ -962,10 +976,7 @@
 								"concept": "1436AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 								"rendering": "select",
 								"answers": [
-									{
-										"concept": "1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Unknown"
-									},
+									
 									{
 										"concept": "703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 										"label": "HIV Positive"
@@ -973,6 +984,10 @@
 									{
 										"concept": "664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 										"label": "HIV Negative"
+									},
+									{
+										"concept": "1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"label": "Unknown"
 									}
 								]
 							},