diff --git a/app/src/frontend/building/data-components/uprns-data-entry.tsx b/app/src/frontend/building/data-components/uprns-data-entry.tsx
index f15de0d4..631fd207 100644
--- a/app/src/frontend/building/data-components/uprns-data-entry.tsx
+++ b/app/src/frontend/building/data-components/uprns-data-entry.tsx
@@ -1,9 +1,10 @@
 import React, { Fragment } from 'react';
 
-import DataTitle from './data-title';
+import { BaseDataEntryProps } from './data-entry';
+import { DataTitleCopyable } from './data-title';
 
 
-interface UPRNsDataEntryProps {
+interface UPRNsDataEntryProps extends BaseDataEntryProps {
     title: string;
     tooltip: string;
     value: {
@@ -19,7 +20,8 @@ const UPRNsDataEntry: React.FC<UPRNsDataEntryProps> = (props) => {
 
     return (
         <Fragment>
-            <DataTitle
+            <DataTitleCopyable
+                slug={props.slug}
                 title={props.title}
                 tooltip={props.tooltip}
             />
diff --git a/app/src/frontend/building/data-containers/location.tsx b/app/src/frontend/building/data-containers/location.tsx
index 6a9cb199..3d4d8cfe 100644
--- a/app/src/frontend/building/data-containers/location.tsx
+++ b/app/src/frontend/building/data-containers/location.tsx
@@ -137,6 +137,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
             />
         <UPRNsDataEntry
             title={dataFields.uprns.title}
+            slug="ref_uprns"
             value={props.building.uprns}
             tooltip={dataFields.uprns.tooltip}
             />
diff --git a/app/src/frontend/building/data-containers/size.tsx b/app/src/frontend/building/data-containers/size.tsx
index e53809b2..d112a2ea 100644
--- a/app/src/frontend/building/data-containers/size.tsx
+++ b/app/src/frontend/building/data-containers/size.tsx
@@ -15,7 +15,7 @@ import { CategoryViewProps } from './category-view-props';
 */
 const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
     <Fragment>
-        <DataEntryGroup name="Storeys">
+        <DataEntryGroup name="Floors">
             <NumericDataEntry
                 title={dataFields.size_storeys_core.title}
                 slug="size_storeys_core"
diff --git a/app/src/frontend/building/data-containers/streetscape.tsx b/app/src/frontend/building/data-containers/streetscape.tsx
index 4a0ee069..5ef719ef 100644
--- a/app/src/frontend/building/data-containers/streetscape.tsx
+++ b/app/src/frontend/building/data-containers/streetscape.tsx
@@ -49,13 +49,7 @@ const StreetscapeView: React.FunctionComponent<CategoryViewProps> = (props) => (
             mode='view'
         />
         <DataEntry
-            title="Land ownership parcel link"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Land ownership type"
+            title="Does the building have a garden?"
             slug=""
             value=""
             mode='view'
@@ -66,12 +60,30 @@ const StreetscapeView: React.FunctionComponent<CategoryViewProps> = (props) => (
             value=""
             mode='view'
         />
+        <DataEntry
+            title="Pavement width"
+            slug=""
+            value=""
+            mode='view'
+        />
         <DataEntry
             title="Street network geometry link"
             slug=""
             value=""
             mode='view'
         />
+        <DataEntry
+            title="Distance from Public Green Space"
+            slug=""
+            value=""
+            mode='view'
+        />
+        <DataEntry
+            title="Distance from front door to nearest tree"
+            slug=""
+            value=""
+            mode='view'
+        />
     </Fragment>
 );
 const StreetscapeContainer = withCopyEdit(StreetscapeView);
diff --git a/app/src/frontend/building/data-containers/sustainability.tsx b/app/src/frontend/building/data-containers/sustainability.tsx
index 93f6420e..68ccf874 100644
--- a/app/src/frontend/building/data-containers/sustainability.tsx
+++ b/app/src/frontend/building/data-containers/sustainability.tsx
@@ -118,6 +118,12 @@ const SustainabilityView: React.FunctionComponent<CategoryViewProps> = (props) =
                 value=""
                 mode='view'
             />
+            <DataEntry
+                title="Green Walls / Green Roof / Shading"
+                slug=""
+                value=""
+                mode='view'
+            />
         </Fragment>
     );
     };
diff --git a/app/src/frontend/building/data-containers/type.tsx b/app/src/frontend/building/data-containers/type.tsx
index c0705065..d479faf4 100644
--- a/app/src/frontend/building/data-containers/type.tsx
+++ b/app/src/frontend/building/data-containers/type.tsx
@@ -90,7 +90,7 @@ const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 mode='view'
             />
             <DataEntry
-                title="Dynamic tissue type classificaiton"
+                title="Dynamic tissue type classification"
                 slug=""
                 value=""
                 mode='view'
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index cef1d550..2a9c74ba 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -269,7 +269,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
     [Category.Type]: [{
         mapStyle: 'building_attachment_form',
         legend: {
-            title: 'Type',
+            title: 'Adjacency/Configuration',
             elements: [
                 { color: "#f2a2b9", text: "Detached" },
                 { color: "#ab8fb0", text: "Semi-Detached" },
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 070c4ada..5f9e67d3 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -156,8 +156,8 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     ref_toid: {
         category: Category.Location,
-        title: "TOID",
-        tooltip: "Ordnance Survey Topography Layer ID (to be filled automatically)",
+        title: "Building Footprint ID",
+        tooltip: "Ordnance Survey Topography Layer ID (TOID) [<a href='https://www.ordnancesurvey.co.uk/business-government/products/open-toid'>link</a>]",
         example: "",
     },
     
@@ -167,7 +167,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
      */
     uprns: {
         category: Category.Location,
-        title: "UPRNs",
+        title: "Unique Property Reference Number(s) (UPRN)",
         tooltip: "Unique Property Reference Numbers (to be filled automatically)",
         example: [{uprn: "", parent_uprn: "" }, {uprn: "", parent_uprn: "" }],
     },
@@ -292,7 +292,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     facade_year: {
         category: Category.Age,
-        title: "Facade year",
+        title: "Date of Front of Building",
         tooltip: "Best estimate",
         example: 1900,
     },
@@ -333,20 +333,20 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
 
     size_storeys_core: {
         category: Category.Size,
-        title: "Core storeys",
-        tooltip: "How many storeys between the pavement and start of roof?",
+        title: "Core Number of Floors",
+        tooltip: "How many floors are there between the pavement and start of roof?",
         example: 10,
     },
     size_storeys_attic: {
         category: Category.Size,
-        title: "Attic storeys",
-        tooltip: "How many storeys above start of roof?",
+        title: "Number of Floors within Roof Space",
+        tooltip: "How many floors above start of roof?",
         example: 1,
     },
     size_storeys_basement: {
         category: Category.Size,
-        title: "Basement storeys",
-        tooltip: "How many storeys below pavement level?",
+        title: "Number of Floors beneath Ground Level",
+        tooltip: "How many floors below pavement level?",
         example: 1,
     },
     size_height_apex: {
@@ -423,20 +423,20 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
 
     sust_breeam_rating: {
         category: Category.Sustainability,
-        title: "BREEAM Rating",
-        tooltip: "(Building Research Establishment Environmental Assessment Method) May not be present for many buildings",
+        title: "Official Environmental Quality Rating",
+        tooltip: "Building Research Establishment Environmental Assessment Method (BREEAM) May not be present for many buildings",
         example: "",
     },
     sust_dec: {
         category: Category.Sustainability,
-        title: "DEC Rating",
-        tooltip: "(Display Energy Certificate) Any public building should have (and display) a DEC. Showing how the energy use for that building compares to other buildings with same use",
+        title: "Non-domestic Building Energy Rating",
+        tooltip: "Display Energy Certificate (DEC) Any public building should have (and display) a DEC. Showing how the energy use for that building compares to other buildings with same use",
         example: "G",
     },
     sust_aggregate_estimate_epc: {
         category: Category.Sustainability,
-        title: "EPC Rating",
-        tooltip: "(Energy Performance Certificate) Any premises sold or rented is required to have an EPC to show how energy efficient it is. Only buildings rate grade E or higher maybe rented",
+        title: "Domestic Building Energy Rating",
+        tooltip: "Energy Performance Certificate (EPC) Any premises sold or rented is required to have an EPC to show how energy efficient it is. Only buildings rate grade E or higher maybe rented",
         example: "",
     },
     sust_retrofit_date: {
@@ -474,7 +474,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     planning_in_conservation_area_url: {
         category: Category.Planning,
-        title: "Is the building in a <a href=\"https://historicengland.org.uk/listing/what-is-designation/local/conservation-areas/\" target=\"_blank\">Conservation Area (CA)</a>?",
+        title: "Is the building in a conservation area?",
         example: "",
         //tooltip: ,
     },
@@ -510,19 +510,19 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     planning_list_id: {
         category: Category.Planning,
-        title: "If the building is on the <a href=\"https://historicengland.org.uk/advice/hpg/heritage-assets/nhle/\" target=\"_blank\">National Heritage List for England (NHLE)</a> please add the ID:",
+        title: "If the building is on a national heritage register, please add the ID:",
         example: "121436",
-        //tooltip: ,
+        tooltip: "e.g. National Heritage List for England (NHLE)",
     },
     planning_list_grade: {
         category: Category.Planning,
-        title: "What is its grade?",
+        title: "What is its rating?",
         example: "II",
         //tooltip: ,
     },
     planning_heritage_at_risk_url: {
         category: Category.Planning,
-        title: "If the building is on the <a href=\"https://historicengland.org.uk/advice/heritage-at-risk/search-register/\" target=\"_blank\">Heritage at Risk</a> register please add the ID:",
+        title: "If the building is on a heritage at risk register, please add the ID:",
         example: "",
         //tooltip: ,
     },
@@ -534,25 +534,25 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     planning_glher_url: {
         category: Category.Planning,
-        title: "Is it recorded on the <a href=\"https://historicengland.org.uk/advice/technical-advice/information-management/hers/\" target=\"_blank\">Historic Environment Record</a>?",
+        title: "Is it recorded on any historic environment records?",
         example: "",
         //tooltip: ,
     },
     planning_in_apa_url: {
         category: Category.Planning,
-        title: "Is it in an <a href=\"https://historicengland.org.uk/services-skills/our-planning-services/greater-london-archaeology-advisory-service/greater-london-archaeological-priority-areas/\" target=\"_blank\">Archaeological Priority Area</a>?",
+        title: "Is it in an area if archaeological priority?",
         example: "",
         //tooltip: ,
     },
     planning_local_list_url: {
         category: Category.Planning,
-        title: "Is it a <a href=\"https://historicengland.org.uk/advice/hpg/has/locallylistedhas/\" target=\"_blank\">Locally Listed Heritage Asset</a>?",
+        title: "Is it a locally listed heritage asset?",
         example: "",
         //tooltip: ,
     },
     planning_historic_area_assessment_url: {
         category: Category.Planning,
-        title: "Does it have an <a href=\"https://historicengland.org.uk/images-books/publications/understanding-place-historic-area-assessments/\" target=\"_blank\">Historic Area Assessment</a>?",
+        title: "Does it have any other kind of historic area assessment?",
         example: "",
         //tooltip: ,
     },