diff --git a/assets/themes/uk_addresses/uk_addresses.json b/assets/themes/uk_addresses/uk_addresses.json
index 1a7b93ea6c..e034f14c29 100644
--- a/assets/themes/uk_addresses/uk_addresses.json
+++ b/assets/themes/uk_addresses/uk_addresses.json
@@ -256,17 +256,24 @@
         },
         {
           "id": "uk_addresses_unit",
-          "render": "<b>{addr:unit}</b>",
+          "render": "<div class='subtle'>Sub-unit (e.g. 1, Flat 2, Unit C)</div><div><b>{addr:unit}</b></div>",
           "question": {
-            "en": "What is the sub-unit for this address? <div class='subtle'>Some named building or large complexes are split into sub-units (e.g. \"1\", \"Flat 2\", \"Unit C\")</div>"
+            "en": "What is the sub-unit for this address? <div class='subtle'>Some named building or large complexes are split into sub-units</div>"
           },
           "freeform": {
             "key": "addr:unit",
-            "addExtraTags": [
-              "not:addr:unit="
-            ]
+            "placeholder": "Sub-unit (e.g. 1, Flat 2, Unit C)",
+            "addExtraTags": ["not:addr:unit="]
           },
           "mappings": [
+            {
+              "if": "not:addr:unit=yes",
+              "then": "<div class='subtle'>Sub-unit (e.g. 1, Flat 2, Unit C)</div><div>There is no sub-unit within this address</div>",
+              "addExtraTags": [
+                "addr:unit="
+              ],
+              "hideInAnswer": true
+            },
             {
               "if": "not:addr:unit=yes",
               "then": "There is no sub-unit within this address",
@@ -276,7 +283,7 @@
             },
             {
               "if": "addr:unit=",
-              "then": "<div class='subtle'>Sub-unit (e.g. \"1\", \"Flat 2\", \"Unit C\")</div>",
+              "then": "<div class='subtle'>Sub-unit (e.g. 1, Flat 2, Unit C)</div>",
               "hideInAnswer": true
             }
           ],
@@ -290,15 +297,26 @@
         },
         {
           "id": "uk_addresses_housename",
-          "question": "What is the house or building name for this address?<div class='subtle'>As shown on a sign (e.g. \"Rose Cottage\", \"Broadcasting House\", \"Acme Corp HQ\"). Please do NOT add names of the people who live here!</div>",
-          "render": "<b>{addr:housename}</b>",
+          "question": "What is the house or building name for this address?<div class='subtle'>As shown on a sign. Please do NOT add names of the people who live here!</div>",
+          "render": "<div class='subtle'>House or building name</div><div><b>{addr:housename}</b></div>",
           "freeform": {
             "key": "addr:housename",
+            "placeholder": "Name (e.g. Rose Cottage, Broadcasting House, Acme Corp HQ)",
             "addExtraTags": [
               "nohousename="
             ]
           },
           "mappings": [
+            {
+              "if": {
+                "and": [
+                  "nohousename=yes",
+                  "addr:housename="
+                ]
+              },
+              "then": "<div class='subtle'>House or building name</div><div>This building has no housename</div>",
+              "hideInAnswer": true
+            },
             {
               "if": {
                 "and": [
@@ -323,17 +341,28 @@
         },
         {
           "id": "uk_addresses_housenumber",
-          "render": "<b>{addr:housenumber}</b>",
+          "render": "<div class='subtle'>Number (e.g. 1, 1A, 2)</div><div><b>{addr:housenumber}</b></div>",
           "question": {
             "en": "What is the house or building number for this address?"
           },
           "freeform": {
             "key": "addr:housenumber",
+            "placeholder": "Number (e.g. 1, 1A, 2)",
             "addExtraTags": [
               "nohousenumber="
             ]
           },
           "mappings": [
+            {
+              "if": "nohousenumber=yes",
+              "then": {
+                "en": "<div class='subtle'>Number (e.g. 1, 1A, 2)</div><div>This building has no house number</div>"
+              },
+              "addExtraTags": [
+                "addr:housenumber="
+              ],
+              "hideInAnswer": true
+            },
             {
               "if": "nohousenumber=yes",
               "then": {
@@ -350,19 +379,32 @@
         {
           "id": "uk_addresses_placename",
           "question": {
-            "en": "What is the place or locality for this address?<div class='subtle'>This is additional information that appears before (or instead of) a street name in the address (e.g. \"The Cross\", \"West Business Park\", \"Castle Mews\")</div>"
+            "en": "What is the place or locality for this address?<div class='subtle'>This is additional information that appears before (or instead of) a street name in the address</div>"
           },
           "render": {
-            "en": "<b>{addr:substreet}</b>"
+            "en": "<div class='subtle'>Place (e.g. Castle Mews, West Business Park)</div><div><b>{addr:substreet}</b></div>"
           },
           "freeform": {
             "key": "addr:substreet",
+            "placeholder": "Place (e.g. The Cross, West Business Park, Castle Mews)",
             "addExtraTags": [
+              "not:addr:parentstreet=",
               "addr:parentstreet:={addr:street}",
-              "addr:street="
+              "addr:street=",
+              "not:addr:substreet="
             ]
           },
           "mappings": [
+            {
+              "if": "not:addr:substreet=yes",
+              "then": {
+                "en": "<div class='subtle'>Place (e.g. Castle Mews, West Business Park)</div><div>No extra place name is given or needed</div>"
+              },
+              "addExtraTags": [
+                "addr:substreet="
+              ],
+              "hideInAnswer": true
+            },
             {
               "if": "not:addr:substreet=yes",
               "then": {
@@ -375,7 +417,7 @@
             {
               "if": "addr:substreet=",
               "then": {
-                "en": "<div class='subtle'>Place (e.g. \"Castle Mews\", \"West Business Park\")</div>"
+                "en": "<div class='subtle'>Place (e.g. Castle Mews, West Business Park)</div>"
               },
               "hideInAnswer": true
             }
@@ -385,19 +427,30 @@
         {
           "id": "uk_addresses_placename_with_parent",
           "question": {
-            "en": "What is the place or locality for this address?<div class='subtle'>This is additional information that appears before (or instead of) a street name in the address (e.g. \"The Cross\", \"West Business Park\", \"Castle Mews\")</div>"
+            "en": "What is the place or locality for this address?<div class='subtle'>This is additional information that appears before (or instead of) a street name in the address</div>"
           },
           "render": {
-            "en": "<b>{addr:substreet}</b>"
+            "en": "<div class='subtle'>Place (e.g. Castle Mews, West Business Park)</div><div><b>{addr:substreet}</b></div>"
           },
           "freeform": {
             "key": "addr:substreet",
+            "placeholder": "Place (e.g. The Cross, West Business Park, Castle Mews)",
             "addExtraTags": [
               "addr:street=",
               "not:addr:substreet="
             ]
           },
           "mappings": [
+            {
+              "if": "not:addr:substreet=yes",
+              "then": {
+                "en": "<div class='subtle'>Place (e.g. Castle Mews, West Business Park)</div><div>No extra place name is given or needed</div>"
+              },
+              "addExtraTags": [
+                "addr:substreet="
+              ],
+              "hideInAnswer": true
+            },
             {
               "if": "not:addr:substreet=yes",
               "then": {
@@ -410,7 +463,7 @@
             {
               "if": "addr:substreet=",
               "then": {
-                "en": "<div class='subtle'>Place (e.g. \"Castle Mews\", \"West Business Park\")</div>"
+                "en": "<div class='subtle'>Place (e.g. Castle Mews, West Business Park)</div>"
               },
               "hideInAnswer": true
             }
@@ -435,14 +488,30 @@
         },
         {
           "id": "uk_addresses_street",
-          "render": "<b>{addr:street}</b>",
+          "render": "<div class='subtle'>Street name</div><div><b>{addr:street}</b></div>",
           "question": {
             "en": "What is the street name for this address?"
           },
           "freeform": {
-            "key": "addr:street"
+            "key": "addr:street",
+            "placeholder": "Other (please specify)"
           },
           "mappings": [
+            {
+              "if": "addr:street:={_closest_street:0:name}",
+              "then": "<div class='subtle'>Street name</div><div><b>{_closest_street:0:name}</b></div>",
+              "hideInAnswer": true
+            },
+            {
+              "if": "addr:street:={_closest_street:1:name}",
+              "then": "<div class='subtle'>Street name</div><div><b>{_closest_street:1:name}</b></div>",
+              "hideInAnswer": true
+            },
+            {
+              "if": "addr:street:={_closest_street:2:name}",
+              "then": "<div class='subtle'>Street name</div><div><b>{_closest_street:2:name}</b></div>",
+              "hideInAnswer": true
+            },
             {
               "if": "addr:street:={_closest_street:0:name}",
               "then": "<b>{_closest_street:0:name}</b>",
@@ -468,17 +537,24 @@
         },
         {
           "id": "uk_addresses_parentstreet",
-          "render": "<b>{addr:parentstreet}</b>",
+          "render": "<div class='subtle'>Parent street name</div><div><b>{addr:parentstreet}</b></div>",
           "question": {
             "en": "What is the parent street name for this address?<div class='subtle'>This street name will appear after the place name or first street name in the address</div>"
           },
           "freeform": {
             "key": "addr:parentstreet",
-            "addExtraTags": [
-              "not:addr:parentstreet="
-            ]
+            "placeholder": "Other (please specify)",
+            "addExtraTags": ["not:addr:parentstreet="]
           },
           "mappings": [
+            {
+              "if": "not:addr:parentstreet=yes",
+              "then": "<div class='subtle'>Parent street name</div><div>No parent street name is needed within this address</div>",
+              "addExtraTags": [
+                "addr:parentstreet="
+              ],
+              "hideInAnswer": true
+            },
             {
               "if": "not:addr:parentstreet=yes",
               "then": "No parent street name is needed within this address",
@@ -486,6 +562,21 @@
                 "addr:parentstreet="
               ]
             },
+            {
+              "if": "addr:parentstreet:={_closest_street:0:name}",
+              "then": "<div class='subtle'>Parent street name</div><div><b>{_closest_street:0:name}</b></div>",
+              "hideInAnswer": true
+            },
+            {
+              "if": "addr:parentstreet:={_closest_street:1:name}",
+              "then": "<div class='subtle'>Parent street name</div><div><b>{_closest_street:1:name}</b></div>",
+              "hideInAnswer": true
+            },
+            {
+              "if": "addr:parentstreet:={_closest_street:2:name}",
+              "then": "<div class='subtle'>Parent street name</div><div><b>{_closest_street:2:name}</b></div>",
+              "hideInAnswer": true
+            },
             {
               "if": "addr:parentstreet:={_closest_street:0:name}",
               "then": "<b>{_closest_street:0:name}</b>",
@@ -523,7 +614,8 @@
             "en": "Please explain what the address is so that someone else can look at it"
           },
           "freeform": {
-            "key": "fixme:addr"
+            "key": "fixme:addr",
+            "placeholder": "Type here..."
           },
           "mappings": [
             {
@@ -601,4 +693,4 @@
   ],
   "enableShareScreen": false,
   "enableMoreQuests": false
-}
\ No newline at end of file
+}