From 906ebd743166478d2c8451a776710c49394d4870 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Mon, 17 Apr 2023 21:48:21 +0100
Subject: [PATCH 01/42] Add Disaster Management section to Resilience Category

---
 app/map_styles/polygon.xml                    |  26 ++
 app/src/api/config/dataFields.ts              |  19 +-
 .../building/data-containers/resilience.tsx   | 254 ++++++++++++------
 .../frontend/config/category-maps-config.ts   |  96 ++++---
 app/src/frontend/config/data-fields-config.ts |  21 ++
 app/src/frontend/config/tileserver-config.ts  |   1 +
 app/src/tiles/dataDefinition.ts               |   7 +
 .../extract_data/export_attributes.sql        |   6 +-
 migrations/039.disaster_status.down.sql       |   4 +
 migrations/039.disaster_status.up.sql         |   4 +
 10 files changed, 318 insertions(+), 120 deletions(-)
 create mode 100644 migrations/039.disaster_status.down.sql
 create mode 100644 migrations/039.disaster_status.up.sql

diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml
index 020a1052..5bb1f28a 100644
--- a/app/map_styles/polygon.xml
+++ b/app/map_styles/polygon.xml
@@ -913,6 +913,32 @@
             <LineSymbolizer stroke="#888" stroke-width="3.0"/>
         </Rule>
     </Style>
+    <Style name="disaster_severity">
+        <Rule>
+            <Filter>[disaster_severity] = "Building destroyed"</Filter>
+            <PolygonSymbolizer fill="#bd0026" />
+        </Rule>
+        <Rule>
+            <Filter>[disaster_severity] = "Very severe"</Filter>
+            <PolygonSymbolizer fill="#e31a1c" />
+        </Rule>
+        <Rule>
+            <Filter>[disaster_severity] = "Severe"</Filter>
+            <PolygonSymbolizer fill="#fc4e2a" />
+        </Rule>
+        <Rule>
+            <Filter>[disaster_severity] = "Moderate"</Filter>
+            <PolygonSymbolizer fill="#fd8d3c" />
+        </Rule>
+        <Rule>
+            <Filter>[disaster_severity] = "Minimal"</Filter>
+            <PolygonSymbolizer fill="#feb24c" />
+        </Rule>
+        <Rule>
+            <Filter>[disaster_severity] = "No damage visible"</Filter>
+            <PolygonSymbolizer fill="#fed976" />
+        </Rule>
+    </Style>
     <Style name="dynamics_demolished_count">
         <Rule>
             <Filter>[dynamics_has_demolished_buildings] = false</Filter>
diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
index f3158851..f22b3b96 100644
--- a/app/src/api/config/dataFields.ts
+++ b/app/src/api/config/dataFields.ts
@@ -407,8 +407,23 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
     other_team_source_link: {
         edit: true,
         verify: true
-    }
-
+    },
+    disaster_type: {
+        edit: true,
+        verify: true
+    },
+    disaster_severity: {
+        edit: true,
+        verify: true
+    },
+    disaster_assessment_method: {
+        edit: true,
+        verify: true
+    },
+    disaster_source_link: {
+        edit: true,
+        verify: true
+    },
 });
 
 
diff --git a/app/src/frontend/building/data-containers/resilience.tsx b/app/src/frontend/building/data-containers/resilience.tsx
index 73f67d6a..886f018b 100644
--- a/app/src/frontend/building/data-containers/resilience.tsx
+++ b/app/src/frontend/building/data-containers/resilience.tsx
@@ -1,102 +1,188 @@
 import React from 'react';
-import { Link } from 'react-router-dom';
 import InfoBox from '../../components/info-box';
-
-import { Category } from '../../config/categories-config';
 import { dataFields } from '../../config/data-fields-config';
-
 import DataEntry from '../data-components/data-entry';
 import { DataEntryGroup } from '../data-components/data-entry-group';
-import { DynamicsBuildingPane, DynamicsDataEntry } from './dynamics/dynamics-data-entry';
-import { FieldRow } from '../data-components/field-row';
-import NumericDataEntry from '../data-components/numeric-data-entry';
+import SelectDataEntry from '../data-components/select-data-entry';
 import withCopyEdit from '../data-container';
-
+import Verification from '../data-components/verification';
 import { CategoryViewProps } from './category-view-props';
-import { LogicalDataEntry } from '../data-components/logical-data-entry/logical-data-entry';
+import { useDisplayPreferences } from '../../displayPreferences-context';
+import { MultiDataEntry } from '../data-components/multi-data-entry/multi-data-entry';
 
 /**
 * Dynamics view/edit section
 */
 const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
     
+    const { historicData, historicDataSwitchOnClick, darkLightTheme } = useDisplayPreferences();
 
     return (<>
-        <InfoBox>
-            This section is under development.
-        </InfoBox>
-        <DataEntry
-            title="Building age"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Typical typology lifespan"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Typology adaptability rating"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Physical adaptability rating - within plot"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Landuse adaptability rating"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Structural material lifespan rating"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Protection from demolition rating"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Flood risk rating"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Surface geology type"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Average community value rating for typology"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Other rating"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Total resilience rating"
-            slug=""
-            value=""
-            mode='view'
-        />
+        <DataEntryGroup name="Disaster Management" collapsed={true} >
+            <InfoBox>
+            This feature is designed to help communities capture data on the state of buildings
+            during major disasters, to support emergency services and to record damage to aid reconstruction programmes.
+            </InfoBox>
+            <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
+                {(historicData === 'enabled')?'Click here to hide disaster maps':'Click here to show disaster maps'}
+            </button>
+            <SelectDataEntry
+                slug='disaster_type'
+                title={dataFields.disaster_type.title}
+                value={props.building.disaster_type}
+                options={[
+                    'Flood',
+                    'Earthquake',
+                    'Hurricane',
+                    'Fire',
+                    'Extreme heat',
+                    'Political/war damage',
+                    'Other human (blast damage/spills etc.)',
+                    'Other'
+                ]}
+
+                onChange={props.onChange}
+                mode={props.mode}
+                copy={props.copy}
+            />
+            <SelectDataEntry
+                slug='disaster_severity'
+                title={dataFields.disaster_severity.title}
+                value={props.building.disaster_severity}
+                options={[
+                    'Building destroyed',
+                    'Very severe',
+                    'Severe',
+                    'Moderate',
+                    'Minimal',
+                    'No damage visible',
+                ]}
+
+                onChange={props.onChange}
+                mode={props.mode}
+                copy={props.copy}
+            />
+            <Verification
+                slug="disaster_severity"
+                allow_verify={props.user !== undefined && props.building.disaster_severity !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("disaster_severity")}
+                user_verified_as={props.user_verified.disaster_severity}
+                verified_count={props.building.verified.disaster_severity}
+            />
+            <SelectDataEntry
+                slug='disaster_assessment_method'
+                title={dataFields.disaster_assessment_method.title}
+                value={props.building.disaster_assessment_method}
+                options={[
+                    'Citizen/Passerby by eye',
+                    'Government assessor',
+                    'Specialist emergency group/charity',
+                    'Other',
+                ]}
+
+                onChange={props.onChange}
+                mode={props.mode}
+                copy={props.copy}
+            />
+            <Verification
+                slug="disaster_assessment_method"
+                allow_verify={props.user !== undefined && props.building.disaster_assessment_method !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("disaster_assessment_method")}
+                user_verified_as={props.user_verified.disaster_assessment_method}
+                verified_count={props.building.verified.disaster_assessment_method}
+            />
+            <MultiDataEntry
+              title={dataFields.disaster_source_link.title}
+              slug="disaster_source_link"
+              value={props.building.disaster_source_link}
+              mode={props.mode}
+              copy={props.copy}
+              onChange={props.onChange}
+              tooltip={dataFields.disaster_source_link.tooltip}
+              placeholder="https://..."
+              editableEntries={true}
+              isUrl={true}
+            />
+        </DataEntryGroup>
+        <DataEntryGroup name="Resilience indicators" collapsed={true} >
+            <InfoBox>
+                This section is under development.
+            </InfoBox>
+            <DataEntry
+                title="Building age"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Typical typology lifespan"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Typology adaptability rating"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Physical adaptability rating - within plot"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Landuse adaptability rating"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Structural material lifespan rating"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Protection from demolition rating"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Flood risk rating"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Surface geology type"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Average community value rating for typology"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Other rating"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Total resilience rating"
+                slug=""
+                value=""
+                mode='view'
+            />
+        </DataEntryGroup>
     </>)
 };
 
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index 3855234a..63b2aaf6 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -354,39 +354,69 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
             elements: []
         },
     }],
-    [Category.Resilience]: [{
-        mapStyle: 'dynamics_demolished_count',
-        legend: {
-            title: 'Resilience',
-            description: 'Demolished buildings on the same site',
-            elements: [
-                {
-                    text: '7+',
-                    color: '#bd0026',
-                }, {
-                    text: '6',
-                    color: '#e31a1c',
-                }, {
-                    text: '5',
-                    color: '#fc4e2a',
-                }, {
-                    text: '4',
-                    color: '#fd8d3c',
-                }, {
-                    text: '3',
-                    color: '#feb24c',
-                }, {
-                    text: '2',
-                    color: '#fed976',
-                }, {
-                    text: '1',
-                    color: '#ffe8a9',
-                }, {
-                    text: 'None',
-                    color: '#0C7BDC'
-                }
-            ],
+    [Category.Resilience]: [
+        {
+            mapStyle: 'disaster_severity',
+            legend: {
+                title: 'Severity of damage',
+                description: 'Severity of damage to building',
+                elements: [
+                    {
+                        text: 'Building destroyed',
+                        color: '#bd0026',
+                    }, {
+                        text: 'Very severe',
+                        color: '#e31a1c',
+                    }, {
+                        text: 'Severe',
+                        color: '#fc4e2a',
+                    }, {
+                        text: 'Moderate',
+                        color: '#fd8d3c',
+                    }, {
+                        text: 'Minimal ',
+                        color: '#feb24c',
+                    }, {
+                        text: 'No damage visible',
+                        color: '#fed976',
+                    },
+                ],
+            },
         },
-    }]
+        {
+            mapStyle: 'dynamics_demolished_count',
+            legend: {
+                title: 'Resilience',
+                description: 'Demolished buildings on the same site',
+                elements: [
+                    {
+                        text: '7+',
+                        color: '#bd0026',
+                    }, {
+                        text: '6',
+                        color: '#e31a1c',
+                    }, {
+                        text: '5',
+                        color: '#fc4e2a',
+                    }, {
+                        text: '4',
+                        color: '#fd8d3c',
+                    }, {
+                        text: '3',
+                        color: '#feb24c',
+                    }, {
+                        text: '2',
+                        color: '#fed976',
+                    }, {
+                        text: '1',
+                        color: '#ffe8a9',
+                    }, {
+                        text: 'None',
+                        color: '#0C7BDC'
+                    }
+                ],
+            },
+        }
+    ]
     
 };
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index f3d14402..54544035 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -811,6 +811,27 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         title: "Source other significant team members",
         example: ["", "", ""],
     },
+    disaster_type: {
+        category: Category.Resilience,
+        title: "What type of disaster management do you wish to collect data for?",
+        example: "Flood"
+    },
+    disaster_severity: {
+        category: Category.Resilience,
+        title: "How severe do you assess the damage to be?",
+        example: "Building destroyed"
+    },
+    disaster_assessment_method: {
+        category: Category.Resilience,
+        title: "Please add a method of assessment",
+        example: "Citizen/Passerby by eye"
+    },
+    disaster_source_link: {
+        category: Category.Resilience,
+        title: "Please add a source link to official documentation where applicable",
+        tooltip: "URL for data sources(s)",
+        example: ["", "", ""],
+    },
 };
 
 export const allFieldsConfig = {...dataFields, ...buildingUserFields};
\ No newline at end of file
diff --git a/app/src/frontend/config/tileserver-config.ts b/app/src/frontend/config/tileserver-config.ts
index 68605511..0ad39b90 100644
--- a/app/src/frontend/config/tileserver-config.ts
+++ b/app/src/frontend/config/tileserver-config.ts
@@ -21,6 +21,7 @@ export type BuildingMapTileset = 'date_year' |
     'building_attachment_form' |
     'landuse' |
     'dynamics_demolished_count' |
+    'disaster_severity' |
     'team' |
     'survival_status';
 
diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts
index 4b5bd732..b440ca5d 100644
--- a/app/src/tiles/dataDefinition.ts
+++ b/app/src/tiles/dataDefinition.ts
@@ -266,6 +266,13 @@ const LAYER_QUERIES = {
             buildings
         WHERE
             current_landuse_order IS NOT NULL`,
+    disaster_severity: `
+        SELECT
+            geometry_id,
+            disaster_severity
+        FROM
+            buildings
+        WHERE disaster_severity IS NOT NULL`,
     dynamics_demolished_count: `
         SELECT
             geometry_id,
diff --git a/maintenance/extract_data/export_attributes.sql b/maintenance/extract_data/export_attributes.sql
index 561ac7f2..4cce6685 100644
--- a/maintenance/extract_data/export_attributes.sql
+++ b/maintenance/extract_data/export_attributes.sql
@@ -58,7 +58,11 @@ COPY (SELECT
     community_type_worth_keeping_total,
     likes_total,
     survival_status,
-    survival_source
+    survival_source,
+    disaster_type,
+    disaster_severity,
+    disaster_assessment_method,
+    disaster_source_link
 FROM buildings)
 TO '/tmp/building_attributes.csv'
 WITH CSV HEADER
diff --git a/migrations/039.disaster_status.down.sql b/migrations/039.disaster_status.down.sql
new file mode 100644
index 00000000..95134ea2
--- /dev/null
+++ b/migrations/039.disaster_status.down.sql
@@ -0,0 +1,4 @@
+ALTER TABLE buildings DROP COLUMN IF EXISTS disaster_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS disaster_severity;
+ALTER TABLE buildings DROP COLUMN IF EXISTS disaster_assessment_method;
+ALTER TABLE buildings DROP COLUMN IF EXISTS disaster_source_link;
\ No newline at end of file
diff --git a/migrations/039.disaster_status.up.sql b/migrations/039.disaster_status.up.sql
new file mode 100644
index 00000000..46fee39d
--- /dev/null
+++ b/migrations/039.disaster_status.up.sql
@@ -0,0 +1,4 @@
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS disaster_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS disaster_severity text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS disaster_assessment_method text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS disaster_source_link text[];
\ No newline at end of file

From 8f9590adb6a9a69d3e6c3ac891d9a854f0987298 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Fri, 21 Apr 2023 13:41:03 +0100
Subject: [PATCH 02/42] WIP Disaster Start/End Dates

---
 app/package-lock.json                         | 140 ++++++++++++++++++
 app/package.json                              |   1 +
 app/src/api/config/dataFields.ts              |   8 +
 .../building/data-containers/resilience.tsx   |  40 ++++-
 app/src/frontend/config/data-fields-config.ts |  10 ++
 .../extract_data/export_attributes.sql        |   4 +-
 migrations/039.disaster_status.down.sql       |   4 +-
 migrations/039.disaster_status.up.sql         |   4 +-
 8 files changed, 205 insertions(+), 6 deletions(-)

diff --git a/app/package-lock.json b/app/package-lock.json
index 30c48bb3..f90f1098 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -33,6 +33,7 @@
         "pg-promise": "^10.11.1",
         "query-string": "^6.13.1",
         "react": "^17.0.2",
+        "react-datepicker": "^4.11.0",
         "react-dom": "^17.0.2",
         "react-leaflet": "^3.1.0",
         "react-router-dom": "^5.2.0",
@@ -2646,6 +2647,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/@popperjs/core": {
+      "version": "2.11.7",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz",
+      "integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
     "node_modules/@react-leaflet/core": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@react-leaflet/core/-/core-1.1.1.tgz",
@@ -4897,6 +4907,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/classnames": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
+      "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
+    },
     "node_modules/clean-css": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
@@ -5940,6 +5955,18 @@
         "node": ">=10"
       }
     },
+    "node_modules/date-fns": {
+      "version": "2.29.3",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
+      "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==",
+      "engines": {
+        "node": ">=0.11"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/date-fns"
+      }
+    },
     "node_modules/debug": {
       "version": "4.3.3",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
@@ -14834,6 +14861,23 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/react-datepicker": {
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.11.0.tgz",
+      "integrity": "sha512-50n93o7mQwBEhg05tbopjFKgs8qgi8VBCAOMC4VqrKut72eAjESc/wXS/k5hRtnP0oe2FCGw7MJuIwh37wuXOw==",
+      "dependencies": {
+        "@popperjs/core": "^2.9.2",
+        "classnames": "^2.2.6",
+        "date-fns": "^2.24.0",
+        "prop-types": "^15.7.2",
+        "react-onclickoutside": "^6.12.2",
+        "react-popper": "^2.3.0"
+      },
+      "peerDependencies": {
+        "react": "^16.9.0 || ^17 || ^18",
+        "react-dom": "^16.9.0 || ^17 || ^18"
+      }
+    },
     "node_modules/react-dev-utils": {
       "version": "11.0.4",
       "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz",
@@ -15244,6 +15288,11 @@
       "integrity": "sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA==",
       "dev": true
     },
+    "node_modules/react-fast-compare": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.1.tgz",
+      "integrity": "sha512-xTYf9zFim2pEif/Fw16dBiXpe0hoy5PxcD8+OwBnTtNLfIm3g6WxhKNurY+6OmdH1u6Ta/W/Vl6vjbYP1MFnDg=="
+    },
     "node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -15262,6 +15311,33 @@
         "react-dom": "^17.0.1"
       }
     },
+    "node_modules/react-onclickoutside": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz",
+      "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==",
+      "funding": {
+        "type": "individual",
+        "url": "https://github.com/Pomax/react-onclickoutside/blob/master/FUNDING.md"
+      },
+      "peerDependencies": {
+        "react": "^15.5.x || ^16.x || ^17.x || ^18.x",
+        "react-dom": "^15.5.x || ^16.x || ^17.x || ^18.x"
+      }
+    },
+    "node_modules/react-popper": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz",
+      "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==",
+      "dependencies": {
+        "react-fast-compare": "^3.0.1",
+        "warning": "^4.0.2"
+      },
+      "peerDependencies": {
+        "@popperjs/core": "^2.0.0",
+        "react": "^16.8.0 || ^17 || ^18",
+        "react-dom": "^16.8.0 || ^17 || ^18"
+      }
+    },
     "node_modules/react-refresh": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz",
@@ -18822,6 +18898,14 @@
         "makeerror": "1.0.12"
       }
     },
+    "node_modules/warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "node_modules/watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
@@ -22102,6 +22186,11 @@
         "rimraf": "^3.0.2"
       }
     },
+    "@popperjs/core": {
+      "version": "2.11.7",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz",
+      "integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw=="
+    },
     "@react-leaflet/core": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@react-leaflet/core/-/core-1.1.1.tgz",
@@ -23929,6 +24018,11 @@
         }
       }
     },
+    "classnames": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
+      "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
+    },
     "clean-css": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
@@ -24753,6 +24847,11 @@
         "whatwg-url": "^8.0.0"
       }
     },
+    "date-fns": {
+      "version": "2.29.3",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
+      "integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA=="
+    },
     "debug": {
       "version": "4.3.3",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
@@ -31508,6 +31607,19 @@
         "object-assign": "^4.1.1"
       }
     },
+    "react-datepicker": {
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.11.0.tgz",
+      "integrity": "sha512-50n93o7mQwBEhg05tbopjFKgs8qgi8VBCAOMC4VqrKut72eAjESc/wXS/k5hRtnP0oe2FCGw7MJuIwh37wuXOw==",
+      "requires": {
+        "@popperjs/core": "^2.9.2",
+        "classnames": "^2.2.6",
+        "date-fns": "^2.24.0",
+        "prop-types": "^15.7.2",
+        "react-onclickoutside": "^6.12.2",
+        "react-popper": "^2.3.0"
+      }
+    },
     "react-dev-utils": {
       "version": "11.0.4",
       "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz",
@@ -31839,6 +31951,11 @@
       "integrity": "sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA==",
       "dev": true
     },
+    "react-fast-compare": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.1.tgz",
+      "integrity": "sha512-xTYf9zFim2pEif/Fw16dBiXpe0hoy5PxcD8+OwBnTtNLfIm3g6WxhKNurY+6OmdH1u6Ta/W/Vl6vjbYP1MFnDg=="
+    },
     "react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -31852,6 +31969,21 @@
         "@react-leaflet/core": "^1.1.1"
       }
     },
+    "react-onclickoutside": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz",
+      "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==",
+      "requires": {}
+    },
+    "react-popper": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz",
+      "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==",
+      "requires": {
+        "react-fast-compare": "^3.0.1",
+        "warning": "^4.0.2"
+      }
+    },
     "react-refresh": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz",
@@ -34711,6 +34843,14 @@
         "makeerror": "1.0.12"
       }
     },
+    "warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
diff --git a/app/package.json b/app/package.json
index 27d8c441..2f216dc9 100644
--- a/app/package.json
+++ b/app/package.json
@@ -37,6 +37,7 @@
     "pg-promise": "^10.11.1",
     "query-string": "^6.13.1",
     "react": "^17.0.2",
+    "react-datepicker": "^4.11.0",
     "react-dom": "^17.0.2",
     "react-leaflet": "^3.1.0",
     "react-router-dom": "^5.2.0",
diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
index f22b3b96..3ecaf757 100644
--- a/app/src/api/config/dataFields.ts
+++ b/app/src/api/config/dataFields.ts
@@ -424,6 +424,14 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true
     },
+    disaster_start_date : {
+        edit: true,
+        verify: true
+    },
+    disaster_end_date : {
+        edit: true,
+        verify: true
+    }
 });
 
 
diff --git a/app/src/frontend/building/data-containers/resilience.tsx b/app/src/frontend/building/data-containers/resilience.tsx
index 886f018b..f45e9929 100644
--- a/app/src/frontend/building/data-containers/resilience.tsx
+++ b/app/src/frontend/building/data-containers/resilience.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import InfoBox from '../../components/info-box';
 import { dataFields } from '../../config/data-fields-config';
 import DataEntry from '../data-components/data-entry';
@@ -9,6 +9,9 @@ import Verification from '../data-components/verification';
 import { CategoryViewProps } from './category-view-props';
 import { useDisplayPreferences } from '../../displayPreferences-context';
 import { MultiDataEntry } from '../data-components/multi-data-entry/multi-data-entry';
+import DatePicker from "react-datepicker";
+
+import "react-datepicker/dist/react-datepicker.css";
 
 /**
 * Dynamics view/edit section
@@ -16,16 +19,47 @@ import { MultiDataEntry } from '../data-components/multi-data-entry/multi-data-e
 const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
     
     const { historicData, historicDataSwitchOnClick, darkLightTheme } = useDisplayPreferences();
+    const [ startDate, setStartDate ] = useState(null);
+    const [ endDate, setEndDate ] = useState(null);
 
     return (<>
         <DataEntryGroup name="Disaster Management" collapsed={true} >
             <InfoBox>
-            This feature is designed to help communities capture data on the state of buildings
-            during major disasters, to support emergency services and to record damage to aid reconstruction programmes.
+                This feature is designed to help communities capture data on the state of buildings
+                during major disasters, to support emergency services and to record damage to aid reconstruction programmes.
             </InfoBox>
             <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
                 {(historicData === 'enabled')?'Click here to hide disaster maps':'Click here to show disaster maps'}
             </button>
+            <p>Date of Disaster</p>
+            <div>
+                <DatePicker 
+                    showIcon
+                    dateFormat="dd/MM/yyyy"
+                    slug="disaster_start_date"
+                    selected={startDate}
+                    onChange={(date) => setStartDate(date)} 
+                    title={dataFields.disaster_start_date.title}
+                    //value={props.building.disaster_start_date}
+                    isClearable
+                    placeholderText="Select Start Date"
+                    maxDate={new Date()}
+                />
+            </div>
+            <div>
+                <DatePicker 
+                    showIcon
+                    dateFormat="dd/MM/yyyy"
+                    slug="disaster_end_date"
+                    selected={endDate}
+                    onChange={(date) => setEndDate(date)} 
+                    title={dataFields.disaster_end_date.title}
+                    //value={props.building.disaster_end_date}
+                    isClearable
+                    placeholderText="Select End Date"
+                    maxDate={new Date()}
+                />
+            </div>
             <SelectDataEntry
                 slug='disaster_type'
                 title={dataFields.disaster_type.title}
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 54544035..d3275412 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -832,6 +832,16 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip: "URL for data sources(s)",
         example: ["", "", ""],
     },
+    disaster_start_date: {
+        category: Category.Resilience,
+        title: "What was the start date of the disaster?",
+        example: "01/04/2023"
+    },
+    disaster_end_date: {
+        category: Category.Resilience,
+        title: "What was the end date of the disaster? (if applicable)",
+        example: "03/04/2023"
+    },
 };
 
 export const allFieldsConfig = {...dataFields, ...buildingUserFields};
\ No newline at end of file
diff --git a/maintenance/extract_data/export_attributes.sql b/maintenance/extract_data/export_attributes.sql
index 4cce6685..e348fc37 100644
--- a/maintenance/extract_data/export_attributes.sql
+++ b/maintenance/extract_data/export_attributes.sql
@@ -62,7 +62,9 @@ COPY (SELECT
     disaster_type,
     disaster_severity,
     disaster_assessment_method,
-    disaster_source_link
+    disaster_source_link,
+    disaster_start_date,
+    disaster_end_date
 FROM buildings)
 TO '/tmp/building_attributes.csv'
 WITH CSV HEADER
diff --git a/migrations/039.disaster_status.down.sql b/migrations/039.disaster_status.down.sql
index 95134ea2..f2af320c 100644
--- a/migrations/039.disaster_status.down.sql
+++ b/migrations/039.disaster_status.down.sql
@@ -1,4 +1,6 @@
 ALTER TABLE buildings DROP COLUMN IF EXISTS disaster_type;
 ALTER TABLE buildings DROP COLUMN IF EXISTS disaster_severity;
 ALTER TABLE buildings DROP COLUMN IF EXISTS disaster_assessment_method;
-ALTER TABLE buildings DROP COLUMN IF EXISTS disaster_source_link;
\ No newline at end of file
+ALTER TABLE buildings DROP COLUMN IF EXISTS disaster_source_link;
+ALTER TABLE buildings DROP COLUMN IF EXISTS disaster_start_date;
+ALTER TABLE buildings DROP COLUMN IF EXISTS disaster_end_date;
\ No newline at end of file
diff --git a/migrations/039.disaster_status.up.sql b/migrations/039.disaster_status.up.sql
index 46fee39d..d7d94ad6 100644
--- a/migrations/039.disaster_status.up.sql
+++ b/migrations/039.disaster_status.up.sql
@@ -1,4 +1,6 @@
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS disaster_type text;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS disaster_severity text;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS disaster_assessment_method text;
-ALTER TABLE buildings ADD COLUMN IF NOT EXISTS disaster_source_link text[];
\ No newline at end of file
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS disaster_source_link text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS disaster_start_date date;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS disaster_end_date date;
\ No newline at end of file

From 2f60ec72aecf1e005e393947e5730878eee96b4b Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 9 May 2023 09:30:14 +0100
Subject: [PATCH 03/42] Merge Local and Incoming Changes

---
 app/src/frontend/building/data-containers/resilience.tsx | 8 ++++----
 app/src/frontend/config/data-fields-config.ts            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/frontend/building/data-containers/resilience.tsx b/app/src/frontend/building/data-containers/resilience.tsx
index f45e9929..828455b3 100644
--- a/app/src/frontend/building/data-containers/resilience.tsx
+++ b/app/src/frontend/building/data-containers/resilience.tsx
@@ -23,10 +23,10 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const [ endDate, setEndDate ] = useState(null);
 
     return (<>
-        <DataEntryGroup name="Disaster Management" collapsed={true} >
+        <DataEntryGroup name="Building Damage Assessment Tool" collapsed={true} >
             <InfoBox>
-                This feature is designed to help communities capture data on the state of buildings
-                during major disasters, to support emergency services and to record damage to aid reconstruction programmes.
+            This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters. 
+            It is intended to help support emergency services, to record damage, and to aid reconstruction programmes.
             </InfoBox>
             <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
                 {(historicData === 'enabled')?'Click here to hide disaster maps':'Click here to show disaster maps'}
@@ -140,7 +140,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
               isUrl={true}
             />
         </DataEntryGroup>
-        <DataEntryGroup name="Resilience indicators" collapsed={true} >
+        <DataEntryGroup name="Resilience indicators and risk assessment" collapsed={true} >
             <InfoBox>
                 This section is under development.
             </InfoBox>
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index d3275412..27a1f07d 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -828,7 +828,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     disaster_source_link: {
         category: Category.Resilience,
-        title: "Please add a source link to official documentation where applicable",
+        title: "Please add a source link to official documentation/photographic evidence where applicable",
         tooltip: "URL for data sources(s)",
         example: ["", "", ""],
     },

From 29522d2ce75901fca20c7f8102ca4ab1f925e8d9 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Fri, 12 May 2023 16:38:39 +0100
Subject: [PATCH 04/42] Starting to add some localisation

---
 app/src/cc-config.json |  5 ++++-
 app/src/cc-config.ts   | 15 +++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/cc-config.json b/app/src/cc-config.json
index a0611813..dd1361ae 100644
--- a/app/src/cc-config.json
+++ b/app/src/cc-config.json
@@ -5,5 +5,8 @@
     "privacyStatement": "{Privacy statement goes here}",
 
     "initialMapPosition": [ 51.5245255, -0.1338422 ],
-    "initialZoomLevel": 16
+    "initialZoomLevel": 16,
+
+    "postcode": "Postcode",
+    "energy_rating": "Building Research Establishment Environmental Assessment Method (BREEAM) rating"
 }
diff --git a/app/src/cc-config.ts b/app/src/cc-config.ts
index 905cf5db..54390139 100644
--- a/app/src/cc-config.ts
+++ b/app/src/cc-config.ts
@@ -1,11 +1,14 @@
 export interface CCConfig
 {
-    cityName: string;
-    projectBlurb: string;
-    githubURL: string;
-    privacyStatement: string;
+    cityName: string;                           // City name (i.e. "Colouring {City Name}")
+    projectBlurb: string;                       // Description used on homepage
+    githubURL: string;                          // URL of the project's GitHub repository
+    privacyStatement: string;                   // Privacy statement, including where data is stored
     
-    initialMapPosition: [number, number];
-    initialZoomLevel: number;
+    initialMapPosition: [number, number];       // Initial location of the map [latitude, longitude]
+    initialZoomLevel: number;                   // Initial Zoom Level 
+
+    postcode: string;                           // Alternative for "Postcode" text (i.e. "Zip Code")
+    energy_rating: string;                      // Official Environmental Energy Rating (BREEAM Rating in UK)
 }
 

From e4026acef35d1a68dd3d68d5b91f6119574de394 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Fri, 12 May 2023 16:39:02 +0100
Subject: [PATCH 05/42] Make 'Age & History' Display on two lines

---
 app/src/frontend/building/category-link.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/frontend/building/category-link.css b/app/src/frontend/building/category-link.css
index b495e77b..91f42eef 100644
--- a/app/src/frontend/building/category-link.css
+++ b/app/src/frontend/building/category-link.css
@@ -17,6 +17,6 @@
     text-align: center;
     font-size: 1em;
     margin: 0;
-    padding: 0.25em;
+    padding: 0.3em;
   }
   
\ No newline at end of file

From 42d42d73061b37f998b92682433a4a1c206f7937 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Fri, 12 May 2023 16:39:49 +0100
Subject: [PATCH 06/42] Add Category descriptions

---
 app/src/frontend/building/data-container.tsx |  4 ++++
 app/src/frontend/config/categories-config.ts | 22 ++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/src/frontend/building/data-container.tsx b/app/src/frontend/building/data-container.tsx
index 712c3dcb..db1ca846 100644
--- a/app/src/frontend/building/data-container.tsx
+++ b/app/src/frontend/building/data-container.tsx
@@ -355,6 +355,10 @@ const withCopyEdit: (wc: React.ComponentType<CategoryViewProps>) => DataContaine
                 }
                 </ContainerHeader>
                 <div className="section-body">
+                <InfoBox>
+                    {this.props.intro}&nbsp;
+                    Can you help us capture and verify this information?
+                </InfoBox>
                 <EditHistoryLatest
                     building={this.props.building}
                 />
diff --git a/app/src/frontend/config/categories-config.ts b/app/src/frontend/config/categories-config.ts
index dc5b78be..3ab3f779 100644
--- a/app/src/frontend/config/categories-config.ts
+++ b/app/src/frontend/config/categories-config.ts
@@ -50,55 +50,55 @@ export const categoriesConfig: {[key in Category]: CategoryDefinition} = {
         slug: 'age',
         name: 'Age & History',
         aboutUrl: 'https://pages.colouring.london/age',
-        intro: 'Building age data can support energy analysis and help predict long-term change.',
+        intro: 'This section provides open data on the age of buildings and the history of buildings and sites.',
     },
     [Category.Size]: {
         slug: 'size',
         name: 'Size',
         aboutUrl: 'https://pages.colouring.london/shapeandsize',
-        intro: 'How big are buildings?',
+        intro: 'This section provides open data on the dimensions of buildings.',
     },
     [Category.Team]: {
         slug: 'team',
         name: 'Team',
         aboutUrl: 'https://pages.colouring.london/team',
-        intro: 'Who built the buildings?',
+        intro: 'This section provides open data on the teams designing and constructing the buildings.',
     },
     [Category.Construction]: {
         slug: 'construction',
         name: 'Construction',
         aboutUrl: 'https://pages.colouring.london/construction',
-        intro: 'How are buildings built?',
+        intro: 'This section provides open data on building materials and construction systems.',
     },
     [Category.Location]: {
         slug: 'location',
         name: 'Location',
         aboutUrl: 'https://pages.colouring.london/location',
-        intro: 'Where are the buildings? Address, location and cross-references.',
+        intro: 'This section provides open data on building locations and building IDs.',
     },
     [Category.Community]: {
         slug: 'community',
         name: 'Community',
         aboutUrl: 'https://pages.colouring.london/community',
-        intro: 'How does this building work for the local community?',
+        intro: 'This section collects data on how well citizens think specific *types* of building work (rather than individual buildings). This will help us save and reuse as many useful buildings as possible, and to help improve urban design quality in future.',
     },
     [Category.Planning]: {
         slug: 'planning',
         name: 'Planning Controls',
         aboutUrl: 'https://pages.colouring.london/planning',
-        intro: 'Planning controls relating to protection and reuse.',
+        intro: 'This section provides open data on current and anticipated planning applications for buildings, planning zones and whether the building is protected.',
     },
     [Category.Sustainability]: {
         slug: 'sustainability',
         name: 'Energy Performance',
         aboutUrl: 'https://pages.colouring.london/sustainability',
-        intro: 'Are buildings energy efficient?',
+        intro: 'This section provides open data on the energy performance of buildings, and on retrofit.',
     },
     [Category.Type]: {
         slug: 'type',
         name: 'Typology',
         aboutUrl: 'https://pages.colouring.london/buildingtypology',
-        intro: 'How were buildings previously used?',
+        intro: 'This section provides open data on the type of activities being carried out within buildings.',
     },
     [Category.LandUse]: {
         slug: 'use',
@@ -111,12 +111,12 @@ export const categoriesConfig: {[key in Category]: CategoryDefinition} = {
         slug: 'streetscape',
         name: 'Street Context',
         aboutUrl: 'https://pages.colouring.london/greenery',
-        intro: "What's the building's context? Coming soon…",
+        intro: "This section provides open data, and links to open data on streets, pavements, street blocks, land parcels and greenery/green spaces.",
     },
     [Category.Resilience]: {
         slug: 'resilience',
         name: 'Resilience',
         aboutUrl: 'https://pages.colouring.london/dynamics',
-        intro: 'How has the site of this building changed over time?'
+        intro: 'This section provides a tool that allows for live collection of data in disaster situations and collates data relating to building resilience.'
     },
 };

From 664cceec56cffcd6d8d9527e612367a2392b6405 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Fri, 12 May 2023 16:41:17 +0100
Subject: [PATCH 07/42] Add tooltips to year fields

---
 app/src/frontend/building/data-components/year-data-entry.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/frontend/building/data-components/year-data-entry.tsx b/app/src/frontend/building/data-components/year-data-entry.tsx
index aea54267..6274c77d 100644
--- a/app/src/frontend/building/data-components/year-data-entry.tsx
+++ b/app/src/frontend/building/data-components/year-data-entry.tsx
@@ -63,6 +63,7 @@ class YearDataEntry extends Component<YearDataEntryProps, any> {
                     onChange={props.onChange}
                     min={1}
                     max={currentYear}
+                    tooltip={dataFields.date_year.tooltip}
                     // "type": "year_estimator"
                     />
                 <Verification

From 0a24d60c43a4fb539d53f5a4b61a579d7dc71e31 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Fri, 12 May 2023 16:41:53 +0100
Subject: [PATCH 08/42] Tweaks to data fields

Changes to wording and localisations using cc-config
---
 app/src/frontend/config/data-fields-config.ts | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index b0981f6b..d5c23e08 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -1,5 +1,6 @@
 import { Category } from './categories-config';
-
+import { CCConfig } from '../../cc-config';
+let ccconfig: CCConfig = require('../../cc-config.json')
 
 /**
  * This interface is used only in code which uses dataFields, not in the dataFields definition itself
@@ -73,7 +74,7 @@ export const buildingUserFields = {
     community_type_worth_keeping: {
         perUser: true,
         category: Category.Community,
-        title: "Do you think this **type** of building is contributes to the city?",
+        title: "Do you think this **type** of building contributes to the city?",
         example: true,
     },
     community_type_worth_keeping_reasons: {
@@ -128,8 +129,8 @@ export const buildingUserFields = {
 export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     location_name: {
         category: Category.Location,
-        title: "Building Name (Information link)",
-        tooltip: "Link to a website with information on the building, not needed for most.",
+        title: "Building Name (Non-domestic)",
+        tooltip: "Link to a website with the name of the building.<br/><br/>(For security reasons, we currently only collect the names of well-known public buildings.)",
         example: "https://en.wikipedia.org/wiki/Palace_of_Westminster",
     },
     location_number: {
@@ -152,13 +153,13 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     location_town: {
         category: Category.Location,
-        title: "Town",
+        title: "Town/City",
         example: "London",
         //tooltip: ,
     },
     location_postcode: {
         category: Category.Location,
-        title: "Postcode",
+        title: ccconfig.postcode,
         example: "W1W 6TR",
         //tooltip: ,
     },
@@ -198,18 +199,19 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     location_latitude: {
         category: Category.Location,
-        title: "Latitude",
+        title: "Centroid Latitude",
+        tooltip: "Latitude of Building Centroid",
         example: 12.4564,
     },
     location_longitude: {
         category: Category.Location,
-        title: "Longitude",
+        title: "Centroid Longitude",
+        tooltip: "Longitude of Building Centroid",
         example: 0.12124,
     },
-
     current_landuse_group: {
         category: Category.LandUse,
-        title: "Current Land Use (Group)",
+        title: "Current Land Use",
         tooltip: "Land use Groups as classified by [NLUD](https://www.gov.uk/government/statistics/national-land-use-database-land-use-and-land-cover-classification)",
         example: ["", ""],
     },
@@ -253,7 +255,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     building_attachment_form: {
         category: Category.Type,
-        title: "Adjacency/configuration",
+        title: "Attachment type/Adjacency",
         tooltip: "We have prepopulated these based on their current attachment. A building can either be detached, semi-detached or part of a terrace (middle or end)",
         example: "",
     },
@@ -273,17 +275,16 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip: "What was the building originally used for when it was built? I.e. If it was Victorian warehouse which is now an office this would be warehouse",
         example: "",
     },
-
     size_roof_shape: {
         category: Category.Type,
         title: "Roof type",
         example: "",
         //tooltip: ,
     },
-
     date_year: {
         category: Category.Age,
-        title: "Year built (best estimate)",
+        title: "Year of construction (best estimate)",
+        tooltip: "Best estimate for construction of main body of the building.",
         example: 1924,
     },
     date_lower : {
@@ -432,7 +433,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     sust_breeam_rating: {
         category: Category.Sustainability,
         title: "Official Environmental Quality Rating",
-        tooltip: "Building Research Establishment Environmental Assessment Method (BREEAM) May not be present for many buildings",
+        tooltip: ccconfig.energy_rating,
         example: "",
     },
     sust_dec: {
@@ -597,13 +598,18 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         example: true,
         //tooltip: ,
     },
-
     is_domestic: {
         category: Category.Team,
         title: "Is the building a home/domestic building?",
         tooltip: "",
         example: "mixed domestic/non-domestic"
     },
+    is_domestic_source: {
+        category: Category.Team,
+        title: "Domestic/non-domestic data source?",
+        tooltip: "",
+        example: ""
+    },
     likes_total: {
         category: Category.Community,
         title: "Total number of likes",
@@ -612,7 +618,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     community_type_worth_keeping_total: {
         category: Category.Community,
-        title: "People who think this type of building is contributes to the city.",
+        title: "People who think this type of building contributes to the city.",
         example: 100,
     },
     community_local_significance_total: {
@@ -704,7 +710,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     has_extension: {
         category: Category.Team,
-        title: "Is there an extension?",
+        title: "Was a later extension added?",
         tooltip: "",
         example: false
     },
@@ -787,18 +793,18 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     awards_source_link: {
         category: Category.Team,
-        title: "Source links for designer award(s)",
+        title: "Source link(s) for designer award(s)",
         tooltip: "URL for source for designer award(s)",
         example: ["", "", ""],
     },
     builder: {
         category: Category.Team,
-        title: "Name of builder/ construction team",
+        title: "Name of builder/construction team",
         example: ["", "", ""],
     },
     builder_source_link: {
         category: Category.Team,
-        title: "Source builder/ construction team",
+        title: "Source for builder/construction team",
         example: ["", "", ""],
     },
     other_team: {

From f43e5f60fe7e71cee19ae083ff2921de2452522f Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Fri, 12 May 2023 16:43:20 +0100
Subject: [PATCH 09/42] WIP Various tweaks to category pages

As discussed with Polly on 09/05/2023
---
 .../frontend/building/data-containers/age.tsx |   2 +-
 .../building/data-containers/community.tsx    |  16 +-
 .../building/data-containers/construction.tsx | 108 +++---
 .../building/data-containers/location.tsx     | 346 +++++++++---------
 .../building/data-containers/resilience.tsx   |   4 +-
 .../building/data-containers/size.tsx         |  29 ++
 .../building/data-containers/streetscape.tsx  |  33 +-
 .../data-containers/sustainability.tsx        |   5 +-
 .../building/data-containers/team.tsx         | 176 +++------
 .../building/data-containers/type.tsx         |  82 +++--
 .../frontend/building/data-containers/use.tsx | 219 +++++------
 11 files changed, 495 insertions(+), 525 deletions(-)

diff --git a/app/src/frontend/building/data-containers/age.tsx b/app/src/frontend/building/data-containers/age.tsx
index 7952327d..0cfe9d0c 100644
--- a/app/src/frontend/building/data-containers/age.tsx
+++ b/app/src/frontend/building/data-containers/age.tsx
@@ -47,7 +47,7 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
        ){
       return (
           <Fragment>
-            <DataEntryGroup name="Building Age" collapsed={true} >
+            <DataEntryGroup name="Building Age" collapsed={false} >
                 <YearDataEntry
                     year={props.building.date_year}
                     upper={props.building.date_upper}
diff --git a/app/src/frontend/building/data-containers/community.tsx b/app/src/frontend/building/data-containers/community.tsx
index f75de52b..491b3c00 100644
--- a/app/src/frontend/building/data-containers/community.tsx
+++ b/app/src/frontend/building/data-containers/community.tsx
@@ -41,13 +41,13 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const worthKeepingReasonsNonEmpty = Object.values(props.building.community_type_worth_keeping_reasons ?? {}).some(x => x);
     return <>
         <DataEntryGroup name="Community views on building types" collapsed={false} >
+        <InfoBox>
+            Note: We are not currently collecting data on domestic/privately owned properties, only on public buildings.
+        </InfoBox>
         <div className='community-opinion-pane'>
-            <InfoBox>
-                Here we are collecting data on how well you think specific types of building work (rather than individual buildings), to help ensure we save and reuse all useful buildings and to help improve urban design quality in future.
-            </InfoBox>
             {
-            /*
-            {(props.building.is_domestic === "no" || props.building.is_domestic === "mixed domestic/non-domestic") ?
+            
+            (props.building.is_domestic === "no" || props.building.is_domestic === "mixed domestic/non-domestic") ?
             <>
                 <UserOpinionEntry
                     slug='community_like'
@@ -59,13 +59,13 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     mode={props.mode}
                     copy={props.copy}
                 />
-                <button className={`map-switcher-inline ${props.mapColourScale == "likes" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToLikesMapStyle}>
+                <button className={`map-switcher-inline ${props.mapColourScale == "likes" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`}>
                     {(props.mapColourScale == "likes")? 'Showing likes for specific buildings' : 'Click to see likes for specific buildings mapped'}
                 </button>
                 </>
             : <></>}
-            */
-            }
+            
+            
             <LogicalDataEntryYesOnlyWithExplanation
                 slug='community_type_worth_keeping'
                 title={buildingUserFields.community_type_worth_keeping.title}
diff --git a/app/src/frontend/building/data-containers/construction.tsx b/app/src/frontend/building/data-containers/construction.tsx
index d105f1b1..5d85fcb5 100644
--- a/app/src/frontend/building/data-containers/construction.tsx
+++ b/app/src/frontend/building/data-containers/construction.tsx
@@ -7,6 +7,8 @@ import withCopyEdit from '../data-container';
 import Verification from '../data-components/verification';
 
 import { CategoryViewProps } from './category-view-props';
+import InfoBox from '../../components/info-box';
+import { DataEntryGroup } from '../data-components/data-entry-group';
 
 const ConstructionMaterialsOptions = [
     'Wood',
@@ -36,59 +38,63 @@ const RoofCoveringOptions = [
 const ConstructionView: React.FunctionComponent<CategoryViewProps> = (props) => {
     return (
          <Fragment>
-             <SelectDataEntry
-                title={dataFields.construction_core_material.title}
-                slug="construction_core_material"
-                value={props.building.construction_core_material}
-                tooltip={dataFields.construction_core_material.tooltip}
-                options={ConstructionMaterialsOptions}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-            />
-            <Verification
-                slug="construction_core_material"
-                allow_verify={props.user !== undefined && props.building.construction_core_material !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("construction_core_material")}
-                user_verified_as={props.user_verified.construction_core_material}
-                verified_count={props.building.verified.construction_core_material}
+            <DataEntryGroup name="Materials" collapsed={false}>
+                <SelectDataEntry
+                    title={dataFields.construction_core_material.title}
+                    slug="construction_core_material"
+                    value={props.building.construction_core_material}
+                    tooltip={dataFields.construction_core_material.tooltip}
+                    options={ConstructionMaterialsOptions}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
                 />
-            <SelectDataEntry
-                title={dataFields.construction_secondary_materials.title}
-                disabled={true}
-                slug="construction_secondary_materials"
-                value={props.building.construction_secondary_materials}
-                tooltip={dataFields.construction_secondary_materials.tooltip}
-                options={ConstructionMaterialsOptions}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-            />
-            <SelectDataEntry
-                title={dataFields.construction_roof_covering.title}
-                slug="construction_roof_covering"
-                value={props.building.construction_roof_covering}
-                tooltip={dataFields.construction_roof_covering.tooltip}
-                options={RoofCoveringOptions}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-            />
-            <Verification
-                slug="construction_roof_covering"
-                allow_verify={props.user !== undefined && props.building.construction_roof_covering !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("construction_roof_covering")}
-                user_verified_as={props.user_verified.construction_roof_covering}
-                verified_count={props.building.verified.construction_roof_covering}
+                <Verification
+                    slug="construction_core_material"
+                    allow_verify={props.user !== undefined && props.building.construction_core_material !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("construction_core_material")}
+                    user_verified_as={props.user_verified.construction_core_material}
+                    verified_count={props.building.verified.construction_core_material}
+                    />
+                <SelectDataEntry
+                    title={dataFields.construction_secondary_materials.title}
+                    disabled={true}
+                    slug="construction_secondary_materials"
+                    value={props.building.construction_secondary_materials}
+                    tooltip={dataFields.construction_secondary_materials.tooltip}
+                    options={ConstructionMaterialsOptions}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
                 />
-            <DataEntry
-                title="Construction system type"
-                slug=""
-                value=""
-                mode='view'
-            />
+                <SelectDataEntry
+                    title={dataFields.construction_roof_covering.title}
+                    slug="construction_roof_covering"
+                    value={props.building.construction_roof_covering}
+                    tooltip={dataFields.construction_roof_covering.tooltip}
+                    options={RoofCoveringOptions}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                />
+                <Verification
+                    slug="construction_roof_covering"
+                    allow_verify={props.user !== undefined && props.building.construction_roof_covering !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("construction_roof_covering")}
+                    user_verified_as={props.user_verified.construction_roof_covering}
+                    verified_count={props.building.verified.construction_roof_covering}
+                    />
+            </DataEntryGroup>
+            <DataEntryGroup name="Construction Sectors" collapsed={false}>
+                <DataEntry
+                    title="Construction system type"
+                    slug=""
+                    value=""
+                    mode='view'
+                />
+            </DataEntryGroup>
         </Fragment>
     );
 };
diff --git a/app/src/frontend/building/data-containers/location.tsx b/app/src/frontend/building/data-containers/location.tsx
index 3d4d8cfe..b0b5e555 100644
--- a/app/src/frontend/building/data-containers/location.tsx
+++ b/app/src/frontend/building/data-containers/location.tsx
@@ -10,6 +10,7 @@ import withCopyEdit from '../data-container';
 import { PatternDataEntry } from '../data-components/pattern-data-entry';
 
 import { CategoryViewProps } from './category-view-props';
+import { DataEntryGroup } from '../data-components/data-entry-group';
 
 const locationNumberPattern = "[1-9]\\d*[a-z]?(-([1-9]\\d*))?"; ///[1-9]\d*[a-z]?(-([1-9]\d*))?/;
 
@@ -25,7 +26,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
             tooltip={dataFields.location_name.tooltip}
             placeholder="https://..."
             isUrl={true}
-            />
+        />
         <Verification
             slug="location_name"
             allow_verify={props.user !== undefined && props.building.location_name !== null && !props.edited}
@@ -33,172 +34,187 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
             user_verified={props.user_verified.hasOwnProperty("location_name")}
             user_verified_as={props.user_verified.location_name}
             verified_count={props.building.verified.location_name}
-            />
-
-        <PatternDataEntry
-            title={dataFields.location_number.title}
-            slug="location_number"
-            value={props.building.location_number}
-            pattern={locationNumberPattern}
-            mode={props.mode}
-            copy={props.copy}
-            onChange={props.onChange}
-            tooltip={dataFields.location_number.tooltip}
-            />
-        <Verification
-            slug="location_number"
-            allow_verify={props.user !== undefined && props.building.location_number !== null && !props.edited}
-            onVerify={props.onVerify}
-            user_verified={props.user_verified.hasOwnProperty("location_number")}
-            user_verified_as={props.user_verified.location_number}
-            verified_count={props.building.verified.location_number}
-            />
-
+        />
         <DataEntry
-            title={dataFields.location_street.title}
-            slug="location_street"
-            value={props.building.location_street}
-            mode={props.mode}
-            copy={props.copy}
-            onChange={props.onChange}
-            maxLength={30}
-            />
-        <Verification
-            slug="location_street"
-            allow_verify={props.user !== undefined && props.building.location_street !== null && !props.edited}
-            onVerify={props.onVerify}
-            user_verified={props.user_verified.hasOwnProperty("location_street")}
-            user_verified_as={props.user_verified.location_street}
-            verified_count={props.building.verified.location_street}
-            />
-
-        <DataEntry
-            title={dataFields.location_line_two.title}
-            slug="location_line_two"
-            value={props.building.location_line_two}
-            mode={props.mode}
-            copy={props.copy}
-            onChange={props.onChange}
-            maxLength={30}
-            />
-        <Verification
-            slug="location_line_two"
-            allow_verify={props.user !== undefined && props.building.location_line_two !== null && !props.edited}
-            onVerify={props.onVerify}
-            user_verified={props.user_verified.hasOwnProperty("location_line_two")}
-            user_verified_as={props.user_verified.location_line_two}
-            verified_count={props.building.verified.location_line_two}
-            />
-        <DataEntry
-            title={dataFields.location_town.title}
-            slug="location_town"
-            value={props.building.location_town}
-            mode={props.mode}
-            copy={props.copy}
-            onChange={props.onChange}
-            
-            />
-        <Verification
-            slug="location_town"
-            allow_verify={props.user !== undefined && props.building.location_town !== null && !props.edited}
-            onVerify={props.onVerify}
-            user_verified={props.user_verified.hasOwnProperty("location_town")}
-            user_verified_as={props.user_verified.location_town}
-            verified_count={props.building.verified.location_town}
-            />
-        <DataEntry
-            title={dataFields.location_postcode.title}
-            slug="location_postcode"
-            value={props.building.location_postcode}
-            mode={props.mode}
-            copy={props.copy}
-            onChange={props.onChange}
-            maxLength={8}
-            valueTransform={x=>x.toUpperCase()}
-            
-            />
-        <Verification
-            slug="location_postcode"
-            allow_verify={props.user !== undefined && props.building.location_postcode !== null && !props.edited}
-            onVerify={props.onVerify}
-            user_verified={props.user_verified.hasOwnProperty("location_postcode")}
-            user_verified_as={props.user_verified.location_postcode}
-            verified_count={props.building.verified.location_postcode}
-            />
-        <DataEntry
-            title={dataFields.ref_toid.title}
-            slug="ref_toid"
-            value={props.building.ref_toid}
-            mode={props.mode}
-            copy={props.copy}
-            tooltip={dataFields.ref_toid.tooltip}
-            onChange={props.onChange}
-            
-            />
-        <UPRNsDataEntry
-            title={dataFields.uprns.title}
-            slug="ref_uprns"
-            value={props.building.uprns}
-            tooltip={dataFields.uprns.tooltip}
-            />
-        <DataEntry
-            title={dataFields.ref_osm_id.title}
-            slug="ref_osm_id"
-            value={props.building.ref_osm_id}
-            mode={props.mode}
-            copy={props.copy}
-            tooltip={dataFields.ref_osm_id.tooltip}
-            maxLength={20}
-            onChange={props.onChange}
-            />
-        <Verification
-            slug="ref_osm_id"
-            allow_verify={props.user !== undefined && props.building.ref_osm_id !== null && !props.edited}
-            onVerify={props.onVerify}
-            user_verified={props.user_verified.hasOwnProperty("ref_osm_id")}
-            user_verified_as={props.user_verified.ref_osm_id}
-            verified_count={props.building.verified.ref_osm_id}
-            />
-        <NumericDataEntry
-            title={dataFields.location_latitude.title}
-            slug="location_latitude"
-            value={props.building.location_latitude}
-            mode={props.mode}
-            copy={props.copy}
-            step={0.00001}
-            min={-90}
-            max={90}
-            placeholder="Latitude, e.g. 51.5467"
-            onChange={props.onChange}
-            />
-        <Verification
-            slug="location_latitude"
-            allow_verify={props.user !== undefined && props.building.location_latitude !== null && !props.edited}
-            onVerify={props.onVerify}
-            user_verified={props.user_verified.hasOwnProperty("location_latitude")}
-            user_verified_as={props.user_verified.location_latitude}
-            verified_count={props.building.verified.location_latitude}
-            />
-        <NumericDataEntry
-            title={dataFields.location_longitude.title}
-            slug="location_longitude"
-            value={props.building.location_longitude}
-            mode={props.mode}
-            copy={props.copy}
-            step={0.00001}
-            min={-180}
-            max={180}
-            placeholder="Longitude, e.g. -0.0586"
-            onChange={props.onChange}
-            />
-        <Verification
-            slug="location_longitude"
-            allow_verify={props.user !== undefined && props.building.location_longitude !== null && !props.edited}
-            onVerify={props.onVerify}
-            user_verified={props.user_verified.hasOwnProperty("location_longitude")}
-            user_verified_as={props.user_verified.location_longitude}
-            verified_count={props.building.verified.location_longitude}
+            title="Building Name (Domestic)"
+            slug=""
+            value=""
+            mode='view'
+            tooltip="Coming Soon"
+        />
+        <DataEntryGroup name="Address" collapsed={false}>
+            <PatternDataEntry
+                title={dataFields.location_number.title}
+                slug="location_number"
+                value={props.building.location_number}
+                pattern={locationNumberPattern}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.location_number.tooltip}
+                />
+            <Verification
+                slug="location_number"
+                allow_verify={props.user !== undefined && props.building.location_number !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("location_number")}
+                user_verified_as={props.user_verified.location_number}
+                verified_count={props.building.verified.location_number}
+                />
+            <DataEntry
+                title={dataFields.location_street.title}
+                slug="location_street"
+                value={props.building.location_street}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                maxLength={30}
+                />
+            <Verification
+                slug="location_street"
+                allow_verify={props.user !== undefined && props.building.location_street !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("location_street")}
+                user_verified_as={props.user_verified.location_street}
+                verified_count={props.building.verified.location_street}
+                />
+            <DataEntry
+                title={dataFields.location_line_two.title}
+                slug="location_line_two"
+                value={props.building.location_line_two}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                maxLength={30}
+                />
+            <Verification
+                slug="location_line_two"
+                allow_verify={props.user !== undefined && props.building.location_line_two !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("location_line_two")}
+                user_verified_as={props.user_verified.location_line_two}
+                verified_count={props.building.verified.location_line_two}
+                />
+            <DataEntry
+                title={dataFields.location_town.title}
+                slug="location_town"
+                value={props.building.location_town}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                />
+            <Verification
+                slug="location_town"
+                allow_verify={props.user !== undefined && props.building.location_town !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("location_town")}
+                user_verified_as={props.user_verified.location_town}
+                verified_count={props.building.verified.location_town}
+                />
+            <DataEntry
+                title={dataFields.location_postcode.title}
+                slug="location_postcode"
+                value={props.building.location_postcode}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                maxLength={8}
+                valueTransform={x=>x.toUpperCase()}
+                
+                />
+            <Verification
+                slug="location_postcode"
+                allow_verify={props.user !== undefined && props.building.location_postcode !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("location_postcode")}
+                user_verified_as={props.user_verified.location_postcode}
+                verified_count={props.building.verified.location_postcode}
+                />
+            <DataEntry
+                title="Address Source"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
             />
+        </DataEntryGroup>
+        <DataEntryGroup name="Other Location Data" collapsed={false}>
+            <DataEntry
+                title={dataFields.ref_toid.title}
+                slug="ref_toid"
+                value={props.building.ref_toid}
+                mode={props.mode}
+                copy={props.copy}
+                tooltip={dataFields.ref_toid.tooltip}
+                onChange={props.onChange}
+                />
+            <UPRNsDataEntry
+                title={dataFields.uprns.title}
+                slug="ref_uprns"
+                value={props.building.uprns}
+                tooltip={dataFields.uprns.tooltip}
+                />
+            <DataEntry
+                title={dataFields.ref_osm_id.title}
+                slug="ref_osm_id"
+                value={props.building.ref_osm_id}
+                mode={props.mode}
+                copy={props.copy}
+                tooltip={dataFields.ref_osm_id.tooltip}
+                maxLength={20}
+                onChange={props.onChange}
+                />
+            <Verification
+                slug="ref_osm_id"
+                allow_verify={props.user !== undefined && props.building.ref_osm_id !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("ref_osm_id")}
+                user_verified_as={props.user_verified.ref_osm_id}
+                verified_count={props.building.verified.ref_osm_id}
+                />
+            <NumericDataEntry
+                title={dataFields.location_latitude.title}
+                slug="location_latitude"
+                value={props.building.location_latitude}
+                tooltip={dataFields.location_latitude.tooltip}
+                mode={props.mode}
+                copy={props.copy}
+                step={0.00001}
+                min={-90}
+                max={90}
+                placeholder="Latitude, e.g. 51.5467"
+                onChange={props.onChange}
+                />
+            <Verification
+                slug="location_latitude"
+                allow_verify={props.user !== undefined && props.building.location_latitude !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("location_latitude")}
+                user_verified_as={props.user_verified.location_latitude}
+                verified_count={props.building.verified.location_latitude}
+                />
+            <NumericDataEntry
+                title={dataFields.location_longitude.title}
+                slug="location_longitude"
+                value={props.building.location_longitude}
+                tooltip={dataFields.location_latitude.tooltip}
+                mode={props.mode}
+                copy={props.copy}
+                step={0.00001}
+                min={-180}
+                max={180}
+                placeholder="Longitude, e.g. -0.0586"
+                onChange={props.onChange}
+                />
+            <Verification
+                slug="location_longitude"
+                allow_verify={props.user !== undefined && props.building.location_longitude !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("location_longitude")}
+                user_verified_as={props.user_verified.location_longitude}
+                verified_count={props.building.verified.location_longitude}
+                />
+        </DataEntryGroup>
     </Fragment>
 );
 const LocationContainer = withCopyEdit(LocationView);
diff --git a/app/src/frontend/building/data-containers/resilience.tsx b/app/src/frontend/building/data-containers/resilience.tsx
index 828455b3..8c1cf54b 100644
--- a/app/src/frontend/building/data-containers/resilience.tsx
+++ b/app/src/frontend/building/data-containers/resilience.tsx
@@ -25,8 +25,8 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
     return (<>
         <DataEntryGroup name="Building Damage Assessment Tool" collapsed={true} >
             <InfoBox>
-            This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters. 
-            It is intended to help support emergency services, to record damage, and to aid reconstruction programmes.
+                This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters. 
+                It is intended to help support emergency services, to record damage, and to aid reconstruction programmes.
             </InfoBox>
             <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
                 {(historicData === 'enabled')?'Click here to hide disaster maps':'Click here to show disaster maps'}
diff --git a/app/src/frontend/building/data-containers/size.tsx b/app/src/frontend/building/data-containers/size.tsx
index d112a2ea..8e8a71db 100644
--- a/app/src/frontend/building/data-containers/size.tsx
+++ b/app/src/frontend/building/data-containers/size.tsx
@@ -9,12 +9,41 @@ import Verification from '../data-components/verification';
 import withCopyEdit from '../data-container';
 
 import { CategoryViewProps } from './category-view-props';
+import InfoBox from '../../components/info-box';
 
 /**
 * Size view/edit section
 */
 const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
     <Fragment>
+        <DataEntryGroup name="Plot Size">
+            <NumericDataEntry
+                title={dataFields.size_plot_area_total.title}
+                slug="size_plot_area_total"
+                mode='view'
+                step={0.1}
+                min={0}
+            />
+            <NumericDataEntry
+                title={dataFields.size_far_ratio.title}
+                slug="size_far_ratio"
+                mode='view'
+                step={0.1}
+                min={0}
+            />
+            <DataEntry
+                title="Plot dimensions"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Plot geometry link"
+                slug=""
+                value=""
+                mode='view'
+            />
+        </DataEntryGroup>
         <DataEntryGroup name="Floors">
             <NumericDataEntry
                 title={dataFields.size_storeys_core.title}
diff --git a/app/src/frontend/building/data-containers/streetscape.tsx b/app/src/frontend/building/data-containers/streetscape.tsx
index 5ef719ef..de78bbaf 100644
--- a/app/src/frontend/building/data-containers/streetscape.tsx
+++ b/app/src/frontend/building/data-containers/streetscape.tsx
@@ -13,43 +13,14 @@ import { CategoryViewProps } from './category-view-props';
 */
 const StreetscapeView: React.FunctionComponent<CategoryViewProps> = (props) => (
     <Fragment>
-        <InfoBox type='warning' msg="This is what we're planning to collect on the building's context" />
-        <ul className="data-list">
-            <li>Gardens</li>
-            <li>Trees</li>
-            <li>Green walls</li>
-            <li>Green roof</li>
-            <li>Proximity to parks and open greenspace</li>
-            <li>Building shading</li>
-        </ul>
-        <NumericDataEntry
-            title={dataFields.size_plot_area_total.title}
-            slug="size_plot_area_total"
-            mode='view'
-            step={0.1}
-            min={0}
-        />
-        <NumericDataEntry
-            title={dataFields.size_far_ratio.title}
-            slug="size_far_ratio"
-            mode='view'
-            step={0.1}
-            min={0}
-        />
         <DataEntry
-            title="Plot dimensions"
+            title="Does the building have a front garden?"
             slug=""
             value=""
             mode='view'
         />
         <DataEntry
-            title="Plot geometry link"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Does the building have a garden?"
+            title="Does the building have a back garden?"
             slug=""
             value=""
             mode='view'
diff --git a/app/src/frontend/building/data-containers/sustainability.tsx b/app/src/frontend/building/data-containers/sustainability.tsx
index 68ccf874..70b2d6e7 100644
--- a/app/src/frontend/building/data-containers/sustainability.tsx
+++ b/app/src/frontend/building/data-containers/sustainability.tsx
@@ -95,9 +95,6 @@ const SustainabilityView: React.FunctionComponent<CategoryViewProps> = (props) =
                 user_verified_as={props.user_verified.sust_retrofit_date}
                 verified_count={props.building.verified.sust_retrofit_date}
                 />
-            <InfoBox>
-                This section is under development.
-            </InfoBox>
             <DataEntry
                 title="Date of Significant Retrofits"
                 slug=""
@@ -119,7 +116,7 @@ const SustainabilityView: React.FunctionComponent<CategoryViewProps> = (props) =
                 mode='view'
             />
             <DataEntry
-                title="Green Walls / Green Roof / Shading"
+                title="Green Walls / Green Roof"
                 slug=""
                 value=""
                 mode='view'
diff --git a/app/src/frontend/building/data-containers/team.tsx b/app/src/frontend/building/data-containers/team.tsx
index 02236175..5a02509c 100644
--- a/app/src/frontend/building/data-containers/team.tsx
+++ b/app/src/frontend/building/data-containers/team.tsx
@@ -21,7 +21,59 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const currentBuildingConstructionYear = building.date_year || undefined;
       return (
        <form>
-          <InfoBox msg="Can you help us capture information on who built the current building?"></InfoBox>
+            <NumericDataEntry
+                slug='date_year'
+                title={dataFields.date_year.title}
+                value={currentBuildingConstructionYear}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                step={1}
+                min={1}
+                max={currentYear}
+                tooltip={dataFields.extension_year.tooltip}
+                />
+            <Verification
+                slug="date_year"
+                allow_verify={props.user !== undefined && props.building.date_year !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("date_year")}
+                user_verified_as={props.user_verified.date_year}
+                verified_count={props.building.verified.date_year}
+                />
+            <LogicalDataEntry
+                title={dataFields.has_extension.title}
+                slug="has_extension"
+                value={props.building.has_extension}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.has_extension.tooltip}
+                />
+            {props.building.has_extension ? (
+            <>
+                <NumericDataEntry
+                    slug='extension_year'
+                    title={dataFields.extension_year.title}
+                    value={props.building.extension_year}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    step={1}
+                    min={1}
+                    max={currentYear}
+                    tooltip={dataFields.extension_year.tooltip_extension}
+                />
+                <Verification
+                    slug="extension_year"
+                    allow_verify={props.user !== undefined && props.building.extension_year !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("extension_year")}
+                    user_verified_as={props.user_verified.extension_year}
+                    verified_count={props.building.verified.extension_year}
+                    />
+            </>
+            ) : (null)}
           <MultiDataEntry
               title={dataFields.landowner.title}
               slug="landowner"
@@ -53,67 +105,6 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
               editableEntries={true}
               isUrl={true}
               />
-          <Verification
-              slug="landowner_source_link"
-              allow_verify={props.user !== undefined && props.building.landowner_source_link !== null && !props.edited}
-              onVerify={props.onVerify}
-              user_verified={props.user_verified.hasOwnProperty("landowner_source_link")}
-              user_verified_as={props.user_verified.landowner_source_link}
-              verified_count={props.building.verified.landowner_source_link}
-              />
-          <NumericDataEntry
-              slug='date_year'
-              title={dataFields.date_year.title}
-              value={currentBuildingConstructionYear}
-              mode={props.mode}
-              copy={props.copy}
-              onChange={props.onChange}
-              step={1}
-              min={1}
-              max={currentYear}
-              tooltip={dataFields.extension_year.tooltip}
-          />
-          <Verification
-              slug="date_year"
-              allow_verify={props.user !== undefined && props.building.date_year !== null && !props.edited}
-              onVerify={props.onVerify}
-              user_verified={props.user_verified.hasOwnProperty("date_year")}
-              user_verified_as={props.user_verified.date_year}
-              verified_count={props.building.verified.date_year}
-              />
-          <LogicalDataEntry
-              title={dataFields.has_extension.title}
-              slug="has_extension"
-              value={props.building.has_extension}
-              mode={props.mode}
-              copy={props.copy}
-              onChange={props.onChange}
-              tooltip={dataFields.has_extension.tooltip}
-              />
-         {props.building.has_extension ? (
-          <>
-            <NumericDataEntry
-                slug='extension_year'
-                title={dataFields.extension_year.title}
-                value={props.building.extension_year}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                step={1}
-                min={1}
-                max={currentYear}
-                tooltip={dataFields.extension_year.tooltip_extension}
-            />
-            <Verification
-                slug="extension_year"
-                allow_verify={props.user !== undefined && props.building.extension_year !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("extension_year")}
-                user_verified_as={props.user_verified.extension_year}
-                verified_count={props.building.verified.extension_year}
-                />
-          </>
-        ) : (null)}
           <SelectDataEntry
               slug='developer_type'
               title={dataFields.developer_type.title}
@@ -162,14 +153,6 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
               editableEntries={true}
               isUrl={true}
               />
-          <Verification
-              slug="developer_source_link"
-              allow_verify={props.user !== undefined && props.building.developer_source_link !== null && !props.edited}
-              onVerify={props.onVerify}
-              user_verified={props.user_verified.hasOwnProperty("developer_source_link")}
-              user_verified_as={props.user_verified.developer_source_link}
-              verified_count={props.building.verified.developer_source_link}
-              />
           <MultiDataEntry
               title={dataFields.designers.title}
               slug="designers"
@@ -201,14 +184,6 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
               editableEntries={true}
               isUrl={true}
               />
-          <Verification
-              slug="designers_source_link"
-              allow_verify={props.user !== undefined && props.building.designers_source_link !== null && !props.edited}
-              onVerify={props.onVerify}
-              user_verified={props.user_verified.hasOwnProperty("designers_source_link")}
-              user_verified_as={props.user_verified.designers_source_link}
-              verified_count={props.building.verified.designers_source_link}
-              />
           <SelectDataEntry
               slug='lead_designer_type'
               title={dataFields.lead_designer_type.title}
@@ -297,51 +272,6 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
            editableEntries={true}
            isUrl={true}
            />
-       <Verification
-           slug="builder_source_link"
-           allow_verify={props.user !== undefined && props.building.builder_source_link !== null && !props.edited}
-           onVerify={props.onVerify}
-           user_verified={props.user_verified.hasOwnProperty("builder_source_link")}
-           user_verified_as={props.user_verified.builder_source_link}
-           verified_count={props.building.verified.builder_source_link}
-           />
-       <MultiDataEntry
-           title={dataFields.other_team.title}
-           slug="other_team"
-           value={props.building.other_team}
-           mode={props.mode}
-           copy={props.copy}
-           onChange={props.onChange}
-           placeholder=""
-           editableEntries={true}
-           />
-       <Verification
-           slug="other_team"
-           allow_verify={props.user !== undefined && props.building.other_team !== null && !props.edited}
-           onVerify={props.onVerify}
-           user_verified={props.user_verified.hasOwnProperty("other_team")}
-           user_verified_as={props.user_verified.other_team}
-           verified_count={props.building.verified.other_team}
-           />
-       <MultiDataEntry
-           title={dataFields.other_team_source_link.title}
-           slug="other_team_source_link"
-           value={props.building.other_team_source_link}
-           mode={props.mode}
-           copy={props.copy}
-           onChange={props.onChange}
-           placeholder="https://..."
-           editableEntries={true}
-           isUrl={true}
-           />
-       <Verification
-           slug="other_team_source_link"
-           allow_verify={props.user !== undefined && props.building.other_team_source_link !== null && !props.edited}
-           onVerify={props.onVerify}
-           user_verified={props.user_verified.hasOwnProperty("other_team_source_link")}
-           user_verified_as={props.user_verified.other_team_source_link}
-           verified_count={props.building.verified.other_team_source_link}
-           />
      </form>
     );
 };
diff --git a/app/src/frontend/building/data-containers/type.tsx b/app/src/frontend/building/data-containers/type.tsx
index d479faf4..019465e9 100644
--- a/app/src/frontend/building/data-containers/type.tsx
+++ b/app/src/frontend/building/data-containers/type.tsx
@@ -8,6 +8,7 @@ import Verification from '../data-components/verification';
 import withCopyEdit from '../data-container';
 
 import { CategoryViewProps } from './category-view-props';
+import InfoBox from '../../components/info-box';
 
 const AttachmentFormOptions = [
     "Detached",
@@ -22,42 +23,6 @@ const AttachmentFormOptions = [
 const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
     return (
         <Fragment>
-            <DataEntry
-                title="Base type classification"
-                slug=""
-                value=""
-                mode='view'
-            />
-            <DataEntry
-                title="Local typology/architectural style"
-                slug=""
-                value=""
-                mode='view'
-            />
-            <DataEntry
-                title={dataFields.original_building_use.title}
-                slug="original_building_use" // doesn't exist in database yet
-                tooltip={dataFields.original_building_use.tooltip}
-                value={undefined}
-                copy={props.copy}
-                mode={props.mode}
-                onChange={props.onChange}
-                disabled={true}
-            />
-            <SelectDataEntry
-                title={dataFields.size_roof_shape.title}
-                slug="size_roof_shape"
-                value={props.building.size_roof_shape}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                disabled={true}
-                options={[
-                    "Flat",
-                    "Pitched",
-                    "Other"
-                ]}
-            />
             <SelectDataEntry
                 title={dataFields.building_attachment_form.title}
                 slug="building_attachment_form"
@@ -76,7 +41,50 @@ const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 user_verified_as={props.user_verified.building_attachment_form}
                 verified_count={props.building.verified.building_attachment_form}
                 />
-
+            <DataEntry
+                title={dataFields.original_building_use.title}
+                slug="original_building_use" // doesn't exist in database yet
+                tooltip={dataFields.original_building_use.tooltip}
+                value={undefined}
+                copy={props.copy}
+                mode={props.mode}
+                onChange={props.onChange}
+                disabled={true}
+            />
+            <Verification
+                slug="building_attachment_form"
+                allow_verify={props.user !== undefined && props.building.building_attachment_form !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("building_attachment_form")}
+                user_verified_as={props.user_verified.building_attachment_form}
+                verified_count={props.building.verified.building_attachment_form}
+                />
+            <DataEntry
+                title="Local typology/architectural style"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Base type classification"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <SelectDataEntry
+                title={dataFields.size_roof_shape.title}
+                slug="size_roof_shape"
+                value={props.building.size_roof_shape}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                disabled={true}
+                options={[
+                    "Flat",
+                    "Pitched",
+                    "Other"
+                ]}
+            />
             <DataEntry
                 title="Local typology mutations"
                 slug=""
diff --git a/app/src/frontend/building/data-containers/use.tsx b/app/src/frontend/building/data-containers/use.tsx
index 6e98a5f3..1e7a451d 100644
--- a/app/src/frontend/building/data-containers/use.tsx
+++ b/app/src/frontend/building/data-containers/use.tsx
@@ -12,6 +12,7 @@ import withCopyEdit from '../data-container';
 import { CategoryViewProps } from './category-view-props';
 import Verification from '../data-components/verification';
 import { useDisplayPreferences } from '../../displayPreferences-context';
+import { DataEntryGroup } from '../data-components/data-entry-group';
 
 /**
  * Use view/edit section
@@ -24,109 +25,121 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const { darkLightTheme } = useDisplayPreferences();
       return (
           <Fragment>
-              <SelectDataEntry
-                  title={dataFields.is_domestic.title}
-                  slug="is_domestic"
-                  value={props.building.is_domestic}
-                  options={["yes", "no", "mixed domestic/non-domestic"]}
-                  mode={props.mode}
-                  copy={props.copy}
-                  onChange={props.onChange}
-                  tooltip={dataFields.is_domestic.tooltip}
-              />
-              <Verification
-                  slug="is_domestic"
-                  allow_verify={props.user !== undefined && props.building.is_domestic !== null && !props.edited}
-                  onVerify={props.onVerify}
-                  user_verified={props.user_verified.hasOwnProperty("is_domestic")}
-                  user_verified_as={props.user_verified.is_domestic}
-                  verified_count={props.building.verified.is_domestic}
-              />
-              Work from home does not count as office and does not make building non-domestic.
-              <button className={`map-switcher-inline ${props.mapColourScale == "is_domestic" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToIsDomesticMapStyle}>
-                    {(props.mapColourScale == "is_domestic")? 'Showing domestic status for specific buildings' : 'Click to see domestic status for specific buildings mapped'}
-                </button>
-              <InfoBox msg="93% of properties in UK are dwellings so we have set this as the default colour. Can you help us colour-in all non-residential and mixed use buildings, and verify residential buildings too?"></InfoBox>
-              <MultiDataEntry
-                  title={dataFields.current_landuse_group.title}
-                  slug="current_landuse_group"
-                  value={props.building.current_landuse_group}
-                  mode={props.mode}
-                  copy={props.copy}
-                  onChange={props.onChange}
-                  confirmOnEnter={true}
-                  tooltip={dataFields.current_landuse_group.tooltip}
-                  placeholder="Type new land use group here"
-                  copyable={true}
-                  autofill={true}
-                  showAllOptionsOnEmpty={true}
-              />
-              <Verification
-                  slug="current_landuse_group"
-                  allow_verify={props.user !== undefined && props.building.current_landuse_group !== null && !props.edited}
-                  onVerify={props.onVerify}
-                  user_verified={props.user_verified.hasOwnProperty("current_landuse_group")}
-                  user_verified_as={props.user_verified.current_landuse_group && props.user_verified.current_landuse_group.join(", ")}
-                  verified_count={props.building.verified.current_landuse_group}
-                  />
-              {
-                  props.mode != 'view' &&
-                  <InfoBox msg="Land use order, shown below, is automatically derived from the land use groups"></InfoBox>
-              }
-              <DataEntry
-                  title={dataFields.current_landuse_order.title}
-                  tooltip={dataFields.current_landuse_order.tooltip}
-                  slug="current_landuse_order"
-                  value={props.building.current_landuse_order}
-                  mode={props.mode}
-                  disabled={true}
-                  copy={props.copy}
-                  onChange={props.onChange}
-              />
-              <SelectDataEntry
-                  title={dataFields.current_landuse_source.title}
-                  slug="current_landuse_source"
-                  value={props.building.current_landuse_source}
-                  mode={props.mode}
-                  copy={props.copy}
-                  onChange={props.onChange}
-                  tooltip={dataFields.current_landuse_source.tooltip}
-                  placeholder={dataFields.current_landuse_source.example}
-                  options={dataFields.current_landuse_source.items}
-                  />
-              <Verification
-                  slug="current_landuse_source"
-                  allow_verify={props.user !== undefined && props.building.current_landuse_source !== null && !props.edited}
-                  onVerify={props.onVerify}
-                  user_verified={props.user_verified.hasOwnProperty("current_landuse_source")}
-                  user_verified_as={props.user_verified.current_landuse_source}
-                  verified_count={props.building.verified.current_landuse_source}
-                  />
-        {(props.building.current_landuse_source == "Expert/personal knowledge of building" ||
-            props.building.current_landuse_source == "Online streetview image" ||
-            props.building.current_landuse_source == null) ? <></> :
-            <><MultiDataEntry
-                title={dataFields.current_landuse_link.title}
-                slug="current_landuse_link"
-                value={props.building.current_landuse_link}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                tooltip={dataFields.current_landuse_link.tooltip}
-                placeholder="https://..."
-                editableEntries={true}
-                isUrl={true}
-                />
-            <Verification
-                slug="current_landuse_link"
-                allow_verify={props.user !== undefined && props.building.current_landuse_link !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("current_landuse_link")}
-                user_verified_as={props.user_verified.current_landuse_link}
-                verified_count={props.building.verified.current_landuse_link}
-                />
-            </>
-        }
+                <DataEntryGroup name="Domestic or non-domestic use" collapsed={false}>
+                    <InfoBox msg="93% of properties in UK are dwellings so we have set 'residential' as the default value. Can you help us identify non-residential and mixed use buildings (and verify residential buildings too)?"></InfoBox>
+                    <button className={`map-switcher-inline ${props.mapColourScale == "is_domestic" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToIsDomesticMapStyle}>
+                        {(props.mapColourScale == "is_domestic")? 'Showing domestic status for specific buildings' : 'Click to see domestic, non-domestic and mixed-use buildings'}
+                    </button>
+                    <SelectDataEntry
+                        title={dataFields.is_domestic.title}
+                        slug="is_domestic"
+                        value={props.building.is_domestic}
+                        options={["yes", "no", "mixed domestic/non-domestic"]}
+                        mode={props.mode}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                        tooltip={dataFields.is_domestic.tooltip}
+                    />
+                    <Verification
+                        slug="is_domestic"
+                        allow_verify={props.user !== undefined && props.building.is_domestic !== null && !props.edited}
+                        onVerify={props.onVerify}
+                        user_verified={props.user_verified.hasOwnProperty("is_domestic")}
+                        user_verified_as={props.user_verified.is_domestic}
+                        verified_count={props.building.verified.is_domestic}
+                    />
+                    <InfoBox type='warning'>Note: Work from home does not count as office and does not make building non-domestic.</InfoBox>
+                    <SelectDataEntry
+                        title={dataFields.is_domestic_source.title}
+                        slug="is_domestic_source"
+                        value={props.building.is_domestic}
+                        options={
+                            [
+                                "Citizen/passerby", 
+                                "Google or other photograph/satellite imagery", 
+                                "Government Record",
+                                "Other Record"
+                            ]
+                        }
+                        mode={props.mode}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                        tooltip={dataFields.is_domestic_source.tooltip}
+                    />
+                    <DataEntry
+                        title="Please provide a link to the data source"
+                        slug=""
+                        value=""
+                        mode='view'
+                        tooltip="Coming Soon"
+                    />
+                </DataEntryGroup>
+                <DataEntryGroup name="Specific Land Use" collapsed={false}>
+                    <MultiDataEntry
+                        title={dataFields.current_landuse_group.title}
+                        slug="current_landuse_group"
+                        value={props.building.current_landuse_group}
+                        mode={props.mode}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                        confirmOnEnter={true}
+                        tooltip={dataFields.current_landuse_group.tooltip}
+                        placeholder="Type new land use group here"
+                        copyable={true}
+                        autofill={true}
+                        showAllOptionsOnEmpty={true}
+                    />
+                    <Verification
+                        slug="current_landuse_group"
+                        allow_verify={props.user !== undefined && props.building.current_landuse_group !== null && !props.edited}
+                        onVerify={props.onVerify}
+                        user_verified={props.user_verified.hasOwnProperty("current_landuse_group")}
+                        user_verified_as={props.user_verified.current_landuse_group && props.user_verified.current_landuse_group.join(", ")}
+                        verified_count={props.building.verified.current_landuse_group}
+                        />
+                    <SelectDataEntry
+                        title={dataFields.current_landuse_source.title}
+                        slug="current_landuse_source"
+                        value={props.building.current_landuse_source}
+                        mode={props.mode}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                        tooltip={dataFields.current_landuse_source.tooltip}
+                        placeholder={dataFields.current_landuse_source.example}
+                        options={dataFields.current_landuse_source.items}
+                        />
+                    {(props.building.current_landuse_source == "Expert/personal knowledge of building" ||
+                        props.building.current_landuse_source == "Online streetview image" ||
+                        props.building.current_landuse_source == null) ? <></> :
+                        <><MultiDataEntry
+                            title={dataFields.current_landuse_link.title}
+                            slug="current_landuse_link"
+                            value={props.building.current_landuse_link}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.current_landuse_link.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                            />
+                        </>
+                    }
+                    {
+                        props.mode != 'view' &&
+                        <InfoBox msg="A more general classification for the land use of this building is automatically derived and shown below."></InfoBox>
+                    }
+                    <DataEntry
+                        title={dataFields.current_landuse_order.title}
+                        tooltip={dataFields.current_landuse_order.tooltip}
+                        slug="current_landuse_order"
+                        value={props.building.current_landuse_order}
+                        mode={props.mode}
+                        disabled={true}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                    />
+                </DataEntryGroup>
           </Fragment>
         );
 };

From d14dea3d1a3eaad87cb2c4a02b2089ccbcacb072 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 16 May 2023 17:08:21 +0100
Subject: [PATCH 10/42] More UI Tweaks

Mainly to improve consistency and readability across all categories/pages
Discussed in meeting with Polly 16/05
---
 .../data-components/data-entry-group.css      |   2 +
 app/src/frontend/building/data-container.css  |   2 +-
 app/src/frontend/building/data-container.tsx  |   2 +
 .../frontend/building/data-containers/age.tsx |  10 +-
 .../building/data-containers/community.tsx    |   4 +-
 .../building/data-containers/construction.tsx |   4 +-
 .../building/data-containers/location.tsx     |  74 ++-
 .../building/data-containers/planning.tsx     |   2 +-
 .../building/data-containers/size.tsx         | 232 ++++++---
 .../building/data-containers/streetscape.tsx  |  91 ++--
 .../data-containers/sustainability.tsx        | 186 +++----
 .../building/data-containers/team.tsx         | 490 +++++++++---------
 .../building/data-containers/type.tsx         | 214 ++++----
 .../frontend/building/data-containers/use.tsx |  32 +-
 app/src/frontend/config/categories-config.ts  |   4 +-
 app/src/frontend/config/data-fields-config.ts |  18 +-
 app/src/frontend/styles/layout.css            |   6 +-
 17 files changed, 788 insertions(+), 585 deletions(-)

diff --git a/app/src/frontend/building/data-components/data-entry-group.css b/app/src/frontend/building/data-components/data-entry-group.css
index 91cdf6ad..d264d85e 100644
--- a/app/src/frontend/building/data-components/data-entry-group.css
+++ b/app/src/frontend/building/data-components/data-entry-group.css
@@ -3,6 +3,8 @@
     position: relative;
     font-size: 1.1rem;
     font-weight: 410;
+    padding-top: 3px;
+    padding-bottom: 3px;
 }
 .data-entry-group-header .data-entry-group-title {
     padding-left: 0.6rem;
diff --git a/app/src/frontend/building/data-container.css b/app/src/frontend/building/data-container.css
index 17302468..b7cf52c9 100644
--- a/app/src/frontend/building/data-container.css
+++ b/app/src/frontend/building/data-container.css
@@ -1,7 +1,7 @@
 .edit-bar {
     position: sticky;
     top: 53px; /* match section-header height */
-    padding: 12px 0; /* match info-container-inner margin-top*/
+    padding: 3px 0 0 0; /* match info-container-inner margin-top*/
     width: 100%;
     background-color: white;
     z-index: 1000;
diff --git a/app/src/frontend/building/data-container.tsx b/app/src/frontend/building/data-container.tsx
index db1ca846..4b7f156c 100644
--- a/app/src/frontend/building/data-container.tsx
+++ b/app/src/frontend/building/data-container.tsx
@@ -413,7 +413,9 @@ const withCopyEdit: (wc: React.ComponentType<CategoryViewProps>) => DataContaine
                                                                 </button> :
                                                                 null
                                                         }
+                                                        <hr/>
                                                     </div>
+                                                    
                                             }
                                         </div>
                                         : null
diff --git a/app/src/frontend/building/data-containers/age.tsx b/app/src/frontend/building/data-containers/age.tsx
index 0cfe9d0c..09abab52 100644
--- a/app/src/frontend/building/data-containers/age.tsx
+++ b/app/src/frontend/building/data-containers/age.tsx
@@ -47,7 +47,7 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
        ){
       return (
           <Fragment>
-            <DataEntryGroup name="Building Age" collapsed={false} >
+            <DataEntryGroup name="Building Age">
                 <YearDataEntry
                     year={props.building.date_year}
                     upper={props.building.date_upper}
@@ -140,7 +140,7 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
                     {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
                 </button>
-                <DataEntryGroup collapsed={false} name="Constructions and demolitions on this site" showCount={false}>
+                <DataEntryGroup name="Constructions and demolitions on this site" showCount={false}>
                     <DynamicsBuildingPane>
                         <label>Current building (age data <Link to={ageLinkUrl}>editable here</Link>)</label>
                         <FieldRow>
@@ -261,7 +261,7 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
       };
     return (
         <Fragment>
-            <DataEntryGroup name="Building Age" collapsed={true} >
+            <DataEntryGroup name="Building Age">
                 <YearDataEntry
                     year={props.building.date_year}
                     upper={props.building.date_upper}
@@ -411,11 +411,11 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     mode='view'
                 />
             </DataEntryGroup>
-            <DataEntryGroup name="Lifespan and Site History" collapsed={true} >
+            <DataEntryGroup name="Lifespan and Site History">
                 <button className={`map-switcher-inline ${historicData} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
                     {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
                 </button>
-                <DataEntryGroup collapsed={false} name="Constructions and demolitions on this site" showCount={false}>
+                <DataEntryGroup name="Constructions and demolitions on this site" showCount={false}>
                     <DynamicsBuildingPane>
                         <label>Current building (age data <Link to={ageLinkUrl}>editable here</Link>)</label>
                         <FieldRow>
diff --git a/app/src/frontend/building/data-containers/community.tsx b/app/src/frontend/building/data-containers/community.tsx
index 491b3c00..2d92ad80 100644
--- a/app/src/frontend/building/data-containers/community.tsx
+++ b/app/src/frontend/building/data-containers/community.tsx
@@ -40,7 +40,7 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const { darkLightTheme } = useDisplayPreferences();
     const worthKeepingReasonsNonEmpty = Object.values(props.building.community_type_worth_keeping_reasons ?? {}).some(x => x);
     return <>
-        <DataEntryGroup name="Community views on building types" collapsed={false} >
+        <DataEntryGroup name="Community views on building types">
         <InfoBox>
             Note: We are not currently collecting data on domestic/privately owned properties, only on public buildings.
         </InfoBox>
@@ -151,7 +151,7 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
 
         </div>
         </DataEntryGroup>
-        <DataEntryGroup name="Building use for community activities" collapsed={false} >
+        <DataEntryGroup name="Building use for community activities">
         <InfoBox>
                 Here we are collecting information on the location of buildings used for community activities so we can track loss of/additions to community space over time
         </InfoBox>
diff --git a/app/src/frontend/building/data-containers/construction.tsx b/app/src/frontend/building/data-containers/construction.tsx
index 5d85fcb5..7455354e 100644
--- a/app/src/frontend/building/data-containers/construction.tsx
+++ b/app/src/frontend/building/data-containers/construction.tsx
@@ -38,7 +38,7 @@ const RoofCoveringOptions = [
 const ConstructionView: React.FunctionComponent<CategoryViewProps> = (props) => {
     return (
          <Fragment>
-            <DataEntryGroup name="Materials" collapsed={false}>
+            <DataEntryGroup name="Materials">
                 <SelectDataEntry
                     title={dataFields.construction_core_material.title}
                     slug="construction_core_material"
@@ -87,7 +87,7 @@ const ConstructionView: React.FunctionComponent<CategoryViewProps> = (props) =>
                     verified_count={props.building.verified.construction_roof_covering}
                     />
             </DataEntryGroup>
-            <DataEntryGroup name="Construction Sectors" collapsed={false}>
+            <DataEntryGroup name="Construction Sectors">
                 <DataEntry
                     title="Construction system type"
                     slug=""
diff --git a/app/src/frontend/building/data-containers/location.tsx b/app/src/frontend/building/data-containers/location.tsx
index b0b5e555..a0df37bf 100644
--- a/app/src/frontend/building/data-containers/location.tsx
+++ b/app/src/frontend/building/data-containers/location.tsx
@@ -16,33 +16,50 @@ const locationNumberPattern = "[1-9]\\d*[a-z]?(-([1-9]\\d*))?"; ///[1-9]\d*[a-z]
 
 const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
     <Fragment>
-        <DataEntry
-            title={dataFields.location_name.title}
-            slug="location_name"
-            value={props.building.location_name}
-            mode={props.mode}
-            copy={props.copy}
-            onChange={props.onChange}
-            tooltip={dataFields.location_name.tooltip}
-            placeholder="https://..."
-            isUrl={true}
-        />
-        <Verification
-            slug="location_name"
-            allow_verify={props.user !== undefined && props.building.location_name !== null && !props.edited}
-            onVerify={props.onVerify}
-            user_verified={props.user_verified.hasOwnProperty("location_name")}
-            user_verified_as={props.user_verified.location_name}
-            verified_count={props.building.verified.location_name}
-        />
-        <DataEntry
-            title="Building Name (Domestic)"
-            slug=""
-            value=""
-            mode='view'
-            tooltip="Coming Soon"
-        />
-        <DataEntryGroup name="Address" collapsed={false}>
+        
+        <DataEntryGroup name="Address Data">
+            <DataEntry
+                title={dataFields.location_name.title}
+                slug="location_name"
+                value={props.building.location_name}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.location_name.tooltip}
+                placeholder="https://..."
+                isUrl={true}
+            />
+            <Verification
+                slug="location_name"
+                allow_verify={props.user !== undefined && props.building.location_name !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("location_name")}
+                user_verified_as={props.user_verified.location_name}
+                verified_count={props.building.verified.location_name}
+            />
+            <DataEntry
+                title="Building Name (Domestic)"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Not yet activated.<br><br>For security reasons, we do not allow the use of free text boxes and are currently looking into alternative ways to collect this data."
+            />
+            <Verification
+                slug="location_name"
+                allow_verify={props.user !== undefined && props.building.location_name !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("location_name")}
+                user_verified_as={props.user_verified.location_name}
+                verified_count={props.building.verified.location_name}
+            />
+            <DataEntry
+                title="Building Name Source"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+            <hr/>
             <PatternDataEntry
                 title={dataFields.location_number.title}
                 slug="location_number"
@@ -138,7 +155,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 tooltip="Coming Soon"
             />
         </DataEntryGroup>
-        <DataEntryGroup name="Other Location Data" collapsed={false}>
+        <DataEntryGroup name="Property/Footprint IDs and Coordinate Data">
             <DataEntry
                 title={dataFields.ref_toid.title}
                 slug="ref_toid"
@@ -147,6 +164,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 copy={props.copy}
                 tooltip={dataFields.ref_toid.tooltip}
                 onChange={props.onChange}
+                disabled={true}
                 />
             <UPRNsDataEntry
                 title={dataFields.uprns.title}
diff --git a/app/src/frontend/building/data-containers/planning.tsx b/app/src/frontend/building/data-containers/planning.tsx
index 0fe4ea31..370d51f3 100644
--- a/app/src/frontend/building/data-containers/planning.tsx
+++ b/app/src/frontend/building/data-containers/planning.tsx
@@ -66,7 +66,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
     return (
     <Fragment>
         <DataEntryGroup name="Planning application information" collapsed={true} >
-            <DataEntryGroup name="Current/active applications (official data)" collapsed={false} >
+            <DataEntryGroup name="Current/active applications (official data)">
                 <InfoBox>
                     This section provides data on active applications. We define these as applications with any activity in the last year.
                     <br />
diff --git a/app/src/frontend/building/data-containers/size.tsx b/app/src/frontend/building/data-containers/size.tsx
index 8e8a71db..a4e428be 100644
--- a/app/src/frontend/building/data-containers/size.tsx
+++ b/app/src/frontend/building/data-containers/size.tsx
@@ -16,35 +16,7 @@ import InfoBox from '../../components/info-box';
 */
 const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
     <Fragment>
-        <DataEntryGroup name="Plot Size">
-            <NumericDataEntry
-                title={dataFields.size_plot_area_total.title}
-                slug="size_plot_area_total"
-                mode='view'
-                step={0.1}
-                min={0}
-            />
-            <NumericDataEntry
-                title={dataFields.size_far_ratio.title}
-                slug="size_far_ratio"
-                mode='view'
-                step={0.1}
-                min={0}
-            />
-            <DataEntry
-                title="Plot dimensions"
-                slug=""
-                value=""
-                mode='view'
-            />
-            <DataEntry
-                title="Plot geometry link"
-                slug=""
-                value=""
-                mode='view'
-            />
-        </DataEntryGroup>
-        <DataEntryGroup name="Floors">
+        <DataEntryGroup name="Number of floors/storeys">
             <NumericDataEntry
                 title={dataFields.size_storeys_core.title}
                 slug="size_storeys_core"
@@ -64,7 +36,6 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.size_storeys_core}
                 verified_count={props.building.verified.size_storeys_core}
                 />
-
             <NumericDataEntry
                 title={dataFields.size_storeys_attic.title}
                 slug="size_storeys_attic"
@@ -84,7 +55,6 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.size_storeys_attic}
                 verified_count={props.building.verified.size_storeys_attic}
                 />
-
             <NumericDataEntry
                 title={dataFields.size_storeys_basement.title}
                 slug="size_storeys_basement"
@@ -104,9 +74,22 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.size_storeys_basement}
                 verified_count={props.building.verified.size_storeys_basement}
                 />
-
+            <DataEntry
+                title="Source type"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+            <DataEntry
+                title="Source link"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
         </DataEntryGroup>
-        <DataEntryGroup name="Height" collapsed={false}>
+        <DataEntryGroup name="Building height data">
             <NumericDataEntry
                 title={dataFields.size_height_apex.title}
                 slug="size_height_apex"
@@ -125,7 +108,21 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.size_height_apex}
                 verified_count={props.building.verified.size_height_apex}
                 />
-
+            <DataEntry
+                title="Source type"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+            <DataEntry
+                title="Source link"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+            <hr/>
             <NumericDataEntry
                 title={dataFields.size_height_eaves.title}
                 slug="size_height_eaves"
@@ -137,8 +134,22 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 step={0.1}
                 min={0}
                 />
+            <DataEntry
+                title="Source type"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+            <DataEntry
+                title="Source link"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
         </DataEntryGroup>
-        <DataEntryGroup name="Floor area">
+        <DataEntryGroup name="Floor area data">
             <NumericDataEntry
                 title={dataFields.size_floor_area_ground.title}
                 slug="size_floor_area_ground"
@@ -157,7 +168,6 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.size_floor_area_ground}
                 verified_count={props.building.verified.size_floor_area_ground}
                 />
-
             <NumericDataEntry
                 title={dataFields.size_floor_area_total.title}
                 slug="size_floor_area_total"
@@ -176,33 +186,135 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.size_floor_area_total}
                 verified_count={props.building.verified.size_floor_area_total}
                 />
-
+            <DataEntry
+                title="Source link"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+                />
         </DataEntryGroup>
-        <NumericDataEntry
-            title={dataFields.size_width_frontage.title}
-            slug="size_width_frontage"
-            value={props.building.size_width_frontage}
-            mode={props.mode}
-            copy={props.copy}
-            onChange={props.onChange}
-            step={0.1}
-            min={0}
+        <DataEntryGroup name="Plot size data">
+            <NumericDataEntry
+                title={dataFields.size_plot_area_total.title}
+                slug="size_plot_area_total"
+                mode='view'
+                step={0.1}
+                min={0}
             />
-        <Verification
-            slug="size_width_frontage"
-            allow_verify={props.user !== undefined && props.building.size_width_frontage !== null}
-            onVerify={props.onVerify}
-            user_verified={props.user_verified.hasOwnProperty("size_width_frontage")}
-            user_verified_as={props.user_verified.size_width_frontage}
-            verified_count={props.building.verified.size_width_frontage}
+            <DataEntry
+                title="Source type"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
             />
-
-        <DataEntry
-            title="Total opening area"
-            slug=""
-            value=""
-            mode='view'
-        />
+            <DataEntry
+                title="Source link"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+            <hr/>
+            <NumericDataEntry
+                title={dataFields.size_far_ratio.title}
+                slug="size_far_ratio"
+                mode='view'
+                step={0.1}
+                min={0}
+            />
+            <DataEntry
+                title="Source type"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+            <DataEntry
+                title="Source link"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+            <hr/>
+            <DataEntry
+                title="Plot dimensions"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Source type"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+            <DataEntry
+                title="Source link"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+            <hr/>
+            <DataEntry
+                title="Land parcel geometry link"
+                slug=""
+                value=""
+                mode='view'
+                tooltip='INSPIRE Polygons'
+            />
+            <DataEntry
+                title="Source type"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+            <DataEntry
+                title="Source link"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+            <hr/>
+            <NumericDataEntry
+                title={dataFields.size_width_frontage.title}
+                slug="size_width_frontage"
+                value={props.building.size_width_frontage}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                step={0.1}
+                min={0}
+                />
+            <Verification
+                slug="size_width_frontage"
+                allow_verify={props.user !== undefined && props.building.size_width_frontage !== null}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("size_width_frontage")}
+                user_verified_as={props.user_verified.size_width_frontage}
+                verified_count={props.building.verified.size_width_frontage}
+                />
+            <DataEntry
+                title="Source type"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+            <DataEntry
+                title="Source link"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+            />
+        </DataEntryGroup>
     </Fragment>
 );
 const SizeContainer = withCopyEdit(SizeView);
diff --git a/app/src/frontend/building/data-containers/streetscape.tsx b/app/src/frontend/building/data-containers/streetscape.tsx
index de78bbaf..bb92c118 100644
--- a/app/src/frontend/building/data-containers/streetscape.tsx
+++ b/app/src/frontend/building/data-containers/streetscape.tsx
@@ -7,54 +7,61 @@ import NumericDataEntry from '../data-components/numeric-data-entry';
 import withCopyEdit from '../data-container';
 
 import { CategoryViewProps } from './category-view-props';
+import { DataEntryGroup } from '../data-components/data-entry-group';
 
 /**
 * Streetscape view/edit section
 */
 const StreetscapeView: React.FunctionComponent<CategoryViewProps> = (props) => (
     <Fragment>
-        <DataEntry
-            title="Does the building have a front garden?"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Does the building have a back garden?"
-            slug=""
-            value=""
-            mode='view'
-        />
-        <DataEntry
-            title="Street width"
-            slug=""
-            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'
-        />
+        <DataEntryGroup name="Does the building have a garden(s)?">
+            <DataEntry
+                title="Does the building have a front garden?"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Does the building have a back garden?"
+                slug=""
+                value=""
+                mode='view'
+            />
+        </DataEntryGroup>
+        <DataEntryGroup name="Street/pavement properties">
+            <DataEntry
+                title="Street width"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Pavement width"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Street network geometry link"
+                slug=""
+                value=""
+                mode='view'
+            />
+        </DataEntryGroup>
+        <DataEntryGroup name="Access to green space">
+            <DataEntry
+                title="Distance from public green space"
+                slug=""
+                value=""
+                mode='view'
+            />
+            <DataEntry
+                title="Distance from front door to nearest tree"
+                slug=""
+                value=""
+                mode='view'
+            />
+        </DataEntryGroup>
     </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 70b2d6e7..bf879871 100644
--- a/app/src/frontend/building/data-containers/sustainability.tsx
+++ b/app/src/frontend/building/data-containers/sustainability.tsx
@@ -9,6 +9,7 @@ import withCopyEdit from '../data-container';
 import InfoBox from '../../components/info-box';
 
 import { CategoryViewProps } from './category-view-props';
+import { DataEntryGroup } from '../data-components/data-entry-group';
 
 const EnergyCategoryOptions = ["A", "B", "C", "D", "E", "F", "G"];
 const BreeamRatingOptions = [
@@ -25,102 +26,107 @@ const BreeamRatingOptions = [
 const SustainabilityView: React.FunctionComponent<CategoryViewProps> = (props) => {
     return (
         <Fragment>
-            <SelectDataEntry
-                title={dataFields.sust_breeam_rating.title}
-                slug="sust_breeam_rating"
-                value={props.building.sust_breeam_rating}
-                tooltip={dataFields.sust_breeam_rating.tooltip}
-                options={BreeamRatingOptions}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-            />
-            <Verification
-                slug="sust_breeam_rating"
-                allow_verify={props.user !== undefined && props.building.sust_breeam_rating !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("sust_breeam_rating")}
-                user_verified_as={props.user_verified.sust_breeam_rating}
-                verified_count={props.building.verified.sust_breeam_rating}
+            <DataEntryGroup name="Energy rating data">
+                <SelectDataEntry
+                    title={dataFields.sust_breeam_rating.title}
+                    slug="sust_breeam_rating"
+                    value={props.building.sust_breeam_rating}
+                    tooltip={dataFields.sust_breeam_rating.tooltip}
+                    options={BreeamRatingOptions}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
                 />
+                <Verification
+                    slug="sust_breeam_rating"
+                    allow_verify={props.user !== undefined && props.building.sust_breeam_rating !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("sust_breeam_rating")}
+                    user_verified_as={props.user_verified.sust_breeam_rating}
+                    verified_count={props.building.verified.sust_breeam_rating}
+                    />
 
-            <SelectDataEntry
-                title={dataFields.sust_dec.title}
-                slug="sust_dec"
-                value={props.building.sust_dec}
-                tooltip={dataFields.sust_dec.tooltip}
-                options={EnergyCategoryOptions}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-            />
-            <Verification
-                slug="sust_dec"
-                allow_verify={props.user !== undefined && props.building.sust_dec !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("sust_dec")}
-                user_verified_as={props.user_verified.sust_dec}
-                verified_count={props.building.verified.sust_dec}
+                <SelectDataEntry
+                    title={dataFields.sust_dec.title}
+                    slug="sust_dec"
+                    value={props.building.sust_dec}
+                    tooltip={dataFields.sust_dec.tooltip}
+                    options={EnergyCategoryOptions}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
                 />
+                <Verification
+                    slug="sust_dec"
+                    allow_verify={props.user !== undefined && props.building.sust_dec !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("sust_dec")}
+                    user_verified_as={props.user_verified.sust_dec}
+                    verified_count={props.building.verified.sust_dec}
+                    />
 
-            <SelectDataEntry
-                title={dataFields.sust_aggregate_estimate_epc.title}
-                slug="sust_aggregate_estimate_epc"
-                value={props.building.sust_aggregate_estimate_epc}
-                tooltip={dataFields.sust_aggregate_estimate_epc.tooltip}
-                options={EnergyCategoryOptions}
-                disabled={true}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-            />
-
-            <NumericDataEntry
-                title={dataFields.sust_retrofit_date.title}
-                slug="sust_retrofit_date"
-                value={props.building.sust_retrofit_date}
-                tooltip={dataFields.sust_retrofit_date.tooltip}
-                step={1}
-                min={1086}
-                max={new Date().getFullYear()}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-            />
-            <Verification
-                slug="sust_retrofit_date"
-                allow_verify={props.user !== undefined && props.building.sust_retrofit_date !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("sust_retrofit_date")}
-                user_verified_as={props.user_verified.sust_retrofit_date}
-                verified_count={props.building.verified.sust_retrofit_date}
+                <SelectDataEntry
+                    title={dataFields.sust_aggregate_estimate_epc.title}
+                    slug="sust_aggregate_estimate_epc"
+                    value={props.building.sust_aggregate_estimate_epc}
+                    tooltip={dataFields.sust_aggregate_estimate_epc.tooltip}
+                    options={EnergyCategoryOptions}
+                    disabled={true}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
                 />
-            <DataEntry
-                title="Date of Significant Retrofits"
-                slug=""
-                value=""
-                mode='view'
-            />
-            <Verification
-                slug="date_link"
-                allow_verify={props.user !== undefined && props.building.date_link !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("date_link")}
-                user_verified_as={props.user_verified.date_link}
-                verified_count={props.building.verified.date_link}
+            </DataEntryGroup>
+            <DataEntryGroup name="Retrofit Data">
+                <NumericDataEntry
+                    title={dataFields.sust_retrofit_date.title}
+                    slug="sust_retrofit_date"
+                    value={props.building.sust_retrofit_date}
+                    tooltip={dataFields.sust_retrofit_date.tooltip}
+                    step={1}
+                    min={1086}
+                    max={new Date().getFullYear()}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
                 />
-            <DataEntry
-                title="Source"
-                slug=""
-                value=""
-                mode='view'
-            />
-            <DataEntry
-                title="Green Walls / Green Roof"
-                slug=""
-                value=""
-                mode='view'
-            />
+                <Verification
+                    slug="sust_retrofit_date"
+                    allow_verify={props.user !== undefined && props.building.sust_retrofit_date !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("sust_retrofit_date")}
+                    user_verified_as={props.user_verified.sust_retrofit_date}
+                    verified_count={props.building.verified.sust_retrofit_date}
+                    />
+                <DataEntry
+                    title="Date of Significant Retrofits"
+                    slug=""
+                    value=""
+                    mode='view'
+                />
+                <Verification
+                    slug="date_link"
+                    allow_verify={props.user !== undefined && props.building.date_link !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("date_link")}
+                    user_verified_as={props.user_verified.date_link}
+                    verified_count={props.building.verified.date_link}
+                    />
+                <DataEntry
+                    title="Source"
+                    slug=""
+                    value=""
+                    mode='view'
+                />
+            </DataEntryGroup>
+            <DataEntryGroup name="Other sustainability features">
+                <DataEntry
+                    title="Green Walls / Green Roof"
+                    slug=""
+                    value=""
+                    mode='view'
+                />
+            </DataEntryGroup>
         </Fragment>
     );
     };
diff --git a/app/src/frontend/building/data-containers/team.tsx b/app/src/frontend/building/data-containers/team.tsx
index 5a02509c..2c5ed2a1 100644
--- a/app/src/frontend/building/data-containers/team.tsx
+++ b/app/src/frontend/building/data-containers/team.tsx
@@ -21,257 +21,267 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const currentBuildingConstructionYear = building.date_year || undefined;
       return (
        <form>
-            <NumericDataEntry
-                slug='date_year'
-                title={dataFields.date_year.title}
-                value={currentBuildingConstructionYear}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                step={1}
-                min={1}
-                max={currentYear}
-                tooltip={dataFields.extension_year.tooltip}
-                />
-            <Verification
-                slug="date_year"
-                allow_verify={props.user !== undefined && props.building.date_year !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("date_year")}
-                user_verified_as={props.user_verified.date_year}
-                verified_count={props.building.verified.date_year}
-                />
-            <LogicalDataEntry
-                title={dataFields.has_extension.title}
-                slug="has_extension"
-                value={props.building.has_extension}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                tooltip={dataFields.has_extension.tooltip}
-                />
-            {props.building.has_extension ? (
-            <>
+            <DataEntryGroup name="Dates of construction/extension">
                 <NumericDataEntry
-                    slug='extension_year'
-                    title={dataFields.extension_year.title}
-                    value={props.building.extension_year}
+                    slug='date_year'
+                    title={dataFields.date_year.title}
+                    value={currentBuildingConstructionYear}
                     mode={props.mode}
                     copy={props.copy}
                     onChange={props.onChange}
                     step={1}
                     min={1}
                     max={currentYear}
-                    tooltip={dataFields.extension_year.tooltip_extension}
+                    tooltip={dataFields.extension_year.tooltip}
+                    />
+                <Verification
+                    slug="date_year"
+                    allow_verify={props.user !== undefined && props.building.date_year !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("date_year")}
+                    user_verified_as={props.user_verified.date_year}
+                    verified_count={props.building.verified.date_year}
+                    />
+                <LogicalDataEntry
+                    title={dataFields.has_extension.title}
+                    slug="has_extension"
+                    value={props.building.has_extension}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.has_extension.tooltip}
+                    />
+                {props.building.has_extension ? (
+                <>
+                    <NumericDataEntry
+                        slug='extension_year'
+                        title={dataFields.extension_year.title}
+                        value={props.building.extension_year}
+                        mode={props.mode}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                        step={1}
+                        min={1}
+                        max={currentYear}
+                        tooltip={dataFields.extension_year.tooltip_extension}
+                    />
+                    <Verification
+                        slug="extension_year"
+                        allow_verify={props.user !== undefined && props.building.extension_year !== null && !props.edited}
+                        onVerify={props.onVerify}
+                        user_verified={props.user_verified.hasOwnProperty("extension_year")}
+                        user_verified_as={props.user_verified.extension_year}
+                        verified_count={props.building.verified.extension_year}
+                        />
+                </>
+                ) : (null)}
+            </DataEntryGroup>
+            <DataEntryGroup name="Land ownership data">
+                <MultiDataEntry
+                    title={dataFields.landowner.title}
+                    slug="landowner"
+                    value={props.building.landowner}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.landowner.tooltip}
+                    placeholder=""
+                    editableEntries={true}
+                    />
+                <Verification
+                    slug="landowner"
+                    allow_verify={props.user !== undefined && props.building.landowner !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("landowner")}
+                    user_verified_as={props.user_verified.landowner}
+                    verified_count={props.building.verified.landowner}
+                    />
+                <MultiDataEntry
+                    title={dataFields.landowner_source_link.title}
+                    slug="landowner_source_link"
+                    value={props.building.landowner_source_link}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.landowner_source_link.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+            </DataEntryGroup>
+            <DataEntryGroup name="Developer data">
+                <SelectDataEntry
+                    slug='developer_type'
+                    title={dataFields.developer_type.title}
+                    value={props.building.developer_type}
+                    options={dataFields.developer_type.items}
+                    onChange={props.onChange}
+                    mode={props.mode}
+                    copy={props.copy}
                 />
                 <Verification
-                    slug="extension_year"
-                    allow_verify={props.user !== undefined && props.building.extension_year !== null && !props.edited}
+                    slug="developer_type"
+                    allow_verify={props.user !== undefined && props.building.developer_type !== null && !props.edited}
                     onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("extension_year")}
-                    user_verified_as={props.user_verified.extension_year}
-                    verified_count={props.building.verified.extension_year}
+                    user_verified={props.user_verified.hasOwnProperty("developer_type")}
+                    user_verified_as={props.user_verified.developer_type}
+                    verified_count={props.building.verified.developer_type}
                     />
-            </>
-            ) : (null)}
-          <MultiDataEntry
-              title={dataFields.landowner.title}
-              slug="landowner"
-              value={props.building.landowner}
-              mode={props.mode}
-              copy={props.copy}
-              onChange={props.onChange}
-              tooltip={dataFields.landowner.tooltip}
-              placeholder=""
-              editableEntries={true}
-              />
-          <Verification
-              slug="landowner"
-              allow_verify={props.user !== undefined && props.building.landowner !== null && !props.edited}
-              onVerify={props.onVerify}
-              user_verified={props.user_verified.hasOwnProperty("landowner")}
-              user_verified_as={props.user_verified.landowner}
-              verified_count={props.building.verified.landowner}
-              />
-          <MultiDataEntry
-              title={dataFields.landowner_source_link.title}
-              slug="landowner_source_link"
-              value={props.building.landowner_source_link}
-              mode={props.mode}
-              copy={props.copy}
-              onChange={props.onChange}
-              tooltip={dataFields.landowner_source_link.tooltip}
-              placeholder="https://..."
-              editableEntries={true}
-              isUrl={true}
-              />
-          <SelectDataEntry
-              slug='developer_type'
-              title={dataFields.developer_type.title}
-              value={props.building.developer_type}
-              options={dataFields.developer_type.items}
-              onChange={props.onChange}
-              mode={props.mode}
-              copy={props.copy}
-          />
-          <Verification
-              slug="developer_type"
-              allow_verify={props.user !== undefined && props.building.developer_type !== null && !props.edited}
-              onVerify={props.onVerify}
-              user_verified={props.user_verified.hasOwnProperty("developer_type")}
-              user_verified_as={props.user_verified.developer_type}
-              verified_count={props.building.verified.developer_type}
-              />
-          <MultiDataEntry
-              title={dataFields.developer_name.title}
-              slug="developer_name"
-              value={props.building.developer_name}
-              mode={props.mode}
-              copy={props.copy}
-              onChange={props.onChange}
-              tooltip={dataFields.developer_name.tooltip}
-              placeholder=""
-              editableEntries={true}
-              />
-          <Verification
-              slug="developer_name"
-              allow_verify={props.user !== undefined && props.building.developer_name !== null && !props.edited}
-              onVerify={props.onVerify}
-              user_verified={props.user_verified.hasOwnProperty("developer_name")}
-              user_verified_as={props.user_verified.developer_name}
-              verified_count={props.building.verified.developer_name}
-              />
-          <MultiDataEntry
-              title={dataFields.developer_source_link.title}
-              slug="developer_source_link"
-              value={props.building.developer_source_link}
-              mode={props.mode}
-              copy={props.copy}
-              onChange={props.onChange}
-              tooltip={dataFields.developer_source_link.tooltip}
-              placeholder="https://..."
-              editableEntries={true}
-              isUrl={true}
-              />
-          <MultiDataEntry
-              title={dataFields.designers.title}
-              slug="designers"
-              value={props.building.designers}
-              mode={props.mode}
-              copy={props.copy}
-              onChange={props.onChange}
-              tooltip={dataFields.designers.tooltip}
-              placeholder=""
-              editableEntries={true}
-              />
-          <Verification
-              slug="designers"
-              allow_verify={props.user !== undefined && props.building.designers !== null && !props.edited}
-              onVerify={props.onVerify}
-              user_verified={props.user_verified.hasOwnProperty("designers")}
-              user_verified_as={props.user_verified.designers}
-              verified_count={props.building.verified.designers}
-              />
-          <MultiDataEntry
-              title={dataFields.designers_source_link.title}
-              slug="designers_source_link"
-              value={props.building.designers_source_link}
-              mode={props.mode}
-              copy={props.copy}
-              onChange={props.onChange}
-              tooltip={dataFields.designers_source_link.tooltip}
-              placeholder="https://..."
-              editableEntries={true}
-              isUrl={true}
-              />
-          <SelectDataEntry
-              slug='lead_designer_type'
-              title={dataFields.lead_designer_type.title}
-              value={props.building.lead_designer_type}
-              options={dataFields.lead_designer_type.items}
-              onChange={props.onChange}
-              mode={props.mode}
-              copy={props.copy}
-          />
-          <Verification
-              slug="lead_designer_type"
-              allow_verify={props.user !== undefined && props.building.lead_designer_type !== null && !props.edited}
-              onVerify={props.onVerify}
-              user_verified={props.user_verified.hasOwnProperty("lead_designer_type")}
-              user_verified_as={props.user_verified.lead_designer_type}
-              verified_count={props.building.verified.lead_designer_type}
-              />
-          <LogicalDataEntryYesOnly
-              slug='designer_awards'
-              title={dataFields.designer_awards.title}
-              tooltip={dataFields.designer_awards.tooltip}
-              value={props.building.designer_awards}
-              copy={props.copy}
-              onChange={props.onChange}
-              mode={props.mode}
-          />
-          <Verification
-              slug="designer_awards"
-              allow_verify={props.user !== undefined && props.building.designer_awards !== null && !props.edited}
-              onVerify={props.onVerify}
-              user_verified={props.user_verified.hasOwnProperty("designer_awards")}
-              user_verified_as={props.user_verified.designer_awards}
-              verified_count={props.building.verified.designer_awards}
-              />
-        {props.building.designer_awards ? (
-          <>
-          <MultiDataEntry
-              title={dataFields.awards_source_link.title}
-              slug="awards_source_link"
-              value={props.building.awards_source_link}
-              mode={props.mode}
-              copy={props.copy}
-              onChange={props.onChange}
-              tooltip={dataFields.awards_source_link.tooltip}
-              placeholder="https://..."
-              editableEntries={true}
-              isUrl={true}
-              />
-          <Verification
-              slug="awards_source_link"
-              allow_verify={props.user !== undefined && props.building.awards_source_link !== null && !props.edited}
-              onVerify={props.onVerify}
-              user_verified={props.user_verified.hasOwnProperty("awards_source_link")}
-              user_verified_as={props.user_verified.awards_source_link}
-              verified_count={props.building.verified.awards_source_link}
-              />
-          </>
-        ) : (null)
-       }
-       <MultiDataEntry
-           title={dataFields.builder.title}
-           slug="builder"
-           value={props.building.builder}
-           mode={props.mode}
-           copy={props.copy}
-           onChange={props.onChange}
-           placeholder=""
-           editableEntries={true}
-           />
-       <Verification
-           slug="builder"
-           allow_verify={props.user !== undefined && props.building.builder !== null && !props.edited}
-           onVerify={props.onVerify}
-           user_verified={props.user_verified.hasOwnProperty("builder")}
-           user_verified_as={props.user_verified.builder}
-           verified_count={props.building.verified.builder}
-           />
-       <MultiDataEntry
-           title={dataFields.builder_source_link.title}
-           slug="builder_source_link"
-           value={props.building.builder_source_link}
-           mode={props.mode}
-           copy={props.copy}
-           onChange={props.onChange}
-           placeholder="https://..."
-           editableEntries={true}
-           isUrl={true}
-           />
+                <MultiDataEntry
+                    title={dataFields.developer_name.title}
+                    slug="developer_name"
+                    value={props.building.developer_name}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.developer_name.tooltip}
+                    placeholder=""
+                    editableEntries={true}
+                    />
+                <Verification
+                    slug="developer_name"
+                    allow_verify={props.user !== undefined && props.building.developer_name !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("developer_name")}
+                    user_verified_as={props.user_verified.developer_name}
+                    verified_count={props.building.verified.developer_name}
+                    />
+                <MultiDataEntry
+                    title={dataFields.developer_source_link.title}
+                    slug="developer_source_link"
+                    value={props.building.developer_source_link}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.developer_source_link.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+            </DataEntryGroup>
+            <DataEntryGroup name="Designer data">
+                <MultiDataEntry
+                    title={dataFields.designers.title}
+                    slug="designers"
+                    value={props.building.designers}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.designers.tooltip}
+                    placeholder=""
+                    editableEntries={true}
+                    />
+                <Verification
+                    slug="designers"
+                    allow_verify={props.user !== undefined && props.building.designers !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("designers")}
+                    user_verified_as={props.user_verified.designers}
+                    verified_count={props.building.verified.designers}
+                    />
+                <MultiDataEntry
+                    title={dataFields.designers_source_link.title}
+                    slug="designers_source_link"
+                    value={props.building.designers_source_link}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.designers_source_link.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                <SelectDataEntry
+                    slug='lead_designer_type'
+                    title={dataFields.lead_designer_type.title}
+                    value={props.building.lead_designer_type}
+                    options={dataFields.lead_designer_type.items}
+                    onChange={props.onChange}
+                    mode={props.mode}
+                    copy={props.copy}
+                />
+                <Verification
+                    slug="lead_designer_type"
+                    allow_verify={props.user !== undefined && props.building.lead_designer_type !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("lead_designer_type")}
+                    user_verified_as={props.user_verified.lead_designer_type}
+                    verified_count={props.building.verified.lead_designer_type}
+                    />
+                <LogicalDataEntryYesOnly
+                    slug='designer_awards'
+                    title={dataFields.designer_awards.title}
+                    tooltip={dataFields.designer_awards.tooltip}
+                    value={props.building.designer_awards}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    mode={props.mode}
+                />
+                <Verification
+                    slug="designer_awards"
+                    allow_verify={props.user !== undefined && props.building.designer_awards !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("designer_awards")}
+                    user_verified_as={props.user_verified.designer_awards}
+                    verified_count={props.building.verified.designer_awards}
+                    />
+                {props.building.designer_awards ? (
+                <>
+                <MultiDataEntry
+                    title={dataFields.awards_source_link.title}
+                    slug="awards_source_link"
+                    value={props.building.awards_source_link}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.awards_source_link.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                <Verification
+                    slug="awards_source_link"
+                    allow_verify={props.user !== undefined && props.building.awards_source_link !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("awards_source_link")}
+                    user_verified_as={props.user_verified.awards_source_link}
+                    verified_count={props.building.verified.awards_source_link}
+                    />
+                </>
+                ) : (null)
+            }
+            </DataEntryGroup>
+        <DataEntryGroup name="Builder data">
+            <MultiDataEntry
+                title={dataFields.builder.title}
+                slug="builder"
+                value={props.building.builder}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                placeholder=""
+                editableEntries={true}
+                />
+            <Verification
+                slug="builder"
+                allow_verify={props.user !== undefined && props.building.builder !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("builder")}
+                user_verified_as={props.user_verified.builder}
+                verified_count={props.building.verified.builder}
+                />
+            <MultiDataEntry
+                title={dataFields.builder_source_link.title}
+                slug="builder_source_link"
+                value={props.building.builder_source_link}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                placeholder="https://..."
+                editableEntries={true}
+                isUrl={true}
+                />
+        </DataEntryGroup>
      </form>
     );
 };
diff --git a/app/src/frontend/building/data-containers/type.tsx b/app/src/frontend/building/data-containers/type.tsx
index 019465e9..d341701c 100644
--- a/app/src/frontend/building/data-containers/type.tsx
+++ b/app/src/frontend/building/data-containers/type.tsx
@@ -9,6 +9,7 @@ import withCopyEdit from '../data-container';
 
 import { CategoryViewProps } from './category-view-props';
 import InfoBox from '../../components/info-box';
+import { DataEntryGroup } from '../data-components/data-entry-group';
 
 const AttachmentFormOptions = [
     "Detached",
@@ -23,98 +24,131 @@ const AttachmentFormOptions = [
 const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
     return (
         <Fragment>
-            <SelectDataEntry
-                title={dataFields.building_attachment_form.title}
-                slug="building_attachment_form"
-                value={props.building.building_attachment_form}
-                tooltip={dataFields.building_attachment_form.tooltip}
-                options={AttachmentFormOptions}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-            />
-            <Verification
-                slug="building_attachment_form"
-                allow_verify={props.user !== undefined && props.building.building_attachment_form !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("building_attachment_form")}
-                user_verified_as={props.user_verified.building_attachment_form}
-                verified_count={props.building.verified.building_attachment_form}
+            <DataEntryGroup name="Adjacency and Building Use Data">
+                <SelectDataEntry
+                    title={dataFields.building_attachment_form.title}
+                    slug="building_attachment_form"
+                    value={props.building.building_attachment_form}
+                    tooltip={dataFields.building_attachment_form.tooltip}
+                    options={AttachmentFormOptions}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
                 />
-            <DataEntry
-                title={dataFields.original_building_use.title}
-                slug="original_building_use" // doesn't exist in database yet
-                tooltip={dataFields.original_building_use.tooltip}
-                value={undefined}
-                copy={props.copy}
-                mode={props.mode}
-                onChange={props.onChange}
-                disabled={true}
-            />
-            <Verification
-                slug="building_attachment_form"
-                allow_verify={props.user !== undefined && props.building.building_attachment_form !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("building_attachment_form")}
-                user_verified_as={props.user_verified.building_attachment_form}
-                verified_count={props.building.verified.building_attachment_form}
+                <Verification
+                    slug="building_attachment_form"
+                    allow_verify={props.user !== undefined && props.building.building_attachment_form !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("building_attachment_form")}
+                    user_verified_as={props.user_verified.building_attachment_form}
+                    verified_count={props.building.verified.building_attachment_form}
+                    />
+                <DataEntry
+                    title="Source type"
+                    slug=""
+                    value=""
+                    mode='view'
+                    tooltip="Coming Soon"
                 />
-            <DataEntry
-                title="Local typology/architectural style"
-                slug=""
-                value=""
-                mode='view'
-            />
-            <DataEntry
-                title="Base type classification"
-                slug=""
-                value=""
-                mode='view'
-            />
-            <SelectDataEntry
-                title={dataFields.size_roof_shape.title}
-                slug="size_roof_shape"
-                value={props.building.size_roof_shape}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                disabled={true}
-                options={[
-                    "Flat",
-                    "Pitched",
-                    "Other"
-                ]}
-            />
-            <DataEntry
-                title="Local typology mutations"
-                slug=""
-                value=""
-                mode='view'
-            />
-            <DataEntry
-                title="3D procedural model classifications"
-                slug=""
-                value=""
-                mode='view'
-            />
-            <DataEntry
-                title="Dynamic tissue type classification"
-                slug=""
-                value=""
-                mode='view'
-            />
-            {/* <NumericDataEntry
-                title={dataFields.date_change_building_use.title}
-                slug="date_change_building_use"
-                value={props.building.date_change_building_use}
-                tooltip={dataFields.date_change_building_use.tooltip}
-                min={1086}
-                max={new Date().getFullYear()}
-                step={1}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-            /> */}
+                <DataEntry
+                    title="Source link"
+                    slug=""
+                    value=""
+                    mode='view'
+                    tooltip="Coming Soon"
+                />
+                <hr/>
+                <DataEntry
+                    title={dataFields.original_building_use.title}
+                    slug="original_building_use" // doesn't exist in database yet
+                    tooltip={dataFields.original_building_use.tooltip}
+                    value={undefined}
+                    copy={props.copy}
+                    mode={props.mode}
+                    onChange={props.onChange}
+                    disabled={true}
+                />
+                <Verification
+                    slug="building_attachment_form"
+                    allow_verify={props.user !== undefined && props.building.building_attachment_form !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("building_attachment_form")}
+                    user_verified_as={props.user_verified.building_attachment_form}
+                    verified_count={props.building.verified.building_attachment_form}
+                    />
+                <DataEntry
+                    title="Source type"
+                    slug=""
+                    value=""
+                    mode='view'
+                    tooltip="Coming Soon"
+                />
+                <DataEntry
+                    title="Source link"
+                    slug=""
+                    value=""
+                    mode='view'
+                    tooltip="Coming Soon"
+                />
+            </DataEntryGroup>
+            <DataEntryGroup name="Building Typology and Classification Data">
+                <DataEntry
+                    title="Local typology/architectural style"
+                    slug=""
+                    value=""
+                    mode='view'
+                />
+                <DataEntry
+                    title="Base type classification"
+                    slug=""
+                    value=""
+                    mode='view'
+                />
+                <SelectDataEntry
+                    title={dataFields.size_roof_shape.title}
+                    slug="size_roof_shape"
+                    value={props.building.size_roof_shape}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    disabled={true}
+                    options={[
+                        "Flat",
+                        "Pitched",
+                        "Other"
+                    ]}
+                />
+                <DataEntry
+                    title="Local typology mutations"
+                    slug=""
+                    value=""
+                    mode='view'
+                />
+                <DataEntry
+                    title="3D procedural model classifications"
+                    slug=""
+                    value=""
+                    mode='view'
+                />
+                <DataEntry
+                    title="Dynamic tissue type classification"
+                    slug=""
+                    value=""
+                    mode='view'
+                />
+                {/* <NumericDataEntry
+                    title={dataFields.date_change_building_use.title}
+                    slug="date_change_building_use"
+                    value={props.building.date_change_building_use}
+                    tooltip={dataFields.date_change_building_use.tooltip}
+                    min={1086}
+                    max={new Date().getFullYear()}
+                    step={1}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                /> */}
+            </DataEntryGroup>
         </Fragment>
     );
     };
diff --git a/app/src/frontend/building/data-containers/use.tsx b/app/src/frontend/building/data-containers/use.tsx
index 1e7a451d..259837b6 100644
--- a/app/src/frontend/building/data-containers/use.tsx
+++ b/app/src/frontend/building/data-containers/use.tsx
@@ -25,10 +25,14 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const { darkLightTheme } = useDisplayPreferences();
       return (
           <Fragment>
-                <DataEntryGroup name="Domestic or non-domestic use" collapsed={false}>
-                    <InfoBox msg="93% of properties in UK are dwellings so we have set 'residential' as the default value. Can you help us identify non-residential and mixed use buildings (and verify residential buildings too)?"></InfoBox>
+                <DataEntryGroup name="Domestic/non-domestic use data">
+                    <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
+                        <i>
+                            93% of properties in UK are residential dwellings so we have set 'residential' as the default value. Can you help us identify non-residential and mixed use buildings (and verify residential buildings too)?
+                        </i>
+                    </div>
                     <button className={`map-switcher-inline ${props.mapColourScale == "is_domestic" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToIsDomesticMapStyle}>
-                        {(props.mapColourScale == "is_domestic")? 'Showing domestic status for specific buildings' : 'Click to see domestic, non-domestic and mixed-use buildings'}
+                        {(props.mapColourScale == "is_domestic")? 'Showing domestic, non-domestic and mixed-use buildings (click to hide)' : 'Click to see domestic, non-domestic and mixed-use buildings on the map.'}
                     </button>
                     <SelectDataEntry
                         title={dataFields.is_domestic.title}
@@ -48,17 +52,18 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
                         user_verified_as={props.user_verified.is_domestic}
                         verified_count={props.building.verified.is_domestic}
                     />
-                    <InfoBox type='warning'>Note: Work from home does not count as office and does not make building non-domestic.</InfoBox>
                     <SelectDataEntry
                         title={dataFields.is_domestic_source.title}
                         slug="is_domestic_source"
                         value={props.building.is_domestic}
                         options={
                             [
-                                "Citizen/passerby", 
+                                "Expert knowledge", 
+                                "Observed from the street",
                                 "Google or other photograph/satellite imagery", 
-                                "Government Record",
-                                "Other Record"
+                                "Government/public record/database",
+                                "Independently managed record/database",
+                                "Other type of record/database"
                             ]
                         }
                         mode={props.mode}
@@ -67,14 +72,14 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
                         tooltip={dataFields.is_domestic_source.tooltip}
                     />
                     <DataEntry
-                        title="Please provide a link to the data source"
+                        title="Source link"
                         slug=""
                         value=""
                         mode='view'
                         tooltip="Coming Soon"
                     />
                 </DataEntryGroup>
-                <DataEntryGroup name="Specific Land Use" collapsed={false}>
+                <DataEntryGroup name="Specific land use data">
                     <MultiDataEntry
                         title={dataFields.current_landuse_group.title}
                         slug="current_landuse_group"
@@ -127,7 +132,14 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     }
                     {
                         props.mode != 'view' &&
-                        <InfoBox msg="A more general classification for the land use of this building is automatically derived and shown below."></InfoBox>
+                        <div>
+                            <hr/>
+                            <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
+                                <i>
+                                    Below is a more general classification for the land use of this building, automatically derived from the information above.
+                                </i>
+                            </div>
+                        </div>
                     }
                     <DataEntry
                         title={dataFields.current_landuse_order.title}
diff --git a/app/src/frontend/config/categories-config.ts b/app/src/frontend/config/categories-config.ts
index 3ab3f779..9adcdd1a 100644
--- a/app/src/frontend/config/categories-config.ts
+++ b/app/src/frontend/config/categories-config.ts
@@ -80,7 +80,7 @@ export const categoriesConfig: {[key in Category]: CategoryDefinition} = {
         slug: 'community',
         name: 'Community',
         aboutUrl: 'https://pages.colouring.london/community',
-        intro: 'This section collects data on how well citizens think specific *types* of building work (rather than individual buildings). This will help us save and reuse as many useful buildings as possible, and to help improve urban design quality in future.',
+        intro: 'This section collects data on how well citizens think specific *types* of building work. This will help us save/reuse as many useful buildings as possible, and help improve urban design quality in future.',
     },
     [Category.Planning]: {
         slug: 'planning',
@@ -98,7 +98,7 @@ export const categoriesConfig: {[key in Category]: CategoryDefinition} = {
         slug: 'type',
         name: 'Typology',
         aboutUrl: 'https://pages.colouring.london/buildingtypology',
-        intro: 'This section provides open data on the type of activities being carried out within buildings.',
+        intro: 'Note: This section is currently under development, we are working to activate it as soon as possible. This section provides open data on the typology of the building.',
     },
     [Category.LandUse]: {
         slug: 'use',
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index d5c23e08..9adda0bb 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -177,7 +177,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     uprns: {
         category: Category.Location,
         title: "Unique Property Reference Number(s) (UPRN)",
-        tooltip: "Unique Property Reference Numbers (to be filled automatically)",
+        tooltip: "Unique Property Reference Numbers (to be filled automatically) [<a href='https://beta.ordnancesurvey.co.uk/products/os-open-uprn'>LINK</a>]",
         example: [{uprn: "", parent_uprn: "" }, {uprn: "", parent_uprn: "" }],
     },
 
@@ -211,13 +211,13 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     current_landuse_group: {
         category: Category.LandUse,
-        title: "Current Land Use",
+        title: "Current land use(s)",
         tooltip: "Land use Groups as classified by [NLUD](https://www.gov.uk/government/statistics/national-land-use-database-land-use-and-land-cover-classification)",
         example: ["", ""],
     },
     current_landuse_order: {
         category: Category.LandUse,
-        title: "Current Land Use (Order)",
+        title: "Current land use (order)",
         tooltip: "Land use Order as classified by [NLUD](https://www.gov.uk/government/statistics/national-land-use-database-land-use-and-land-cover-classification)",
         example: "",
     },
@@ -272,7 +272,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     original_building_use: {
         category: Category.Type,
         title: "Original building use",
-        tooltip: "What was the building originally used for when it was built? I.e. If it was Victorian warehouse which is now an office this would be warehouse",
+        tooltip: "What was the building <u><i>originally</i></u> used for when it was built?",
         example: "",
     },
     size_roof_shape: {
@@ -290,7 +290,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     date_lower : {
         category: Category.Age,
         title: "Earliest possible start year",
-        tooltip: "This should be the earliest year in which building could have started.",
+        tooltip: "This should be the earliest year in which construction could have started.",
         example: 1900,
     },
     date_upper: {
@@ -362,13 +362,13 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         category: Category.Size,
         title: "Height to apex (m)",
         example: 100.5,
-        //tooltip: ,
+        tooltip: "i.e. the highest part of the roof.",
     },
     size_height_eaves: {
         category: Category.Size,
         title: "Height to eaves (m)",
         example: 20.33,
-        //tooltip: ,
+        tooltip: "i.e. to where the top of the wall meets the roof",
     },
     size_floor_area_ground: {
         category: Category.Size,
@@ -601,12 +601,12 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     is_domestic: {
         category: Category.Team,
         title: "Is the building a home/domestic building?",
-        tooltip: "",
+        tooltip: "Note: Homes used as offices for working from home should be classified as domestic.",
         example: "mixed domestic/non-domestic"
     },
     is_domestic_source: {
         category: Category.Team,
-        title: "Domestic/non-domestic data source?",
+        title: "Source type",
         tooltip: "",
         example: ""
     },
diff --git a/app/src/frontend/styles/layout.css b/app/src/frontend/styles/layout.css
index 6969c36c..a572e1df 100644
--- a/app/src/frontend/styles/layout.css
+++ b/app/src/frontend/styles/layout.css
@@ -50,9 +50,9 @@ article .color-block {
 hr {
     display: block;
     height: 1px;
-    border: 0;
-    background: #000;
+    border: none;
+    background-color: #ccc;
     width: 100%;
-    margin: 2em 0;
+    margin: 1.2em 0 1em 0;
     padding: 0;
 }

From 5297f153e1a98e0142b5e6c4818ca73649ca763a Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 16 May 2023 17:16:20 +0100
Subject: [PATCH 11/42] Rename files to match category titles

---
 .../data-containers/{age.tsx => age-history.tsx}       |  0
 .../{sustainability.tsx => energy-performance.tsx}     |  0
 .../building/data-containers/{use.tsx => land-use.tsx} |  0
 .../{streetscape.tsx => street-context.tsx}            |  0
 .../data-containers/{type.tsx => typology.tsx}         |  0
 app/src/frontend/config/category-ui-config.ts          | 10 +++++-----
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename app/src/frontend/building/data-containers/{age.tsx => age-history.tsx} (100%)
 rename app/src/frontend/building/data-containers/{sustainability.tsx => energy-performance.tsx} (100%)
 rename app/src/frontend/building/data-containers/{use.tsx => land-use.tsx} (100%)
 rename app/src/frontend/building/data-containers/{streetscape.tsx => street-context.tsx} (100%)
 rename app/src/frontend/building/data-containers/{type.tsx => typology.tsx} (100%)

diff --git a/app/src/frontend/building/data-containers/age.tsx b/app/src/frontend/building/data-containers/age-history.tsx
similarity index 100%
rename from app/src/frontend/building/data-containers/age.tsx
rename to app/src/frontend/building/data-containers/age-history.tsx
diff --git a/app/src/frontend/building/data-containers/sustainability.tsx b/app/src/frontend/building/data-containers/energy-performance.tsx
similarity index 100%
rename from app/src/frontend/building/data-containers/sustainability.tsx
rename to app/src/frontend/building/data-containers/energy-performance.tsx
diff --git a/app/src/frontend/building/data-containers/use.tsx b/app/src/frontend/building/data-containers/land-use.tsx
similarity index 100%
rename from app/src/frontend/building/data-containers/use.tsx
rename to app/src/frontend/building/data-containers/land-use.tsx
diff --git a/app/src/frontend/building/data-containers/streetscape.tsx b/app/src/frontend/building/data-containers/street-context.tsx
similarity index 100%
rename from app/src/frontend/building/data-containers/streetscape.tsx
rename to app/src/frontend/building/data-containers/street-context.tsx
diff --git a/app/src/frontend/building/data-containers/type.tsx b/app/src/frontend/building/data-containers/typology.tsx
similarity index 100%
rename from app/src/frontend/building/data-containers/type.tsx
rename to app/src/frontend/building/data-containers/typology.tsx
diff --git a/app/src/frontend/config/category-ui-config.ts b/app/src/frontend/config/category-ui-config.ts
index 8f828b8e..262098c6 100644
--- a/app/src/frontend/config/category-ui-config.ts
+++ b/app/src/frontend/config/category-ui-config.ts
@@ -1,17 +1,17 @@
 import { Category } from './categories-config';
 
-import AgeContainer from '../building/data-containers/age';
+import AgeContainer from '../building/data-containers/age-history';
 import CommunityContainer from '../building/data-containers/community';
 import ConstructionContainer from '../building/data-containers/construction';
 import ResilienceContainer from '../building/data-containers/resilience';
 import LocationContainer from '../building/data-containers/location';
 import PlanningContainer from '../building/data-containers/planning';
 import SizeContainer from '../building/data-containers/size';
-import StreetscapeContainer from '../building/data-containers/streetscape';
-import SustainabilityContainer from '../building/data-containers/sustainability';
+import StreetscapeContainer from '../building/data-containers/street-context';
+import SustainabilityContainer from '../building/data-containers/energy-performance';
 import TeamContainer from '../building/data-containers/team';
-import TypeContainer from '../building/data-containers/type';
-import UseContainer from '../building/data-containers/use';
+import TypeContainer from '../building/data-containers/typology';
+import UseContainer from '../building/data-containers/land-use';
 
 import { DataContainerType } from '../building/data-container';
 

From 3332395351a422121952ea9d923f0d35ca3d0729 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 16 May 2023 17:36:13 +0100
Subject: [PATCH 12/42] Update URLs and Slugs to match category titles

---
 app/src/frontend/components/logo.tsx          |  8 ++---
 app/src/frontend/config/categories-config.ts  | 30 +++++++++----------
 .../frontend/config/category-maps-config.ts   |  6 ++--
 app/src/frontend/config/category-ui-config.ts |  6 ++--
 app/src/frontend/config/data-fields-config.ts | 22 +++++++-------
 app/src/frontend/styles/colours.css           |  8 ++---
 6 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/app/src/frontend/components/logo.tsx b/app/src/frontend/components/logo.tsx
index 9436a99d..2ffb70de 100644
--- a/app/src/frontend/components/logo.tsx
+++ b/app/src/frontend/components/logo.tsx
@@ -30,18 +30,18 @@ const LogoGrid: React.FunctionComponent = () => (
     <div className="grid">
         <div className="row">
             <div className="cell background-location"></div>
-            <div className="cell background-use"></div>
-            <div className="cell background-type"></div>
+            <div className="cell background-land-use"></div>
+            <div className="cell background-typology"></div>
             <div className="cell background-age"></div>
         </div>
         <div className="row">
             <div className="cell background-size"></div>
             <div className="cell background-construction"></div>
-            <div className="cell background-streetscape"></div>
+            <div className="cell background-street-context"></div>
             <div className="cell background-team"></div>
         </div>
         <div className="row">
-            <div className="cell background-sustainability"></div>
+            <div className="cell background-energy-performance"></div>
             <div className="cell background-planning"></div>
             <div className="cell background-resilience"></div>
             <div className="cell background-community"></div>
diff --git a/app/src/frontend/config/categories-config.ts b/app/src/frontend/config/categories-config.ts
index 9adcdd1a..2a3083cc 100644
--- a/app/src/frontend/config/categories-config.ts
+++ b/app/src/frontend/config/categories-config.ts
@@ -4,15 +4,15 @@
  */
 export enum Category {
     Location = 'location',
-    LandUse = 'use',
-    Type = 'type',
-    Age = 'age',
+    LandUse = 'land-use',
+    Typology = 'typology',
     Size = 'size',
     Construction = 'construction',
-    Streetscape = 'streetscape',
+    Age = 'age',
+    StreetContext = 'street-context',
     Team = 'team',
     Planning = 'planning',
-    Sustainability = 'sustainability',
+    EnergyPerformance = 'energy-performance',
     Resilience = 'resilience',
     Community = 'community',
 }
@@ -25,14 +25,14 @@ export enum Category {
 export const categoriesOrder: Category[] = [
     Category.Location,
     Category.LandUse,
-    Category.Type,
+    Category.Typology,
     Category.Size,
     Category.Construction,
     Category.Age,
-    Category.Streetscape,
+    Category.StreetContext,
     Category.Team,
     Category.Planning,
-    Category.Sustainability,
+    Category.EnergyPerformance,
     Category.Resilience,
     Category.Community,
 ];
@@ -88,27 +88,27 @@ export const categoriesConfig: {[key in Category]: CategoryDefinition} = {
         aboutUrl: 'https://pages.colouring.london/planning',
         intro: 'This section provides open data on current and anticipated planning applications for buildings, planning zones and whether the building is protected.',
     },
-    [Category.Sustainability]: {
-        slug: 'sustainability',
+    [Category.EnergyPerformance]: {
+        slug: 'energy-performance',
         name: 'Energy Performance',
         aboutUrl: 'https://pages.colouring.london/sustainability',
         intro: 'This section provides open data on the energy performance of buildings, and on retrofit.',
     },
-    [Category.Type]: {
-        slug: 'type',
+    [Category.Typology]: {
+        slug: 'typology',
         name: 'Typology',
         aboutUrl: 'https://pages.colouring.london/buildingtypology',
         intro: 'Note: This section is currently under development, we are working to activate it as soon as possible. This section provides open data on the typology of the building.',
     },
     [Category.LandUse]: {
-        slug: 'use',
+        slug: 'land-use',
         name: 'Land Use',
         aboutUrl: 'https://pages.colouring.london/use',
         intro: 'How are buildings used, and how does use change over time?',
     },
-    [Category.Streetscape]: {
+    [Category.StreetContext]: {
         inactive: true,
-        slug: 'streetscape',
+        slug: 'street-context',
         name: 'Street Context',
         aboutUrl: 'https://pages.colouring.london/greenery',
         intro: "This section provides open data, and links to open data on streets, pavements, street blocks, land parcels and greenery/green spaces.",
diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index 203ce16f..f8f75e63 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -283,7 +283,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
             },
         }
     ],
-    [Category.Sustainability]: [{
+    [Category.EnergyPerformance]: [{
         mapStyle: 'sust_dec',
         legend: {
             title: 'Sustainability',
@@ -299,7 +299,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
             ]
         },
     }],
-    [Category.Type]: [{
+    [Category.Typology]: [{
         mapStyle: 'building_attachment_form',
         legend: {
             title: 'Adjacency/Configuration',
@@ -347,7 +347,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
             }
         }
     ],
-    [Category.Streetscape]: [{
+    [Category.StreetContext]: [{
         mapStyle: undefined,
         legend: {
             title: 'Street Context',
diff --git a/app/src/frontend/config/category-ui-config.ts b/app/src/frontend/config/category-ui-config.ts
index 262098c6..64d751e3 100644
--- a/app/src/frontend/config/category-ui-config.ts
+++ b/app/src/frontend/config/category-ui-config.ts
@@ -18,14 +18,14 @@ import { DataContainerType } from '../building/data-container';
 export const categoryUiConfig: {[key in Category]: DataContainerType} = {
     [Category.Location]: LocationContainer,
     [Category.LandUse]: UseContainer,
-    [Category.Type]: TypeContainer,
+    [Category.Typology]: TypeContainer,
     [Category.Age]: AgeContainer,
     [Category.Size]: SizeContainer,
     [Category.Construction]: ConstructionContainer,
-    [Category.Streetscape]: StreetscapeContainer,
+    [Category.StreetContext]: StreetscapeContainer,
     [Category.Team]: TeamContainer,
     [Category.Planning]: PlanningContainer,
-    [Category.Sustainability]: SustainabilityContainer,
+    [Category.EnergyPerformance]: SustainabilityContainer,
     [Category.Resilience]: ResilienceContainer,
     [Category.Community]: CommunityContainer,
 };
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 9adda0bb..daaa0761 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -254,13 +254,13 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         example: true,
     },
     building_attachment_form: {
-        category: Category.Type,
+        category: Category.Typology,
         title: "Attachment type/Adjacency",
         tooltip: "We have prepopulated these based on their current attachment. A building can either be detached, semi-detached or part of a terrace (middle or end)",
         example: "",
     },
     date_change_building_use: {
-        category: Category.Type,
+        category: Category.Typology,
         title:"When did use change?",
         tooltip: "This is the date the building stopped being used for for the function it was built for. I.e. if it was Victorian warehouse which is now an office this would be when it became an office or if it was something before that, maybe a garage then the date that happened",
         example: 1920,
@@ -270,13 +270,13 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
      * Slug needs to be adjusted if the db column will be named differently 
      */
     original_building_use: {
-        category: Category.Type,
+        category: Category.Typology,
         title: "Original building use",
         tooltip: "What was the building <u><i>originally</i></u> used for when it was built?",
         example: "",
     },
     size_roof_shape: {
-        category: Category.Type,
+        category: Category.Typology,
         title: "Roof type",
         example: "",
         //tooltip: ,
@@ -397,13 +397,13 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
 
     size_plot_area_total: {
-        category: Category.Streetscape,
+        category: Category.StreetContext,
         title: "Total area of plot (m²)",
         example: 123.02,
         //tooltip: ,
     },
     size_far_ratio: {
-        category: Category.Streetscape,
+        category: Category.StreetContext,
         title: "FAR ratio (percentage of plot covered by building)",
         example: 0.1,
         //tooltip: ,
@@ -431,31 +431,31 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
 
     sust_breeam_rating: {
-        category: Category.Sustainability,
+        category: Category.EnergyPerformance,
         title: "Official Environmental Quality Rating",
         tooltip: ccconfig.energy_rating,
         example: "",
     },
     sust_dec: {
-        category: Category.Sustainability,
+        category: Category.EnergyPerformance,
         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,
+        category: Category.EnergyPerformance,
         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 may be rented",
         example: "",
     },
     sust_retrofit_date: {
-        category: Category.Sustainability,
+        category: Category.EnergyPerformance,
         title: "Last significant retrofit",
         tooltip: "Date of last major building refurbishment",
         example: 1920,
     },
     sust_life_expectancy: {
-        category: Category.Sustainability,
+        category: Category.EnergyPerformance,
         title: "Expected lifespan for typology",
         example: 123,
         //tooltip: ,
diff --git a/app/src/frontend/styles/colours.css b/app/src/frontend/styles/colours.css
index 9c28b5f9..b1f2d753 100644
--- a/app/src/frontend/styles/colours.css
+++ b/app/src/frontend/styles/colours.css
@@ -59,10 +59,10 @@
 .background-location {
     background-color: #f7c625;
 }
-.background-use {
+.background-land-use {
     background-color: #f7ec25;
 }
-.background-type {
+.background-typology {
     background-color: #f77d11;
 }
 .background-age {
@@ -74,7 +74,7 @@
 .background-construction {
     background-color: #f2a2b9;
 }
-.background-streetscape {
+.background-street-context {
     background-color: #718899;
 }
 .background-team {
@@ -83,7 +83,7 @@
 .background-planning {
     background-color: #57c28e;
 }
-.background-sustainability {
+.background-energy-performance {
     background-color: #6bb1e3;
 }
 .background-resilience {

From a26b4f8d8656bb90eac2db456f6f6d4a5844ac65 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 16 May 2023 17:37:30 +0100
Subject: [PATCH 13/42] Run "npx browserslist@latest --update-db"

It's been nagging us to do this for ages!
---
 app/package-lock.json | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/package-lock.json b/app/package-lock.json
index f90f1098..bd06b938 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -4719,14 +4719,24 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001301",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001301.tgz",
-      "integrity": "sha512-csfD/GpHMqgEL3V3uIgosvh+SVIQvCh43SNu9HRbP1lnxkKm1kjDG4f32PP571JplkLjfS+mg2p1gxR7MYrrIA==",
+      "version": "1.0.30001487",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001487.tgz",
+      "integrity": "sha512-83564Z3yWGqXsh2vaH/mhXfEM0wX+NlBCm1jYHOb97TrTWJEmPTccZgeLTPBUUb0PNVo+oomb7wkimZBIERClA==",
       "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ]
     },
     "node_modules/canvas-confetti": {
       "version": "1.4.0",
@@ -23874,9 +23884,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001301",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001301.tgz",
-      "integrity": "sha512-csfD/GpHMqgEL3V3uIgosvh+SVIQvCh43SNu9HRbP1lnxkKm1kjDG4f32PP571JplkLjfS+mg2p1gxR7MYrrIA==",
+      "version": "1.0.30001487",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001487.tgz",
+      "integrity": "sha512-83564Z3yWGqXsh2vaH/mhXfEM0wX+NlBCm1jYHOb97TrTWJEmPTccZgeLTPBUUb0PNVo+oomb7wkimZBIERClA==",
       "dev": true
     },
     "canvas-confetti": {

From 71d21fb616a743e27c6f0b80513dbcb07573499f Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 17 May 2023 15:31:43 +0100
Subject: [PATCH 14/42] Fix bug where "save edits" box gets drawn over category
 title box

---
 app/src/frontend/building/data-container.css | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/frontend/building/data-container.css b/app/src/frontend/building/data-container.css
index b7cf52c9..77f9c6d1 100644
--- a/app/src/frontend/building/data-container.css
+++ b/app/src/frontend/building/data-container.css
@@ -1,7 +1,8 @@
 .edit-bar {
     position: sticky;
-    top: 53px; /* match section-header height */
-    padding: 3px 0 0 0; /* match info-container-inner margin-top*/
+    top: 54px; /* match section-header height */
+    margin-top: 5px;
+    padding: 0px 0 0 0; /* match info-container-inner margin-top*/
     width: 100%;
     background-color: white;
     z-index: 1000;
@@ -9,5 +10,5 @@
 
 .edit-bar .buttons-container {
     margin: 0;
-    padding: 0;
+    padding: 10px 0 0 0;
 }
\ No newline at end of file

From fdecc457c491dee9381c0068f803a4b28848ab1d Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 17 May 2023 15:34:32 +0100
Subject: [PATCH 15/42] Fix for text scrolling behind the "save edits" box

---
 app/src/frontend/building/data-container.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/frontend/building/data-container.css b/app/src/frontend/building/data-container.css
index 77f9c6d1..9a9dcda8 100644
--- a/app/src/frontend/building/data-container.css
+++ b/app/src/frontend/building/data-container.css
@@ -1,6 +1,6 @@
 .edit-bar {
     position: sticky;
-    top: 54px; /* match section-header height */
+    top: 53.5px; /* match section-header height */
     margin-top: 5px;
     padding: 0px 0 0 0; /* match info-container-inner margin-top*/
     width: 100%;

From 13cd09c7270b3d23167346654b75c854a7ed2999 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 17 May 2023 15:46:48 +0100
Subject: [PATCH 16/42] Consistent capitalisation on sub-categories/labels

---
 .../building/data-containers/age-history.tsx  | 12 +++----
 .../building/data-containers/construction.tsx |  2 +-
 .../building/data-containers/location.tsx     | 10 +++---
 .../building/data-containers/resilience.tsx   |  8 ++---
 .../building/data-containers/typology.tsx     |  4 +--
 app/src/frontend/config/data-fields-config.ts | 36 +++++++++----------
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/app/src/frontend/building/data-containers/age-history.tsx b/app/src/frontend/building/data-containers/age-history.tsx
index 09abab52..a6c5e661 100644
--- a/app/src/frontend/building/data-containers/age-history.tsx
+++ b/app/src/frontend/building/data-containers/age-history.tsx
@@ -47,7 +47,7 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
        ){
       return (
           <Fragment>
-            <DataEntryGroup name="Building Age">
+            <DataEntryGroup name="Building age">
                 <YearDataEntry
                     year={props.building.date_year}
                     upper={props.building.date_upper}
@@ -118,25 +118,25 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     This section is under development.
                 </InfoBox>
                 <DataEntry
-                    title="Cladding Date"
+                    title="Cladding date"
                     slug=""
                     value=""
                     mode='view'
                 />
                 <DataEntry
-                    title="Date of Significant Extensions"
+                    title="Date of significant extensions"
                     slug=""
                     value=""
                     mode='view'
                 />
                 <DataEntry
-                    title="Date of Significant Retrofits"
+                    title="Date of significant retrofits"
                     slug=""
                     value=""
                     mode='view'
                 />
             </DataEntryGroup>
-            <DataEntryGroup name="Lifespan and Site History" collapsed={true} >
+            <DataEntryGroup name="Lifespan and site history">
                 <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
                     {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
                 </button>
@@ -226,7 +226,7 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     Please let us know your suggestions on the <a href="https://discuss.colouring.london/t/dynamics-category-discussion/107">discussion forum</a>! (external link - save your edits first)
                 </InfoBox>
             </DataEntryGroup>
-            <DataEntryGroup name="Survival and Loss tracked using Historical Maps" collapsed={true} >
+            <DataEntryGroup name="Survival and loss tracked using historical maps" collapsed={true} >
                 <InfoBox>
                     Can you help us create a map that shows how many buildings in London have survived since the 1890s? 
                     Choose a colour to indicate whether the building has survived.
diff --git a/app/src/frontend/building/data-containers/construction.tsx b/app/src/frontend/building/data-containers/construction.tsx
index 7455354e..69f709a1 100644
--- a/app/src/frontend/building/data-containers/construction.tsx
+++ b/app/src/frontend/building/data-containers/construction.tsx
@@ -87,7 +87,7 @@ const ConstructionView: React.FunctionComponent<CategoryViewProps> = (props) =>
                     verified_count={props.building.verified.construction_roof_covering}
                     />
             </DataEntryGroup>
-            <DataEntryGroup name="Construction Sectors">
+            <DataEntryGroup name="Construction sectors">
                 <DataEntry
                     title="Construction system type"
                     slug=""
diff --git a/app/src/frontend/building/data-containers/location.tsx b/app/src/frontend/building/data-containers/location.tsx
index a0df37bf..3ee98e8e 100644
--- a/app/src/frontend/building/data-containers/location.tsx
+++ b/app/src/frontend/building/data-containers/location.tsx
@@ -17,7 +17,7 @@ const locationNumberPattern = "[1-9]\\d*[a-z]?(-([1-9]\\d*))?"; ///[1-9]\d*[a-z]
 const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
     <Fragment>
         
-        <DataEntryGroup name="Address Data">
+        <DataEntryGroup name="Address data">
             <DataEntry
                 title={dataFields.location_name.title}
                 slug="location_name"
@@ -38,7 +38,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 verified_count={props.building.verified.location_name}
             />
             <DataEntry
-                title="Building Name (Domestic)"
+                title="Building name (domestic)"
                 slug=""
                 value=""
                 mode='view'
@@ -53,7 +53,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 verified_count={props.building.verified.location_name}
             />
             <DataEntry
-                title="Building Name Source"
+                title="Source"
                 slug=""
                 value=""
                 mode='view'
@@ -148,14 +148,14 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 verified_count={props.building.verified.location_postcode}
                 />
             <DataEntry
-                title="Address Source"
+                title="Source"
                 slug=""
                 value=""
                 mode='view'
                 tooltip="Coming Soon"
             />
         </DataEntryGroup>
-        <DataEntryGroup name="Property/Footprint IDs and Coordinate Data">
+        <DataEntryGroup name="Property/footprint IDs and coordinate data">
             <DataEntry
                 title={dataFields.ref_toid.title}
                 slug="ref_toid"
diff --git a/app/src/frontend/building/data-containers/resilience.tsx b/app/src/frontend/building/data-containers/resilience.tsx
index 8c1cf54b..e5e69071 100644
--- a/app/src/frontend/building/data-containers/resilience.tsx
+++ b/app/src/frontend/building/data-containers/resilience.tsx
@@ -23,7 +23,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const [ endDate, setEndDate ] = useState(null);
 
     return (<>
-        <DataEntryGroup name="Building Damage Assessment Tool" collapsed={true} >
+        <DataEntryGroup name="Building damage assessment tool" collapsed={true} >
             <InfoBox>
                 This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters. 
                 It is intended to help support emergency services, to record damage, and to aid reconstruction programmes.
@@ -31,7 +31,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
             <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
                 {(historicData === 'enabled')?'Click here to hide disaster maps':'Click here to show disaster maps'}
             </button>
-            <p>Date of Disaster</p>
+            <p>Date of disaster</p>
             <div>
                 <DatePicker 
                     showIcon
@@ -42,7 +42,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     title={dataFields.disaster_start_date.title}
                     //value={props.building.disaster_start_date}
                     isClearable
-                    placeholderText="Select Start Date"
+                    placeholderText="Select start date"
                     maxDate={new Date()}
                 />
             </div>
@@ -56,7 +56,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     title={dataFields.disaster_end_date.title}
                     //value={props.building.disaster_end_date}
                     isClearable
-                    placeholderText="Select End Date"
+                    placeholderText="Select end date"
                     maxDate={new Date()}
                 />
             </div>
diff --git a/app/src/frontend/building/data-containers/typology.tsx b/app/src/frontend/building/data-containers/typology.tsx
index d341701c..01ab08f6 100644
--- a/app/src/frontend/building/data-containers/typology.tsx
+++ b/app/src/frontend/building/data-containers/typology.tsx
@@ -24,7 +24,7 @@ const AttachmentFormOptions = [
 const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
     return (
         <Fragment>
-            <DataEntryGroup name="Adjacency and Building Use Data">
+            <DataEntryGroup name="Adjacency and building use data">
                 <SelectDataEntry
                     title={dataFields.building_attachment_form.title}
                     slug="building_attachment_form"
@@ -91,7 +91,7 @@ const TypeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     tooltip="Coming Soon"
                 />
             </DataEntryGroup>
-            <DataEntryGroup name="Building Typology and Classification Data">
+            <DataEntryGroup name="Building typology and classification data">
                 <DataEntry
                     title="Local typology/architectural style"
                     slug=""
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index daaa0761..470e1386 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -129,7 +129,7 @@ export const buildingUserFields = {
 export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     location_name: {
         category: Category.Location,
-        title: "Building Name (Non-domestic)",
+        title: "Building name (non-domestic)",
         tooltip: "Link to a website with the name of the building.<br/><br/>(For security reasons, we currently only collect the names of well-known public buildings.)",
         example: "https://en.wikipedia.org/wiki/Palace_of_Westminster",
     },
@@ -153,7 +153,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     location_town: {
         category: Category.Location,
-        title: "Town/City",
+        title: "Town/city",
         example: "London",
         //tooltip: ,
     },
@@ -165,7 +165,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     ref_toid: {
         category: Category.Location,
-        title: "Building Footprint ID",
+        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: "",
     },
@@ -199,14 +199,14 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     location_latitude: {
         category: Category.Location,
-        title: "Centroid Latitude",
-        tooltip: "Latitude of Building Centroid",
+        title: "Centroid latitude",
+        tooltip: "Latitude of building centroid",
         example: 12.4564,
     },
     location_longitude: {
         category: Category.Location,
-        title: "Centroid Longitude",
-        tooltip: "Longitude of Building Centroid",
+        title: "Centroid longitude",
+        tooltip: "Longitude of building centroid",
         example: 0.12124,
     },
     current_landuse_group: {
@@ -244,7 +244,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     current_landuse_link: {
         category: Category.LandUse,
-        title: "Source Links",
+        title: "Source links",
         tooltip: "URL for current land use reference",
         example: ["", "", ""],
     },
@@ -255,7 +255,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     building_attachment_form: {
         category: Category.Typology,
-        title: "Attachment type/Adjacency",
+        title: "Attachment type/adjacency",
         tooltip: "We have prepopulated these based on their current attachment. A building can either be detached, semi-detached or part of a terrace (middle or end)",
         example: "",
     },
@@ -301,7 +301,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     facade_year: {
         category: Category.Age,
-        title: "Date of Front of Building",
+        title: "Date of front of building",
         tooltip: "Best estimate",
         example: 1900,
     },
@@ -342,19 +342,19 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
 
     size_storeys_core: {
         category: Category.Size,
-        title: "Core Number of Floors",
+        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: "Number of Floors within Roof Space",
+        title: "Number of floors within roof space",
         tooltip: "How many floors above start of roof?",
         example: 1,
     },
     size_storeys_basement: {
         category: Category.Size,
-        title: "Number of Floors beneath Ground Level",
+        title: "Number of floors beneath ground Level",
         tooltip: "How many floors below pavement level?",
         example: 1,
     },
@@ -384,7 +384,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     size_width_frontage: {
         category: Category.Size,
-        title: "Frontage Width (m)",
+        title: "Frontage width (m)",
         example: 12.2,
         //tooltip: ,
     },
@@ -411,28 +411,28 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
 
     construction_core_material: {
         category: Category.Construction,
-        title: "Core Material",
+        title: "Core material",
         tooltip:"The main structural material",
         example: "",
     },
 
     construction_secondary_materials: {
         category: Category.Construction,
-        title: "Main Secondary Construction Material/s",
+        title: "Main secondary construction material/s",
         tooltip:"Other construction materials",
         example: "",
     },
 
     construction_roof_covering: {
         category: Category.Construction,
-        title: "Main Roof Covering",
+        title: "Main roof covering",
         tooltip:'Main roof covering material',
         example: "",
     },
 
     sust_breeam_rating: {
         category: Category.EnergyPerformance,
-        title: "Official Environmental Quality Rating",
+        title: "Official environmental quality rating",
         tooltip: ccconfig.energy_rating,
         example: "",
     },

From 2ae1ff4d9aab81452013d34359b4f3169dd2a37b Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Thu, 18 May 2023 10:12:57 +0100
Subject: [PATCH 17/42] Adjust <hr> spacing

Less space at the top (under save edits button)
More space when used as a divider in the main menu
---
 .../frontend/building/data-components/data-entry-group.css    | 4 ++++
 app/src/frontend/styles/layout.css                            | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/frontend/building/data-components/data-entry-group.css b/app/src/frontend/building/data-components/data-entry-group.css
index d264d85e..57ef28d4 100644
--- a/app/src/frontend/building/data-components/data-entry-group.css
+++ b/app/src/frontend/building/data-components/data-entry-group.css
@@ -19,3 +19,7 @@
     padding-left: 1rem;
     padding-bottom: 1rem;
 }
+
+.data-entry-group-body hr {
+    margin: 1.5em 0 1.5em 0;
+}
diff --git a/app/src/frontend/styles/layout.css b/app/src/frontend/styles/layout.css
index a572e1df..bd357c74 100644
--- a/app/src/frontend/styles/layout.css
+++ b/app/src/frontend/styles/layout.css
@@ -53,6 +53,6 @@ hr {
     border: none;
     background-color: #ccc;
     width: 100%;
-    margin: 1.2em 0 1em 0;
+    margin: 1.0em 0 0.8em 0;
     padding: 0;
 }

From 6398426254de924124b8dc52b73782e034f01d4e Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Thu, 18 May 2023 11:16:18 +0100
Subject: [PATCH 18/42] Change red layer buttons to blue

---
 app/src/frontend/map/map-button.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/frontend/map/map-button.css b/app/src/frontend/map/map-button.css
index 0dc98676..b77c57d8 100644
--- a/app/src/frontend/map/map-button.css
+++ b/app/src/frontend/map/map-button.css
@@ -37,12 +37,12 @@
 .map-switcher-inline.disabled-state,
 .map-button.disabled-state,
 .map-button.disabled-state .btn{
-    background-color: #df7474;
+    background-color: #8c8fd9;
 }
 .map-switcher-inline.night.disabled-state,
 .map-button.night.disabled-state,
 .map-button.night.disabled-state .btn{
-    background-color: #b03f3f;
+    background-color: #333699;
 }
 .map-button.enabled-state {
     color: #75e775;

From 38d53f26c8b8e0eea373da92740469e6be535677 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Thu, 18 May 2023 11:31:37 +0100
Subject: [PATCH 19/42] Sidebar Tweaks

Add horizontal line at bottom
Change style of horizontal likes in menu
Remove minimum height (now all subcategories are closed by default)
---
 .../frontend/building/data-components/data-entry-group.css   | 1 +
 app/src/frontend/building/data-container.tsx                 | 2 ++
 app/src/frontend/building/sidebar.css                        | 4 ++--
 app/src/frontend/styles/layout.css                           | 5 ++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/frontend/building/data-components/data-entry-group.css b/app/src/frontend/building/data-components/data-entry-group.css
index 57ef28d4..6d83bb51 100644
--- a/app/src/frontend/building/data-components/data-entry-group.css
+++ b/app/src/frontend/building/data-components/data-entry-group.css
@@ -22,4 +22,5 @@
 
 .data-entry-group-body hr {
     margin: 1.5em 0 1.5em 0;
+    border: 1px dashed #ccc;
 }
diff --git a/app/src/frontend/building/data-container.tsx b/app/src/frontend/building/data-container.tsx
index 4b7f156c..c7817571 100644
--- a/app/src/frontend/building/data-container.tsx
+++ b/app/src/frontend/building/data-container.tsx
@@ -438,7 +438,9 @@ const withCopyEdit: (wc: React.ComponentType<CategoryViewProps>) => DataContaine
                             </form> :
                             <InfoBox msg="Select a building to view data"></InfoBox>
                 }
+                <hr/>
                 </div>
+                
                 </section>
             );
         }
diff --git a/app/src/frontend/building/sidebar.css b/app/src/frontend/building/sidebar.css
index 37e27bd1..fbbc0c44 100644
--- a/app/src/frontend/building/sidebar.css
+++ b/app/src/frontend/building/sidebar.css
@@ -100,8 +100,8 @@
  */
 .section-body {
     margin-top: 0.75em;
-    padding: 0 0.75em 5em 0.75em;
-    min-height: 80vh;
+    padding: 0 0.75em 1em 0.75em;
+    /*min-height: 80vh;*/
 }
 .data-section .h3 {
     margin: 0;
diff --git a/app/src/frontend/styles/layout.css b/app/src/frontend/styles/layout.css
index bd357c74..70d043e3 100644
--- a/app/src/frontend/styles/layout.css
+++ b/app/src/frontend/styles/layout.css
@@ -49,9 +49,8 @@ article .color-block {
 }
 hr {
     display: block;
-    height: 1px;
-    border: none;
-    background-color: #ccc;
+    height: 0px;
+    border: 1px solid #ccc;
     width: 100%;
     margin: 1.0em 0 0.8em 0;
     padding: 0;

From 79dec38f9f327ef3f463b2459069a03e133f9a82 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Thu, 18 May 2023 21:06:03 +0100
Subject: [PATCH 20/42] Add placeholder for Solar Panels data

---
 .../building/data-containers/energy-performance.tsx       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/frontend/building/data-containers/energy-performance.tsx b/app/src/frontend/building/data-containers/energy-performance.tsx
index bf879871..e65b603f 100644
--- a/app/src/frontend/building/data-containers/energy-performance.tsx
+++ b/app/src/frontend/building/data-containers/energy-performance.tsx
@@ -121,7 +121,13 @@ const SustainabilityView: React.FunctionComponent<CategoryViewProps> = (props) =
             </DataEntryGroup>
             <DataEntryGroup name="Other sustainability features">
                 <DataEntry
-                    title="Green Walls / Green Roof"
+                    title="Does the building have Solar Panels?"
+                    slug=""
+                    value=""
+                    mode='view'
+                />
+                <DataEntry
+                    title="Does the building have Green Walls / Green Roof"
                     slug=""
                     value=""
                     mode='view'

From 715cdfaa02eb5b6172996f0bd5ba4584fcc09d6e Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Thu, 18 May 2023 21:06:27 +0100
Subject: [PATCH 21/42] More tweaks, mainly for consistency

---
 .../building/data-containers/age-history.tsx  | 32 +++++++++++--------
 .../building/data-containers/community.tsx    | 14 +++++---
 .../building/data-containers/land-use.tsx     |  1 -
 .../building/data-containers/location.tsx     |  8 +++++
 .../building/data-containers/resilience.tsx   | 12 ++++---
 app/src/frontend/config/data-fields-config.ts |  6 ++--
 6 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/app/src/frontend/building/data-containers/age-history.tsx b/app/src/frontend/building/data-containers/age-history.tsx
index a6c5e661..57182d5c 100644
--- a/app/src/frontend/building/data-containers/age-history.tsx
+++ b/app/src/frontend/building/data-containers/age-history.tsx
@@ -114,7 +114,8 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     user_verified_as={props.user_verified.date_source}
                     verified_count={props.building.verified.date_source}
                     />
-                <InfoBox>
+                <hr/>
+                <InfoBox type='warning'>
                     This section is under development.
                 </InfoBox>
                 <DataEntry
@@ -221,16 +222,18 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                             </>
                     }
                 </DataEntryGroup>
-                <InfoBox>
+                <InfoBox type='warning'>
                     This section is under development in collaboration with the historic environment sector.
                     Please let us know your suggestions on the <a href="https://discuss.colouring.london/t/dynamics-category-discussion/107">discussion forum</a>! (external link - save your edits first)
                 </InfoBox>
             </DataEntryGroup>
             <DataEntryGroup name="Survival and loss tracked using historical maps" collapsed={true} >
-                <InfoBox>
-                    Can you help us create a map that shows how many buildings in London have survived since the 1890s? 
-                    Choose a colour to indicate whether the building has survived.
-                </InfoBox>
+                <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
+                    <i>
+                        Can you help us create a map that shows how many buildings in London have survived since the 1890s? 
+                        Choose a colour to indicate whether the building has survived.
+                    </i>
+                </div>
                 <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
                     {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
                 </button>
@@ -347,7 +350,8 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     user_verified_as={props.user_verified.date_link}
                     verified_count={props.building.verified.date_link}
                     />
-                <InfoBox>
+                <hr/>
+                <InfoBox type='warning'>
                     This section is under development.
                 </InfoBox>
                 <DataEntry
@@ -496,16 +500,18 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                             </>
                     }
                 </DataEntryGroup>
-                <InfoBox>
+                <InfoBox type='warning'>
                     This section is under development in collaboration with the historic environment sector.
                     Please let us know your suggestions on the <a href="https://discuss.colouring.london/t/dynamics-category-discussion/107">discussion forum</a>! (external link - save your edits first)
                 </InfoBox>
             </DataEntryGroup>
-            <DataEntryGroup name="Survival and Loss tracked using Historical Maps" collapsed={true} >
-                <InfoBox>
-                    Can you help us create a map that shows how many buildings in London have survived since the 1890s? 
-                    Choose a colour to indicate whether the building has survived.
-                </InfoBox>
+            <DataEntryGroup name="Survival and loss tracked using historical maps" collapsed={true} >
+                <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
+                    <i>
+                        Can you help us create a map that shows how many buildings in London have survived since the 1890s? 
+                        Choose a colour to indicate whether the building has survived.
+                    </i>
+                </div>
                 <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
                     {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
                 </button>
diff --git a/app/src/frontend/building/data-containers/community.tsx b/app/src/frontend/building/data-containers/community.tsx
index 2d92ad80..6277905a 100644
--- a/app/src/frontend/building/data-containers/community.tsx
+++ b/app/src/frontend/building/data-containers/community.tsx
@@ -41,9 +41,11 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const worthKeepingReasonsNonEmpty = Object.values(props.building.community_type_worth_keeping_reasons ?? {}).some(x => x);
     return <>
         <DataEntryGroup name="Community views on building types">
-        <InfoBox>
+        <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
+            <i>
             Note: We are not currently collecting data on domestic/privately owned properties, only on public buildings.
-        </InfoBox>
+            </i>
+        </div>
         <div className='community-opinion-pane'>
             {
             
@@ -152,9 +154,11 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
         </div>
         </DataEntryGroup>
         <DataEntryGroup name="Building use for community activities">
-        <InfoBox>
-                Here we are collecting information on the location of buildings used for community activities so we can track loss of/additions to community space over time
-        </InfoBox>
+        <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
+            <i>
+            Here we are collecting information on the location of buildings used for community activities so we can track loss of/additions to community space over time.
+            </i>
+        </div>
         <LogicalDataEntry
             slug='community_activities_current'
             title={dataFields.community_activities_current.title}
diff --git a/app/src/frontend/building/data-containers/land-use.tsx b/app/src/frontend/building/data-containers/land-use.tsx
index 259837b6..7c39176c 100644
--- a/app/src/frontend/building/data-containers/land-use.tsx
+++ b/app/src/frontend/building/data-containers/land-use.tsx
@@ -133,7 +133,6 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     {
                         props.mode != 'view' &&
                         <div>
-                            <hr/>
                             <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
                                 <i>
                                     Below is a more general classification for the land use of this building, automatically derived from the information above.
diff --git a/app/src/frontend/building/data-containers/location.tsx b/app/src/frontend/building/data-containers/location.tsx
index 3ee98e8e..b3cd55d4 100644
--- a/app/src/frontend/building/data-containers/location.tsx
+++ b/app/src/frontend/building/data-containers/location.tsx
@@ -190,6 +190,7 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.ref_osm_id}
                 verified_count={props.building.verified.ref_osm_id}
                 />
+            <hr/>
             <NumericDataEntry
                 title={dataFields.location_latitude.title}
                 slug="location_latitude"
@@ -232,6 +233,13 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.location_longitude}
                 verified_count={props.building.verified.location_longitude}
                 />
+            <DataEntry
+                title="Source"
+                slug=""
+                value=""
+                mode='view'
+                tooltip="Coming Soon"
+                />
         </DataEntryGroup>
     </Fragment>
 );
diff --git a/app/src/frontend/building/data-containers/resilience.tsx b/app/src/frontend/building/data-containers/resilience.tsx
index e5e69071..3d4c9c0f 100644
--- a/app/src/frontend/building/data-containers/resilience.tsx
+++ b/app/src/frontend/building/data-containers/resilience.tsx
@@ -24,10 +24,12 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
 
     return (<>
         <DataEntryGroup name="Building damage assessment tool" collapsed={true} >
-            <InfoBox>
-                This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters. 
-                It is intended to help support emergency services, to record damage, and to aid reconstruction programmes.
-            </InfoBox>
+            <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
+                <i>
+                    This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters. 
+                    It is intended to help support emergency services, to record damage, and to aid reconstruction programmes.
+                </i>
+            </div>
             <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
                 {(historicData === 'enabled')?'Click here to hide disaster maps':'Click here to show disaster maps'}
             </button>
@@ -141,7 +143,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
             />
         </DataEntryGroup>
         <DataEntryGroup name="Resilience indicators and risk assessment" collapsed={true} >
-            <InfoBox>
+            <InfoBox type='warning'>
                 This section is under development.
             </InfoBox>
             <DataEntry
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 470e1386..c29f452d 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -307,8 +307,8 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     date_source: {
         category: Category.Age,
-        title: "Source of information",
-        tooltip: "Source for the main start date",
+        title: "Source type",
+        tooltip: "Source type for the building dates above",
         items: [
             "Expert knowledge of building",
             "Expert estimate from image",
@@ -774,7 +774,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     lead_designer_type: {
         category: Category.Team,
-        title: "Which best describes the lead designer?",
+        title: "Which title best describes the lead designer?",
         example: "",
         items: [
             "Landowner",

From 4e348e7b540dbb7408d052cae8880bd870ba0fb6 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Fri, 19 May 2023 11:55:32 +0100
Subject: [PATCH 22/42] Location + Land Use Sources

- Add sources to multiple fields on Location + Land Use Categories
- Use data-fields-config properly instead of hard-coding some values
---
 app/src/api/config/dataFields.ts              |  26 ++++-
 .../building/data-containers/land-use.tsx     |  39 +++----
 .../building/data-containers/location.tsx     |  92 ++++++++++------
 app/src/frontend/config/data-fields-config.ts | 104 ++++++++++++++----
 maintenance/extract_data/README.md            |   7 ++
 .../extract_data/export_attributes.sql        |   4 +
 migrations/040.ui_revamp_sources.down.sql     |   6 +
 migrations/040.ui_revamp_sources.up.sql       |   6 +
 8 files changed, 209 insertions(+), 75 deletions(-)
 create mode 100644 migrations/040.ui_revamp_sources.down.sql
 create mode 100644 migrations/040.ui_revamp_sources.up.sql

diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
index 3ecaf757..a1917f0f 100644
--- a/app/src/api/config/dataFields.ts
+++ b/app/src/api/config/dataFields.ts
@@ -79,6 +79,14 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true
     },
+    location_address_source: {
+        edit: true,
+        verify: true
+    },
+    location_address_links: {
+        edit: true,
+        verify: true
+    },
     location_latitude: {
         edit: true,
         verify: true,
@@ -87,6 +95,14 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true,
     },
+    location_coordinates_source: {
+        edit: true,
+        verify: true
+    },
+    location_coordinates_links: {
+        edit: true,
+        verify: true
+    },
     date_year: {
         edit: true,
         verify: true,
@@ -284,18 +300,24 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true
     },
-
     demolished_buildings: {
         edit: true,
         verify: false,
         asJson: true,
         sqlCast: 'jsonb',
     },
-
     is_domestic: {
         edit: true,
         verify: true
     },
+    is_domestic_source: {
+        edit: true,
+        verify: true
+    },
+    is_domestic_links: {
+        edit: true,
+        verify: true
+    },
     survival_status: {
         edit: true,
         verify: true
diff --git a/app/src/frontend/building/data-containers/land-use.tsx b/app/src/frontend/building/data-containers/land-use.tsx
index 7c39176c..d72add63 100644
--- a/app/src/frontend/building/data-containers/land-use.tsx
+++ b/app/src/frontend/building/data-containers/land-use.tsx
@@ -38,7 +38,7 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
                         title={dataFields.is_domestic.title}
                         slug="is_domestic"
                         value={props.building.is_domestic}
-                        options={["yes", "no", "mixed domestic/non-domestic"]}
+                        options={dataFields.is_domestic.items}
                         mode={props.mode}
                         copy={props.copy}
                         onChange={props.onChange}
@@ -55,29 +55,30 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     <SelectDataEntry
                         title={dataFields.is_domestic_source.title}
                         slug="is_domestic_source"
-                        value={props.building.is_domestic}
-                        options={
-                            [
-                                "Expert knowledge", 
-                                "Observed from the street",
-                                "Google or other photograph/satellite imagery", 
-                                "Government/public record/database",
-                                "Independently managed record/database",
-                                "Other type of record/database"
-                            ]
-                        }
+                        value={props.building.is_domestic_source}
+                        options={dataFields.is_domestic_source.items}
                         mode={props.mode}
                         copy={props.copy}
                         onChange={props.onChange}
                         tooltip={dataFields.is_domestic_source.tooltip}
                     />
-                    <DataEntry
-                        title="Source link"
-                        slug=""
-                        value=""
-                        mode='view'
-                        tooltip="Coming Soon"
-                    />
+                    {(props.building.is_domestic_source == "Expert knowledge" ||
+                        props.building.is_domestic_source == "Observed from the street" ||
+                        props.building.is_domestic_source == null) ? <></> :
+                        <><MultiDataEntry
+                            title={dataFields.is_domestic_links.title}
+                            slug="is_domestic_links"
+                            value={props.building.is_domestic_links}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.is_domestic_links.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                            />
+                        </>
+                    }
                 </DataEntryGroup>
                 <DataEntryGroup name="Specific land use data">
                     <MultiDataEntry
diff --git a/app/src/frontend/building/data-containers/location.tsx b/app/src/frontend/building/data-containers/location.tsx
index b3cd55d4..d6ffedcf 100644
--- a/app/src/frontend/building/data-containers/location.tsx
+++ b/app/src/frontend/building/data-containers/location.tsx
@@ -1,6 +1,4 @@
 import React, { Fragment } from 'react';
-
-import InfoBox from '../../components/info-box';
 import { dataFields } from '../../config/data-fields-config';
 import DataEntry from '../data-components/data-entry';
 import NumericDataEntry from '../data-components/numeric-data-entry';
@@ -8,15 +6,15 @@ import UPRNsDataEntry from '../data-components/uprns-data-entry';
 import Verification from '../data-components/verification';
 import withCopyEdit from '../data-container';
 import { PatternDataEntry } from '../data-components/pattern-data-entry';
-
 import { CategoryViewProps } from './category-view-props';
 import { DataEntryGroup } from '../data-components/data-entry-group';
+import SelectDataEntry from '../data-components/select-data-entry';
+import { MultiDataEntry } from '../data-components/multi-data-entry/multi-data-entry';
 
 const locationNumberPattern = "[1-9]\\d*[a-z]?(-([1-9]\\d*))?"; ///[1-9]\d*[a-z]?(-([1-9]\d*))?/;
 
 const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
     <Fragment>
-        
         <DataEntryGroup name="Address data">
             <DataEntry
                 title={dataFields.location_name.title}
@@ -44,21 +42,6 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 mode='view'
                 tooltip="Not yet activated.<br><br>For security reasons, we do not allow the use of free text boxes and are currently looking into alternative ways to collect this data."
             />
-            <Verification
-                slug="location_name"
-                allow_verify={props.user !== undefined && props.building.location_name !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("location_name")}
-                user_verified_as={props.user_verified.location_name}
-                verified_count={props.building.verified.location_name}
-            />
-            <DataEntry
-                title="Source"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
             <hr/>
             <PatternDataEntry
                 title={dataFields.location_number.title}
@@ -137,7 +120,6 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 onChange={props.onChange}
                 maxLength={8}
                 valueTransform={x=>x.toUpperCase()}
-                
                 />
             <Verification
                 slug="location_postcode"
@@ -147,13 +129,35 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.location_postcode}
                 verified_count={props.building.verified.location_postcode}
                 />
-            <DataEntry
-                title="Source"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
+            <SelectDataEntry
+                title={dataFields.location_address_source.title}
+                slug="location_address_source"
+                value={props.building.location_address_source}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.location_address_source.tooltip}
+                placeholder={dataFields.location_address_source.example}
+                options={dataFields.location_address_source.items}
+                />
+            {(props.building.location_address_source == "Expert/personal knowledge of building" ||
+                props.building.location_address_source == "Online streetview image" ||
+                props.building.location_address_source == null) ? <></> :
+                <>
+                    <MultiDataEntry
+                        title={dataFields.location_address_links.title}
+                        slug="location_address_links"
+                        value={props.building.location_address_links}
+                        mode={props.mode}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                        tooltip={dataFields.location_address_links.tooltip}
+                        placeholder="https://..."
+                        editableEntries={true}
+                        isUrl={true}
+                    />
+                </>
+            }
         </DataEntryGroup>
         <DataEntryGroup name="Property/footprint IDs and coordinate data">
             <DataEntry
@@ -233,13 +237,35 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.location_longitude}
                 verified_count={props.building.verified.location_longitude}
                 />
-            <DataEntry
-                title="Source"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
+            <SelectDataEntry
+                title={dataFields.location_coordinates_source.title}
+                slug="location_coordinates_source"
+                value={props.building.location_coordinates_source}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.location_coordinates_source.tooltip}
+                placeholder={dataFields.location_coordinates_source.example}
+                options={dataFields.location_coordinates_source.items}
                 />
+            {(props.building.location_coordinates_source == "Expert/personal knowledge of building" ||
+                props.building.location_coordinates_source == "Online streetview image" ||
+                props.building.location_coordinates_source == null) ? <></> :
+                <>
+                    <MultiDataEntry
+                        title={dataFields.location_coordinates_links.title}
+                        slug="location_coordinates_links"
+                        value={props.building.location_coordinates_links}
+                        mode={props.mode}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                        tooltip={dataFields.location_coordinates_links.tooltip}
+                        placeholder="https://..."
+                        editableEntries={true}
+                        isUrl={true}
+                    />
+                </>
+            }
         </DataEntryGroup>
     </Fragment>
 );
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index c29f452d..6174f0a4 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -15,7 +15,7 @@ export interface DataFieldDefinition {
      * A field could be displayed in several categories, but this value will be used
      * when a single category needs to be shown in the context of a field, e.g.
      * in the case of edit history or the copy-paste tool (multi-edit)
-     *  */ 
+     *  */
     category: Category;
 
     /**
@@ -41,7 +41,7 @@ export interface DataFieldDefinition {
     /**
      * If the defined type is a dictionary, this describes the types of the dictionary's fields
      */
-    fields?: { [key: string]: Omit<DataFieldDefinition, 'category'>}
+    fields?: { [key: string]: Omit<DataFieldDefinition, 'category'> }
 
     /**
      * The example is used to determine the runtime type in which the attribute data is stored (e.g. number, string, object)
@@ -110,7 +110,7 @@ export const buildingUserFields = {
             other: false
         }
     },
-    
+
     community_local_significance: {
         perUser: true,
         category: Category.Community,
@@ -163,13 +163,34 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         example: "W1W 6TR",
         //tooltip: ,
     },
+    location_address_source: {
+        category: Category.Location,
+        title: "Source",
+        example: "",
+        tooltip: "Source of address data.",
+        items: [
+            "Expert/personal knowledge of building",
+            "Online streetview image",
+            "Open planning authority dataset",
+            "Open property tax dataset",
+            "Open housing dataset",
+            "Open address dataset",
+            "Other"
+        ]
+    },
+    location_address_links: {
+        category: Category.Location,
+        title: "Source link(s)",
+        tooltip: "URL(s) for building address data source(s).",
+        example: ["", "", ""],
+    },
     ref_toid: {
         category: Category.Location,
         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: "",
     },
-    
+
     /**
      * UPRNs is not part of the buildings table, but the string fields 
      * are included here for completeness
@@ -178,16 +199,16 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         category: Category.Location,
         title: "Unique Property Reference Number(s) (UPRN)",
         tooltip: "Unique Property Reference Numbers (to be filled automatically) [<a href='https://beta.ordnancesurvey.co.uk/products/os-open-uprn'>LINK</a>]",
-        example: [{uprn: "", parent_uprn: "" }, {uprn: "", parent_uprn: "" }],
+        example: [{ uprn: "", parent_uprn: "" }, { uprn: "", parent_uprn: "" }],
     },
 
     planning_data: {
         category: Category.Location,
         title: "PLANNING DATA",
         tooltip: "PLANNING DATA",
-        example: [{uprn: "", building_id: 1, data_source: ""},
-                  {uprn: "", building_id: 1, data_source: "", status: "", status_before_aliasing: "", decision_date: "", description: "", planning_application_link: "", registered_with_local_authority_date: "", last_synced_date: "", data_source_link: "", address: ""},
-                ],
+        example: [{ uprn: "", building_id: 1, data_source: "" },
+        { uprn: "", building_id: 1, data_source: "", status: "", status_before_aliasing: "", decision_date: "", description: "", planning_application_link: "", registered_with_local_authority_date: "", last_synced_date: "", data_source_link: "", address: "" },
+        ],
     },
 
 
@@ -209,6 +230,27 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip: "Longitude of building centroid",
         example: 0.12124,
     },
+    location_coordinates_source: {
+        category: Category.Location,
+        title: "Source",
+        example: "",
+        tooltip: "Source of lcoordinate data.",
+        items: [
+            "Expert/personal knowledge of building",
+            "Online streetview image",
+            "Open planning authority dataset",
+            "Open property tax dataset",
+            "Open housing dataset",
+            "Open address dataset",
+            "Other"
+        ]
+    },
+    location_coordinates_links: {
+        category: Category.Location,
+        title: "Source link(s)",
+        tooltip: "URL(s) for building coordinate data source(s).",
+        example: ["", "", ""],
+    },
     current_landuse_group: {
         category: Category.LandUse,
         title: "Current land use(s)",
@@ -223,7 +265,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     current_landuse_source: {
         category: Category.LandUse,
-        title: "Source of information",
+        title: "Source type",
         tooltip: "Source for the current land use",
         example: "",
         items: [
@@ -244,8 +286,8 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     current_landuse_link: {
         category: Category.LandUse,
-        title: "Source links",
-        tooltip: "URL for current land use reference",
+        title: "Source link(s)",
+        tooltip: "URL(s) for current land use reference",
         example: ["", "", ""],
     },
     current_landuse_verified: {
@@ -261,7 +303,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     date_change_building_use: {
         category: Category.Typology,
-        title:"When did use change?",
+        title: "When did use change?",
         tooltip: "This is the date the building stopped being used for for the function it was built for. I.e. if it was Victorian warehouse which is now an office this would be when it became an office or if it was something before that, maybe a garage then the date that happened",
         example: 1920,
     },
@@ -287,7 +329,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip: "Best estimate for construction of main body of the building.",
         example: 1924,
     },
-    date_lower : {
+    date_lower: {
         category: Category.Age,
         title: "Earliest possible start year",
         tooltip: "This should be the earliest year in which construction could have started.",
@@ -412,21 +454,21 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     construction_core_material: {
         category: Category.Construction,
         title: "Core material",
-        tooltip:"The main structural material",
+        tooltip: "The main structural material",
         example: "",
     },
 
     construction_secondary_materials: {
         category: Category.Construction,
         title: "Main secondary construction material/s",
-        tooltip:"Other construction materials",
+        tooltip: "Other construction materials",
         example: "",
     },
 
     construction_roof_covering: {
         category: Category.Construction,
         title: "Main roof covering",
-        tooltip:'Main roof covering material',
+        tooltip: 'Main roof covering material',
         example: "",
     },
 
@@ -602,13 +644,32 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         category: Category.Team,
         title: "Is the building a home/domestic building?",
         tooltip: "Note: Homes used as offices for working from home should be classified as domestic.",
-        example: "mixed domestic/non-domestic"
+        example: "mixed domestic/non-domestic",
+        items: [
+            "Yes",
+            "No",
+            "Mixed domestic/non-domestic"
+        ]
     },
     is_domestic_source: {
         category: Category.Team,
         title: "Source type",
-        tooltip: "",
-        example: ""
+        tooltip: "Source of domestic/non-domestic data",
+        example: "",
+        items: [
+            "Expert knowledge",
+            "Observed from the street",
+            "Google or other photograph/satellite imagery",
+            "Government/public record/database",
+            "Independently managed record/database",
+            "Other type of record/database"
+        ]
+    },
+    is_domestic_links: {
+        category: Category.Team,
+        title: "Source links",
+        tooltip: "URL(s) for domestic/non-domestic data source(s)",
+        example: ["", "", ""],
     },
     likes_total: {
         category: Category.Community,
@@ -705,7 +766,8 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
             {
                 year_constructed: { min: 1989, max: 1991 },
                 year_demolished: { min: 1993, max: 1994 },
-                lifespan: "2-5", overlap_present: "50%", links: ["", ""]}
+                lifespan: "2-5", overlap_present: "50%", links: ["", ""]
+            }
         ]
     },
     has_extension: {
@@ -850,4 +912,4 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
 };
 
-export const allFieldsConfig = {...dataFields, ...buildingUserFields};
\ No newline at end of file
+export const allFieldsConfig = { ...dataFields, ...buildingUserFields };
\ No newline at end of file
diff --git a/maintenance/extract_data/README.md b/maintenance/extract_data/README.md
index a405dc1f..c2e4100e 100644
--- a/maintenance/extract_data/README.md
+++ b/maintenance/extract_data/README.md
@@ -39,8 +39,12 @@ This is the main table, containing almost all data collected by Colouring London
 - `location_line_two`: additional address line
 - `location_town`: town
 - `location_postcode`: postcode
+- `location_address_source`: type of source used for address data
+- `location_address_links`: link to source used for address data
 - `location_latitude`: latitude
 - `location_longitude`: longitude
+- `location_coordinates_source`: source type of coordinate data
+- `location_coordinates_links`: source links for coordinate data
 - `current_landuse_group`: current land use group
 - `current_landuse_order`: current land use order
 - `building_attachment_form`: building attachment form
@@ -85,6 +89,9 @@ This is the main table, containing almost all data collected by Colouring London
 - `planning_local_list_url`: local list reference link
 - `planning_historic_area_assessment_url`: historic area assessment reference link
 - `likes_total`: number of times the building has been liked by Colouring London users
+- `is_domestic`: is the building domestic/non-domestic/mixed
+- `is_domestic_source`: domestic data source type,
+ -`is_domestic_links`: domestic data source links,
 
 
 ## Building UPRNs
diff --git a/maintenance/extract_data/export_attributes.sql b/maintenance/extract_data/export_attributes.sql
index e348fc37..370b2f8e 100644
--- a/maintenance/extract_data/export_attributes.sql
+++ b/maintenance/extract_data/export_attributes.sql
@@ -9,6 +9,8 @@ COPY (SELECT
     location_line_two,
     location_town,
     location_postcode,
+    location_address_source,
+    location_address_links,
     location_latitude,
     location_longitude,
     current_landuse_group,
@@ -55,6 +57,8 @@ COPY (SELECT
     planning_local_list_url,
     planning_historic_area_assessment_url,
     is_domestic,
+    is_domestic_source,
+    is_domestic_links,
     community_type_worth_keeping_total,
     likes_total,
     survival_status,
diff --git a/migrations/040.ui_revamp_sources.down.sql b/migrations/040.ui_revamp_sources.down.sql
new file mode 100644
index 00000000..6fa76932
--- /dev/null
+++ b/migrations/040.ui_revamp_sources.down.sql
@@ -0,0 +1,6 @@
+ALTER TABLE buildings DROP COLUMN IF EXISTS location_address_source;
+ALTER TABLE buildings DROP COLUMN IF EXISTS location_address_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS location_coordinates_source;
+ALTER TABLE buildings DROP COLUMN IF EXISTS location_coordinates_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS is_domestic_source;
+ALTER TABLE buildings DROP COLUMN IF EXISTS is_domestic_links;
\ No newline at end of file
diff --git a/migrations/040.ui_revamp_sources.up.sql b/migrations/040.ui_revamp_sources.up.sql
new file mode 100644
index 00000000..7a08b6fd
--- /dev/null
+++ b/migrations/040.ui_revamp_sources.up.sql
@@ -0,0 +1,6 @@
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS location_address_source text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS location_address_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS location_coordinates_source text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS location_coordinates_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS is_domestic_source text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS is_domestic_links text[];
\ No newline at end of file

From 4c32710358833eeb3116e1f97ac782dfb54bf90c Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 23 May 2023 15:13:23 +0100
Subject: [PATCH 23/42] Add "Common Source Types" list

- This will be the default source type for all fields, unless they need custom data. Then we can manage and edit this list in multiple places
- Use in Location and Land Use pages
---
 .../building/data-containers/land-use.tsx     |  6 +--
 .../building/data-containers/location.tsx     | 10 ++---
 app/src/frontend/config/data-fields-config.ts | 45 +++++++------------
 3 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/app/src/frontend/building/data-containers/land-use.tsx b/app/src/frontend/building/data-containers/land-use.tsx
index d72add63..e8e8b1be 100644
--- a/app/src/frontend/building/data-containers/land-use.tsx
+++ b/app/src/frontend/building/data-containers/land-use.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment } from 'react';
 
 import InfoBox from '../../components/info-box';
-import { dataFields } from '../../config/data-fields-config';
+import { commonSourceTypes, dataFields } from '../../config/data-fields-config';
 import DataEntry from '../data-components/data-entry';
 import { MultiDataEntry } from '../data-components/multi-data-entry/multi-data-entry';
 import SelectDataEntry from '../data-components/select-data-entry';
@@ -62,8 +62,8 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
                         onChange={props.onChange}
                         tooltip={dataFields.is_domestic_source.tooltip}
                     />
-                    {(props.building.is_domestic_source == "Expert knowledge" ||
-                        props.building.is_domestic_source == "Observed from the street" ||
+                    {(props.building.is_domestic_source == commonSourceTypes[0] ||
+                        props.building.is_domestic_source == commonSourceTypes[1] ||
                         props.building.is_domestic_source == null) ? <></> :
                         <><MultiDataEntry
                             title={dataFields.is_domestic_links.title}
diff --git a/app/src/frontend/building/data-containers/location.tsx b/app/src/frontend/building/data-containers/location.tsx
index d6ffedcf..f44ecb82 100644
--- a/app/src/frontend/building/data-containers/location.tsx
+++ b/app/src/frontend/building/data-containers/location.tsx
@@ -1,5 +1,5 @@
 import React, { Fragment } from 'react';
-import { dataFields } from '../../config/data-fields-config';
+import { commonSourceTypes, dataFields } from '../../config/data-fields-config';
 import DataEntry from '../data-components/data-entry';
 import NumericDataEntry from '../data-components/numeric-data-entry';
 import UPRNsDataEntry from '../data-components/uprns-data-entry';
@@ -140,8 +140,8 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 placeholder={dataFields.location_address_source.example}
                 options={dataFields.location_address_source.items}
                 />
-            {(props.building.location_address_source == "Expert/personal knowledge of building" ||
-                props.building.location_address_source == "Online streetview image" ||
+            {(props.building.location_address_source == commonSourceTypes[0] ||
+                props.building.location_address_source == commonSourceTypes[1] ||
                 props.building.location_address_source == null) ? <></> :
                 <>
                     <MultiDataEntry
@@ -248,8 +248,8 @@ const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 placeholder={dataFields.location_coordinates_source.example}
                 options={dataFields.location_coordinates_source.items}
                 />
-            {(props.building.location_coordinates_source == "Expert/personal knowledge of building" ||
-                props.building.location_coordinates_source == "Online streetview image" ||
+            {(props.building.location_coordinates_source == commonSourceTypes[0] ||
+                props.building.location_coordinates_source == commonSourceTypes[1] ||
                 props.building.location_coordinates_source == null) ? <></> :
                 <>
                     <MultiDataEntry
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 6174f0a4..4227b274 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -2,6 +2,18 @@ import { Category } from './categories-config';
 import { CCConfig } from '../../cc-config';
 let ccconfig: CCConfig = require('../../cc-config.json')
 
+/*
+ * Common list of Source Types, used in multiple menus
+*/
+export const commonSourceTypes = [
+    "Expert knowledge",
+    "Observed from the street",
+    "Google or other photograph/satellite imagery",
+    "Government/public record/database",
+    "Independently managed record/database",
+    "Other type of record/database"
+];
+
 /**
  * This interface is used only in code which uses dataFields, not in the dataFields definition itself
  * Cannot make dataFields an indexed type ({[key: string]: DataFieldDefinition}),
@@ -165,18 +177,10 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     location_address_source: {
         category: Category.Location,
-        title: "Source",
+        title: "Source type",
         example: "",
         tooltip: "Source of address data.",
-        items: [
-            "Expert/personal knowledge of building",
-            "Online streetview image",
-            "Open planning authority dataset",
-            "Open property tax dataset",
-            "Open housing dataset",
-            "Open address dataset",
-            "Other"
-        ]
+        items: commonSourceTypes
     },
     location_address_links: {
         category: Category.Location,
@@ -232,18 +236,10 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     location_coordinates_source: {
         category: Category.Location,
-        title: "Source",
+        title: "Source type",
         example: "",
         tooltip: "Source of lcoordinate data.",
-        items: [
-            "Expert/personal knowledge of building",
-            "Online streetview image",
-            "Open planning authority dataset",
-            "Open property tax dataset",
-            "Open housing dataset",
-            "Open address dataset",
-            "Other"
-        ]
+        items: commonSourceTypes
     },
     location_coordinates_links: {
         category: Category.Location,
@@ -656,14 +652,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         title: "Source type",
         tooltip: "Source of domestic/non-domestic data",
         example: "",
-        items: [
-            "Expert knowledge",
-            "Observed from the street",
-            "Google or other photograph/satellite imagery",
-            "Government/public record/database",
-            "Independently managed record/database",
-            "Other type of record/database"
-        ]
+        items: commonSourceTypes
     },
     is_domestic_links: {
         category: Category.Team,

From 19c906fcc5a31d6a90315956305424c5792441db Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 23 May 2023 21:27:45 +0100
Subject: [PATCH 24/42] Size / Age & History Sources

Adding source link(s) field to activated data sources in the Size category and the Age & History category
---
 app/src/api/config/dataFields.ts              |  48 +++++
 .../building/data-containers/age-history.tsx  |  60 +++---
 .../building/data-containers/size.tsx         | 194 ++++++++++++------
 app/src/frontend/config/data-fields-config.ts |  75 ++++++-
 maintenance/extract_data/README.md            |  14 +-
 .../extract_data/export_attributes.sql        |  10 +
 migrations/040.ui_revamp_sources.down.sql     |  12 +-
 migrations/040.ui_revamp_sources.up.sql       |  14 +-
 8 files changed, 333 insertions(+), 94 deletions(-)

diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
index a1917f0f..2b9b563e 100644
--- a/app/src/api/config/dataFields.ts
+++ b/app/src/api/config/dataFields.ts
@@ -154,10 +154,38 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true,
     },
+    size_storeys_source_type: {
+        edit: true,
+        verify: true,
+    },
+    size_storeys_source_links: {
+        edit: true,
+        verify: true,
+    },
     size_height_apex: {
         edit: true,
         verify: true,
     },
+    size_height_apex_source_type: {
+        edit: true,
+        verify: true,
+    },
+    size_height_apex_source_links: {
+        edit: true,
+        verify: true,
+    },
+    size_height_eaves: {
+        edit: true,
+        verify: true,
+    },
+    size_height_eaves_source_type: {
+        edit: true,
+        verify: true,
+    },
+    size_height_eaves_source_links: {
+        edit: true,
+        verify: true,
+    },
     size_floor_area_ground: {
         edit: true,
         verify: true,
@@ -166,10 +194,26 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true,
     },
+    size_floor_area_source_type: {
+        edit: true,
+        verify: true,
+    },
+    size_floor_area_source_links: {
+        edit: true,
+        verify: true,
+    },
     size_width_frontage: {
         edit: true,
         verify: true,
     },
+    size_width_frontage_source_type: {
+        edit: true,
+        verify: true,
+    },
+    size_width_frontage_source_links: {
+        edit: true,
+        verify: true,
+    },
     construction_core_material: {
         edit: true,
         verify: true,
@@ -326,6 +370,10 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true
     },
+    survival_source_links: {
+        edit: true,
+        verify: true
+    },
     likes_total: {
         edit: false,
         derivedEdit: true,
diff --git a/app/src/frontend/building/data-containers/age-history.tsx b/app/src/frontend/building/data-containers/age-history.tsx
index 57182d5c..93420d73 100644
--- a/app/src/frontend/building/data-containers/age-history.tsx
+++ b/app/src/frontend/building/data-containers/age-history.tsx
@@ -106,14 +106,6 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     placeholder={dataFields.date_source.example}
                     options={dataFields.date_source.items}
                     />
-                <Verification
-                    slug="date_source"
-                    allow_verify={props.user !== undefined && props.building.date_source !== null && !props.edited}
-                    onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("date_source")}
-                    user_verified_as={props.user_verified.date_source}
-                    verified_count={props.building.verified.date_source}
-                    />
                 <hr/>
                 <InfoBox type='warning'>
                     This section is under development.
@@ -258,6 +250,23 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     placeholder={dataFields.survival_source.example}
                     options={dataFields.survival_source.items}
                     />
+                {(props.building.survival_source == dataFields.survival_source_links[0] ||
+                    props.building.survival_source == dataFields.survival_source_links[1] ||
+                    props.building.survival_source == null) ? <></> :
+                    <><MultiDataEntry
+                        title={dataFields.survival_source_links.title}
+                        slug="survival_source_links"
+                        value={props.building.survival_source_links}
+                        mode={props.mode}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                        tooltip={dataFields.survival_source_links.tooltip}
+                        placeholder="https://..."
+                        editableEntries={true}
+                        isUrl={true}
+                        />
+                    </>
+                }
             </DataEntryGroup>
           </Fragment>
         );
@@ -322,14 +331,6 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     options={dataFields.date_source.items}
                     placeholder={dataFields.date_source.example}
                     />
-                <Verification
-                    slug="date_source"
-                    allow_verify={props.user !== undefined && props.building.date_source !== null && !props.edited}
-                    onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("date_source")}
-                    user_verified_as={props.user_verified.date_source}
-                    verified_count={props.building.verified.date_source}
-                    />
                 <MultiDataEntry
                     title={dataFields.date_link.title}
                     slug="date_link"
@@ -342,14 +343,6 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     editableEntries={true}
                     isUrl={true}
                     />
-                <Verification
-                    slug="date_link"
-                    allow_verify={props.user !== undefined && props.building.date_link !== null && !props.edited}
-                    onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("date_link")}
-                    user_verified_as={props.user_verified.date_link}
-                    verified_count={props.building.verified.date_link}
-                    />
                 <hr/>
                 <InfoBox type='warning'>
                     This section is under development.
@@ -535,7 +528,24 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     tooltip={dataFields.survival_source.tooltip}
                     placeholder={dataFields.survival_source.example}
                     options={dataFields.survival_source.items}
-                    />
+                />
+                {(props.building.survival_source == dataFields.survival_source.items[0] ||
+                    props.building.survival_source == dataFields.survival_source.items[1] ||
+                    props.building.survival_source == null) ? <></> :
+                    <><MultiDataEntry
+                        title={dataFields.survival_source_links.title}
+                        slug="survival_source_links"
+                        value={props.building.survival_source_links}
+                        mode={props.mode}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                        tooltip={dataFields.survival_source_links.tooltip}
+                        placeholder="https://..."
+                        editableEntries={true}
+                        isUrl={true}
+                        />
+                    </>
+                }
             </DataEntryGroup>
         </Fragment>
     );
diff --git a/app/src/frontend/building/data-containers/size.tsx b/app/src/frontend/building/data-containers/size.tsx
index a4e428be..4e7f99c4 100644
--- a/app/src/frontend/building/data-containers/size.tsx
+++ b/app/src/frontend/building/data-containers/size.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react';
 
-import { dataFields } from '../../config/data-fields-config';
+import { commonSourceTypes, dataFields } from '../../config/data-fields-config';
 import DataEntry from '../data-components/data-entry';
 import { DataEntryGroup } from '../data-components/data-entry-group';
 import NumericDataEntry from '../data-components/numeric-data-entry';
@@ -10,6 +10,7 @@ import withCopyEdit from '../data-container';
 
 import { CategoryViewProps } from './category-view-props';
 import InfoBox from '../../components/info-box';
+import { MultiDataEntry } from '../data-components/multi-data-entry/multi-data-entry';
 
 /**
 * Size view/edit section
@@ -74,20 +75,33 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.size_storeys_basement}
                 verified_count={props.building.verified.size_storeys_basement}
                 />
-            <DataEntry
-                title="Source type"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
-            <DataEntry
-                title="Source link"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
+            <SelectDataEntry
+                title={dataFields.size_storeys_source_type.title}
+                slug="size_storeys_source_type"
+                value={props.building.size_storeys_source_type}
+                options={dataFields.size_storeys_source_type.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.size_storeys_source_type.tooltip}
             />
+            {(props.building.size_storeys_source_type == commonSourceTypes[0] ||
+                props.building.size_storeys_source_type == commonSourceTypes[1] ||
+                props.building.size_storeys_source_type == null) ? <></> :
+                <><MultiDataEntry
+                    title={dataFields.size_storeys_source_links.title}
+                    slug="size_storeys_source_links"
+                    value={props.building.size_storeys_source_links}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.size_storeys_source_links.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                </>
+            }
         </DataEntryGroup>
         <DataEntryGroup name="Building height data">
             <NumericDataEntry
@@ -108,25 +122,37 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.size_height_apex}
                 verified_count={props.building.verified.size_height_apex}
                 />
-            <DataEntry
-                title="Source type"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
-            <DataEntry
-                title="Source link"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
+            <SelectDataEntry
+                title={dataFields.size_height_apex_source_type.title}
+                slug="size_height_apex_source_type"
+                value={props.building.size_height_apex_source_type}
+                options={dataFields.size_height_apex_source_type.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.size_height_apex_source_type.tooltip}
             />
+            {(props.building.size_height_apex_source_type == commonSourceTypes[0] ||
+                props.building.size_height_apex_source_type == commonSourceTypes[1] ||
+                props.building.size_height_apex_source_type == null) ? <></> :
+                <><MultiDataEntry
+                    title={dataFields.size_height_apex_source_links.title}
+                    slug="size_height_apex_source_links"
+                    value={props.building.size_height_apex_source_links}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.size_height_apex_source_links.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                </>
+            }
             <hr/>
             <NumericDataEntry
                 title={dataFields.size_height_eaves.title}
                 slug="size_height_eaves"
-                disabled={true}
                 value={props.building.size_height_eaves}
                 mode={props.mode}
                 copy={props.copy}
@@ -134,20 +160,33 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 step={0.1}
                 min={0}
                 />
-            <DataEntry
-                title="Source type"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
-            <DataEntry
-                title="Source link"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
+            <SelectDataEntry
+                title={dataFields.size_height_eaves_source_type.title}
+                slug="size_height_eaves_source_type"
+                value={props.building.size_height_eaves_source_type}
+                options={dataFields.size_height_eaves_source_type.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.size_height_eaves_source_type.tooltip}
             />
+            {(props.building.size_height_eaves_source_type == commonSourceTypes[0] ||
+                props.building.size_height_eaves_source_type == commonSourceTypes[1] ||
+                props.building.size_height_eaves_source_type == null) ? <></> :
+                <><MultiDataEntry
+                    title={dataFields.size_height_eaves_source_links.title}
+                    slug="size_height_eaves_source_links"
+                    value={props.building.size_height_eaves_source_links}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.size_height_eaves_source_links.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                </>
+            }
         </DataEntryGroup>
         <DataEntryGroup name="Floor area data">
             <NumericDataEntry
@@ -186,13 +225,33 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.size_floor_area_total}
                 verified_count={props.building.verified.size_floor_area_total}
                 />
-            <DataEntry
-                title="Source link"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-                />
+            <SelectDataEntry
+                title={dataFields.size_floor_area_source_type.title}
+                slug="size_floor_area_source_type"
+                value={props.building.size_floor_area_source_type}
+                options={dataFields.size_floor_area_source_type.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.size_floor_area_source_type.tooltip}
+            />
+            {(props.building.size_floor_area_source_type == commonSourceTypes[0] ||
+                props.building.size_floor_area_source_type == commonSourceTypes[1] ||
+                props.building.size_floor_area_source_type == null) ? <></> :
+                <><MultiDataEntry
+                    title={dataFields.size_floor_area_source_links.title}
+                    slug="size_floor_area_source_links"
+                    value={props.building.size_floor_area_source_links}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.size_floor_area_source_links.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                </>
+            }
         </DataEntryGroup>
         <DataEntryGroup name="Plot size data">
             <NumericDataEntry
@@ -300,20 +359,33 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 user_verified_as={props.user_verified.size_width_frontage}
                 verified_count={props.building.verified.size_width_frontage}
                 />
-            <DataEntry
-                title="Source type"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
-            <DataEntry
-                title="Source link"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
+            <SelectDataEntry
+                title={dataFields.size_width_frontage_source_type.title}
+                slug="size_width_frontage_source_type"
+                value={props.building.size_width_frontage_source_type}
+                options={dataFields.size_width_frontage_source_type.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.size_width_frontage_source_type.tooltip}
             />
+            {(props.building.size_width_frontage_source_type == commonSourceTypes[0] ||
+                props.building.size_width_frontage_source_type == commonSourceTypes[1] ||
+                props.building.size_width_frontage_source_type == null) ? <></> :
+                <><MultiDataEntry
+                    title={dataFields.size_width_frontage_source_links.title}
+                    slug="size_width_frontage_source_links"
+                    value={props.building.size_width_frontage_source_links}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.size_width_frontage_source_links.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                </>
+            }
         </DataEntryGroup>
     </Fragment>
 );
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 4227b274..62bd018b 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -373,7 +373,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     date_link: {
         category: Category.Age,
-        title: "Text and Image Links",
+        title: "Source link(s)",
         tooltip: "URL for age and date reference",
         example: ["", "", ""],
     },
@@ -396,18 +396,57 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip: "How many floors below pavement level?",
         example: 1,
     },
+    size_storeys_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source of building floors data",
+        example: "",
+        items: commonSourceTypes
+    },
+    size_storeys_source_links: {
+        category: Category.Team,
+        title: "Source links",
+        tooltip: "URL(s) for building floors data source(s)",
+        example: ["", "", ""],
+    },
     size_height_apex: {
         category: Category.Size,
         title: "Height to apex (m)",
         example: 100.5,
         tooltip: "i.e. the highest part of the roof.",
     },
+    size_height_apex_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source of building height (apex) data",
+        example: "",
+        items: commonSourceTypes
+    },
+    size_height_apex_source_links: {
+        category: Category.Team,
+        title: "Source links",
+        tooltip: "URL(s) for building height (apex) source(s)",
+        example: ["", "", ""],
+    },
     size_height_eaves: {
         category: Category.Size,
         title: "Height to eaves (m)",
         example: 20.33,
         tooltip: "i.e. to where the top of the wall meets the roof",
     },
+    size_height_eaves_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source of building height (eaves) data",
+        example: "",
+        items: commonSourceTypes
+    },
+    size_height_eaves_source_links: {
+        category: Category.Team,
+        title: "Source links",
+        tooltip: "URL(s) for building height (eaves) source(s)",
+        example: ["", "", ""],
+    },
     size_floor_area_ground: {
         category: Category.Size,
         title: "Ground floor area (m²)",
@@ -420,12 +459,38 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         example: 2001.7,
         //tooltip: ,
     },
+    size_floor_area_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source of floor area data",
+        example: "",
+        items: commonSourceTypes
+    },
+    size_floor_area_source_links: {
+        category: Category.Team,
+        title: "Source links",
+        tooltip: "URL(s) for floor area data source(s)",
+        example: ["", "", ""],
+    },
     size_width_frontage: {
         category: Category.Size,
         title: "Frontage width (m)",
         example: 12.2,
         //tooltip: ,
     },
+    size_width_frontage_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source of building frontage data",
+        example: "",
+        items: commonSourceTypes
+    },
+    size_width_frontage_source_links: {
+        category: Category.Team,
+        title: "Source links",
+        tooltip: "URL(s) for building frontage source(s)",
+        example: ["", "", ""],
+    },
 
     size_configuration: {
         category: Category.Size,
@@ -514,7 +579,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
 
     survival_source: {
         category: Category.Age,
-        title: "Source of survival information",
+        title: "Source type",
         tooltip: "Source for the survival status",
         items: [
             "Matched by comparing maps",
@@ -525,10 +590,10 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         example: "",
     },
 
-    survival_link: {
+    survival_source_links: {
         category: Category.Age,
-        title: "Please add any additional text or image links providing historical information on this building",
-        tooltip: "URL for age and date reference",
+        title: "Source link(s)",
+        tooltip: "Links to sources of survival/historical information on this building",
         example: ["", "", ""],
     },
 
diff --git a/maintenance/extract_data/README.md b/maintenance/extract_data/README.md
index c2e4100e..30845792 100644
--- a/maintenance/extract_data/README.md
+++ b/maintenance/extract_data/README.md
@@ -63,9 +63,18 @@ This is the main table, containing almost all data collected by Colouring London
 - `size_storeys_attic`: number of attic storeys
 - `size_storeys_core`: number of core storeys
 - `size_storeys_basement`: number of basement storeys
+- `size_storeys_source_type`: source type for number of storeys
+- `size_storeys_source_links`: source links for number of storeys
 - `size_height_apex`: height in metres to the building apex
+- `size_height_apex_source_type`: source of apex height data
+- `size_height_apex_source_links`: links to apex height data
+- `size_height_eaves`: height in metres to the building eaves
+- `size_height_eaves_source_type`: source of eaves height data
+- `size_height_eaves_source_links`: links to eaves height data
 - `size_floor_area_ground`: ground floor floor area in square metres
 - `size_floor_area_total`: total floor area in square metres
+- `size_floor_area_source_type`: source of floor area data
+- `size_floor_area_source_links`: link(s) to floor area data
 - `size_width_frontage`: width of frontage in metres
 - `construction_core_material`: main structural material
 - `construction_secondary_materials`: other structural materials
@@ -91,7 +100,10 @@ This is the main table, containing almost all data collected by Colouring London
 - `likes_total`: number of times the building has been liked by Colouring London users
 - `is_domestic`: is the building domestic/non-domestic/mixed
 - `is_domestic_source`: domestic data source type,
- -`is_domestic_links`: domestic data source links,
+- `is_domestic_links`: domestic data source links,
+- `survival_status`: survival status compared to historical maps,
+- `survival_source`: source of survival data,
+- `survival_links`: link(s) to survival data source,
 
 
 ## Building UPRNs
diff --git a/maintenance/extract_data/export_attributes.sql b/maintenance/extract_data/export_attributes.sql
index 370b2f8e..6b0825b5 100644
--- a/maintenance/extract_data/export_attributes.sql
+++ b/maintenance/extract_data/export_attributes.sql
@@ -31,9 +31,18 @@ COPY (SELECT
     size_storeys_attic,
     size_storeys_core,
     size_storeys_basement,
+    size_storeys_source_type,
+    size_storeys_source_links,
     size_height_apex,
+    size_height_apex_source_type,
+    size_height_apex_source_links,
+    size_height_eaves,
+    size_height_eaves_source_type,
+    size_height_eaves_source_links,
     size_floor_area_ground,
     size_floor_area_total,
+    size_floor_area_source_type,
+    size_floor_area_source_links,
     size_width_frontage,
     sust_breeam_rating,
     sust_dec,
@@ -63,6 +72,7 @@ COPY (SELECT
     likes_total,
     survival_status,
     survival_source,
+    survival_source_links,
     disaster_type,
     disaster_severity,
     disaster_assessment_method,
diff --git a/migrations/040.ui_revamp_sources.down.sql b/migrations/040.ui_revamp_sources.down.sql
index 6fa76932..3b3d4a6e 100644
--- a/migrations/040.ui_revamp_sources.down.sql
+++ b/migrations/040.ui_revamp_sources.down.sql
@@ -3,4 +3,14 @@ ALTER TABLE buildings DROP COLUMN IF EXISTS location_address_links;
 ALTER TABLE buildings DROP COLUMN IF EXISTS location_coordinates_source;
 ALTER TABLE buildings DROP COLUMN IF EXISTS location_coordinates_links;
 ALTER TABLE buildings DROP COLUMN IF EXISTS is_domestic_source;
-ALTER TABLE buildings DROP COLUMN IF EXISTS is_domestic_links;
\ No newline at end of file
+ALTER TABLE buildings DROP COLUMN IF EXISTS is_domestic_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_storeys_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_storeys_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_height_apex_source_type; 
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_height_apex_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_height_eaves_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_height_eaves_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_height_eaves;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_width_frontage_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_width_frontage_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS survival_source_links;
diff --git a/migrations/040.ui_revamp_sources.up.sql b/migrations/040.ui_revamp_sources.up.sql
index 7a08b6fd..49e3cd76 100644
--- a/migrations/040.ui_revamp_sources.up.sql
+++ b/migrations/040.ui_revamp_sources.up.sql
@@ -3,4 +3,16 @@ ALTER TABLE buildings ADD COLUMN IF NOT EXISTS location_address_links text[];
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS location_coordinates_source text;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS location_coordinates_links text[];
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS is_domestic_source text;
-ALTER TABLE buildings ADD COLUMN IF NOT EXISTS is_domestic_links text[];
\ No newline at end of file
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS is_domestic_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_storeys_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_storeys_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_height_apex_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_height_apex_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_height_eaves_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_height_eaves_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_height_eaves text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_floor_area_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_floor_area_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_width_frontage_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_width_frontage_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS survival_source_links text[];
\ No newline at end of file

From 8487ce3afeca3e8947b1d44283ed34142eb56b7e Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 24 May 2023 14:53:14 +0100
Subject: [PATCH 25/42] Other Category Updates

- Consistent Construction Date between Age and Team categories
- Disable unused Verify buttons
- Add missing Verify buttons
- Add tooltips to Disaster section
- Add new fields to database
---
 app/src/api/config/dataFields.ts              |  32 +++
 .../building/data-containers/age-history.tsx  |  56 +++--
 .../data-containers/energy-performance.tsx    |  35 ++-
 .../building/data-containers/resilience.tsx   |   9 +-
 .../building/data-containers/size.tsx         |   8 +
 .../building/data-containers/team.tsx         | 201 ++++++++++++++----
 app/src/frontend/config/data-fields-config.ts |  69 +++++-
 migrations/040.ui_revamp_sources.down.sql     |   5 +
 migrations/040.ui_revamp_sources.up.sql       |   7 +-
 9 files changed, 358 insertions(+), 64 deletions(-)

diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
index 2b9b563e..0583c2ab 100644
--- a/app/src/api/config/dataFields.ts
+++ b/app/src/api/config/dataFields.ts
@@ -304,6 +304,14 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true,
     },
+    sust_retrofit_source_type: {
+        edit: true,
+        verify: true,
+    },
+    sust_retrofit_source_links: {
+        edit: true,
+        verify: true,
+    },
     sust_life_expectancy: {
         edit: false,
     },
@@ -422,6 +430,14 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true
     },
+    extension_source_type: {
+        edit: true,
+        verify: true
+    },
+    extension_source_links: {
+        edit: true,
+        verify: true
+    },
     developer_type: {
         edit: true,
         verify: true
@@ -430,6 +446,10 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true
     },
+    developer_source_type: {
+        edit: true,
+        verify: true
+    },
     developer_source_link: {
         edit: true,
         verify: true
@@ -438,6 +458,10 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true
     },
+    landowner_source_type: {
+        edit: true,
+        verify: true
+    },
     landowner_source_link: {
         edit: true,
         verify: true
@@ -446,6 +470,10 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true
     },
+    designers_source_type: {
+        edit: true,
+        verify: true
+    },
     designers_source_link: {
         edit: true,
         verify: true
@@ -466,6 +494,10 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true
     },
+    builder_source_type: {
+        edit: true,
+        verify: true
+    },
     builder_source_link: {
         edit: true,
         verify: true
diff --git a/app/src/frontend/building/data-containers/age-history.tsx b/app/src/frontend/building/data-containers/age-history.tsx
index 93420d73..0b491e85 100644
--- a/app/src/frontend/building/data-containers/age-history.tsx
+++ b/app/src/frontend/building/data-containers/age-history.tsx
@@ -106,6 +106,24 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     placeholder={dataFields.date_source.example}
                     options={dataFields.date_source.items}
                     />
+                {(props.building.date_source == dataFields.date_source.items[0] ||
+                props.building.date_source == dataFields.date_source.items[1] ||
+                props.building.date_source == null) ? <></> :
+                <>
+                    <MultiDataEntry
+                        title={dataFields.date_link.title}
+                        slug="date_link"
+                        value={props.building.date_link}
+                        mode={props.mode}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                        tooltip={dataFields.date_link.tooltip}
+                        placeholder="https://..."
+                        editableEntries={true}
+                        isUrl={true}
+                    />
+                </>
+            }
                 <hr/>
                 <InfoBox type='warning'>
                     This section is under development.
@@ -331,18 +349,24 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     options={dataFields.date_source.items}
                     placeholder={dataFields.date_source.example}
                     />
-                <MultiDataEntry
-                    title={dataFields.date_link.title}
-                    slug="date_link"
-                    value={props.building.date_link}
-                    mode={props.mode}
-                    copy={props.copy}
-                    onChange={props.onChange}
-                    tooltip={dataFields.date_link.tooltip}
-                    placeholder="https://..."
-                    editableEntries={true}
-                    isUrl={true}
-                    />
+                {(props.building.date_source == dataFields.date_source.items[0] ||
+                    props.building.date_source == dataFields.date_source.items[1] ||
+                    props.building.date_source == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.date_link.title}
+                            slug="date_link"
+                            value={props.building.date_link}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.date_link.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
                 <hr/>
                 <InfoBox type='warning'>
                     This section is under development.
@@ -373,14 +397,14 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     value=""
                     mode='view'
                 />
-                <Verification
+                {/* <Verification
                     slug="date_link"
                     allow_verify={props.user !== undefined && props.building.date_link !== null && !props.edited}
                     onVerify={props.onVerify}
                     user_verified={props.user_verified.hasOwnProperty("date_link")}
                     user_verified_as={props.user_verified.date_link}
                     verified_count={props.building.verified.date_link}
-                    />
+                    /> */}
                 <DataEntry
                     title="Source"
                     slug=""
@@ -393,14 +417,14 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     value=""
                     mode='view'
                 />
-                <Verification
+                {/* <Verification
                     slug="date_link"
                     allow_verify={props.user !== undefined && props.building.date_link !== null && !props.edited}
                     onVerify={props.onVerify}
                     user_verified={props.user_verified.hasOwnProperty("date_link")}
                     user_verified_as={props.user_verified.date_link}
                     verified_count={props.building.verified.date_link}
-                    />
+                    /> */}
                 <DataEntry
                     title="Source"
                     slug=""
diff --git a/app/src/frontend/building/data-containers/energy-performance.tsx b/app/src/frontend/building/data-containers/energy-performance.tsx
index e65b603f..5edfcacf 100644
--- a/app/src/frontend/building/data-containers/energy-performance.tsx
+++ b/app/src/frontend/building/data-containers/energy-performance.tsx
@@ -10,6 +10,7 @@ import InfoBox from '../../components/info-box';
 
 import { CategoryViewProps } from './category-view-props';
 import { DataEntryGroup } from '../data-components/data-entry-group';
+import { MultiDataEntry } from '../data-components/multi-data-entry/multi-data-entry';
 
 const EnergyCategoryOptions = ["A", "B", "C", "D", "E", "F", "G"];
 const BreeamRatingOptions = [
@@ -98,20 +99,50 @@ const SustainabilityView: React.FunctionComponent<CategoryViewProps> = (props) =
                     user_verified_as={props.user_verified.sust_retrofit_date}
                     verified_count={props.building.verified.sust_retrofit_date}
                     />
+                <SelectDataEntry
+                    title={dataFields.sust_retrofit_source_type.title}
+                    slug="sust_retrofit_source_type"
+                    value={props.building.sust_retrofit_source_type}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.sust_retrofit_source_type.tooltip}
+                    options={dataFields.sust_retrofit_source_type.items}
+                    placeholder={dataFields.sust_retrofit_source_type.example}
+                    />
+                {(props.building.sust_retrofit_source_type == dataFields.sust_retrofit_source_type.items[0] ||
+                    props.building.sust_retrofit_source_type == dataFields.sust_retrofit_source_type.items[1] ||
+                    props.building.sust_retrofit_source_type == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.sust_retrofit_source_links.title}
+                            slug="sust_retrofit_source_links"
+                            value={props.building.sust_retrofit_source_links}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.sust_retrofit_source_links.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
+                <hr/>
                 <DataEntry
                     title="Date of Significant Retrofits"
                     slug=""
                     value=""
                     mode='view'
                 />
-                <Verification
+                {/* <Verification
                     slug="date_link"
                     allow_verify={props.user !== undefined && props.building.date_link !== null && !props.edited}
                     onVerify={props.onVerify}
                     user_verified={props.user_verified.hasOwnProperty("date_link")}
                     user_verified_as={props.user_verified.date_link}
                     verified_count={props.building.verified.date_link}
-                    />
+                    /> */}
                 <DataEntry
                     title="Source"
                     slug=""
diff --git a/app/src/frontend/building/data-containers/resilience.tsx b/app/src/frontend/building/data-containers/resilience.tsx
index 3d4c9c0f..b1e2bf97 100644
--- a/app/src/frontend/building/data-containers/resilience.tsx
+++ b/app/src/frontend/building/data-containers/resilience.tsx
@@ -24,6 +24,9 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
 
     return (<>
         <DataEntryGroup name="Building damage assessment tool" collapsed={true} >
+            <InfoBox type='warning'>
+                This section is under development.
+            </InfoBox>
             <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
                 <i>
                     This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters. 
@@ -76,7 +79,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     'Other human (blast damage/spills etc.)',
                     'Other'
                 ]}
-
+                tooltip={dataFields.disaster_type.tooltip}
                 onChange={props.onChange}
                 mode={props.mode}
                 copy={props.copy}
@@ -93,7 +96,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     'Minimal',
                     'No damage visible',
                 ]}
-
+                tooltip={dataFields.disaster_severity.tooltip}
                 onChange={props.onChange}
                 mode={props.mode}
                 copy={props.copy}
@@ -116,7 +119,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     'Specialist emergency group/charity',
                     'Other',
                 ]}
-
+                tooltip={dataFields.disaster_assessment_method.tooltip}
                 onChange={props.onChange}
                 mode={props.mode}
                 copy={props.copy}
diff --git a/app/src/frontend/building/data-containers/size.tsx b/app/src/frontend/building/data-containers/size.tsx
index 4e7f99c4..76151a57 100644
--- a/app/src/frontend/building/data-containers/size.tsx
+++ b/app/src/frontend/building/data-containers/size.tsx
@@ -160,6 +160,14 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                 step={0.1}
                 min={0}
                 />
+            <Verification
+                slug="size_height_eaves"
+                allow_verify={props.user !== undefined && props.building.size_height_eaves !== null}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("size_height_eaves")}
+                user_verified_as={props.user_verified.size_height_eaves}
+                verified_count={props.building.verified.size_height_eaves}
+                />
             <SelectDataEntry
                 title={dataFields.size_height_eaves_source_type.title}
                 slug="size_height_eaves_source_type"
diff --git a/app/src/frontend/building/data-containers/team.tsx b/app/src/frontend/building/data-containers/team.tsx
index 2c5ed2a1..73c7bb09 100644
--- a/app/src/frontend/building/data-containers/team.tsx
+++ b/app/src/frontend/building/data-containers/team.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react';
 import InfoBox from '../../components/info-box';
-import { dataFields } from '../../config/data-fields-config';
+import { commonSourceTypes, dataFields } from '../../config/data-fields-config';
 import SelectDataEntry from '../data-components/select-data-entry';
 import NumericDataEntry from '../data-components/numeric-data-entry';
 import Verification from '../data-components/verification';
@@ -42,6 +42,36 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     user_verified_as={props.user_verified.date_year}
                     verified_count={props.building.verified.date_year}
                     />
+                <SelectDataEntry
+                    title={dataFields.date_source.title}
+                    slug="date_source"
+                    value={props.building.date_source}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.date_source.tooltip}
+                    options={dataFields.date_source.items}
+                    placeholder={dataFields.date_source.example}
+                    />
+                {(props.building.date_source == dataFields.date_source.items[0] ||
+                    props.building.date_source == dataFields.date_source.items[1] ||
+                    props.building.date_source == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.date_link.title}
+                            slug="date_link"
+                            value={props.building.date_link}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.date_link.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
+                <hr/>
                 <LogicalDataEntry
                     title={dataFields.has_extension.title}
                     slug="has_extension"
@@ -73,6 +103,35 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
                         user_verified_as={props.user_verified.extension_year}
                         verified_count={props.building.verified.extension_year}
                         />
+                    <SelectDataEntry
+                        title={dataFields.extension_source_type.title}
+                        slug="extension_source_type"
+                        value={props.building.extension_source_type}
+                        mode={props.mode}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                        tooltip={dataFields.extension_source_type.tooltip}
+                        options={dataFields.extension_source_type.items}
+                        placeholder={dataFields.extension_source_type.example}
+                        />
+                    {(props.building.extension_source_type == dataFields.extension_source_type.items[0] ||
+                        props.building.extension_source_type == dataFields.extension_source_type.items[1] ||
+                        props.building.extension_source_type == null) ? <></> :
+                        <>
+                            <MultiDataEntry
+                                title={dataFields.extension_source_links.title}
+                                slug="extension_source_links"
+                                value={props.building.extension_source_links}
+                                mode={props.mode}
+                                copy={props.copy}
+                                onChange={props.onChange}
+                                tooltip={dataFields.extension_source_links.tooltip}
+                                placeholder="https://..."
+                                editableEntries={true}
+                                isUrl={true}
+                            />
+                        </>
+                    }
                 </>
                 ) : (null)}
             </DataEntryGroup>
@@ -96,18 +155,35 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     user_verified_as={props.user_verified.landowner}
                     verified_count={props.building.verified.landowner}
                     />
-                <MultiDataEntry
-                    title={dataFields.landowner_source_link.title}
-                    slug="landowner_source_link"
-                    value={props.building.landowner_source_link}
+                <SelectDataEntry
+                    title={dataFields.landowner_source_type.title}
+                    slug="landowner_source_type"
+                    value={props.building.landowner_source_type}
                     mode={props.mode}
                     copy={props.copy}
                     onChange={props.onChange}
-                    tooltip={dataFields.landowner_source_link.tooltip}
-                    placeholder="https://..."
-                    editableEntries={true}
-                    isUrl={true}
+                    tooltip={dataFields.landowner_source_type.tooltip}
+                    options={dataFields.landowner_source_type.items}
+                    placeholder={dataFields.landowner_source_type.example}
                     />
+                {(props.building.landowner_source_type == commonSourceTypes[0] ||
+                    props.building.landowner_source_type == commonSourceTypes[1] ||
+                    props.building.landowner_source_type == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.landowner_source_link.title}
+                            slug="landowner_source_link"
+                            value={props.building.landowner_source_link}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.landowner_source_link.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
             </DataEntryGroup>
             <DataEntryGroup name="Developer data">
                 <SelectDataEntry
@@ -146,18 +222,35 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     user_verified_as={props.user_verified.developer_name}
                     verified_count={props.building.verified.developer_name}
                     />
-                <MultiDataEntry
-                    title={dataFields.developer_source_link.title}
-                    slug="developer_source_link"
-                    value={props.building.developer_source_link}
+                <SelectDataEntry
+                    title={dataFields.developer_source_type.title}
+                    slug="developer_source_type"
+                    value={props.building.developer_source_type}
                     mode={props.mode}
                     copy={props.copy}
                     onChange={props.onChange}
-                    tooltip={dataFields.developer_source_link.tooltip}
-                    placeholder="https://..."
-                    editableEntries={true}
-                    isUrl={true}
+                    tooltip={dataFields.developer_source_type.tooltip}
+                    options={dataFields.developer_source_type.items}
+                    placeholder={dataFields.developer_source_type.example}
                     />
+                {(props.building.developer_source_type == commonSourceTypes[0] ||
+                    props.building.developer_source_type == commonSourceTypes[1] ||
+                    props.building.developer_source_type == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.developer_source_link.title}
+                            slug="developer_source_link"
+                            value={props.building.developer_source_link}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.developer_source_link.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
             </DataEntryGroup>
             <DataEntryGroup name="Designer data">
                 <MultiDataEntry
@@ -179,18 +272,7 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     user_verified_as={props.user_verified.designers}
                     verified_count={props.building.verified.designers}
                     />
-                <MultiDataEntry
-                    title={dataFields.designers_source_link.title}
-                    slug="designers_source_link"
-                    value={props.building.designers_source_link}
-                    mode={props.mode}
-                    copy={props.copy}
-                    onChange={props.onChange}
-                    tooltip={dataFields.designers_source_link.tooltip}
-                    placeholder="https://..."
-                    editableEntries={true}
-                    isUrl={true}
-                    />
+
                 <SelectDataEntry
                     slug='lead_designer_type'
                     title={dataFields.lead_designer_type.title}
@@ -208,6 +290,36 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     user_verified_as={props.user_verified.lead_designer_type}
                     verified_count={props.building.verified.lead_designer_type}
                     />
+                <SelectDataEntry
+                    title={dataFields.designers_source_type.title}
+                    slug="designers_source_type"
+                    value={props.building.designers_source_type}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.designers_source_type.tooltip}
+                    options={dataFields.designers_source_type.items}
+                    placeholder={dataFields.designers_source_type.example}
+                    />
+                {(props.building.designers_source_type == commonSourceTypes[0] ||
+                    props.building.designers_source_type == commonSourceTypes[1] ||
+                    props.building.designers_source_type == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.designers_source_link.title}
+                            slug="designers_source_link"
+                            value={props.building.designers_source_link}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.designers_source_link.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
+                <hr/>
                 <LogicalDataEntryYesOnly
                     slug='designer_awards'
                     title={dataFields.designer_awards.title}
@@ -270,17 +382,34 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 user_verified_as={props.user_verified.builder}
                 verified_count={props.building.verified.builder}
                 />
-            <MultiDataEntry
-                title={dataFields.builder_source_link.title}
-                slug="builder_source_link"
-                value={props.building.builder_source_link}
+            <SelectDataEntry
+                title={dataFields.builder_source_type.title}
+                slug="builder_source_type"
+                value={props.building.builder_source_type}
                 mode={props.mode}
                 copy={props.copy}
                 onChange={props.onChange}
-                placeholder="https://..."
-                editableEntries={true}
-                isUrl={true}
+                tooltip={dataFields.builder_source_type.tooltip}
+                options={dataFields.builder_source_type.items}
+                placeholder={dataFields.builder_source_type.example}
                 />
+            {(props.building.builder_source_type == commonSourceTypes[0] ||
+                props.building.builder_source_type == commonSourceTypes[1] ||
+                props.building.builder_source_type == null) ? <></> :
+                <>
+                    <MultiDataEntry
+                        title={dataFields.builder_source_link.title}
+                        slug="builder_source_link"
+                        value={props.building.builder_source_link}
+                        mode={props.mode}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                        placeholder="https://..."
+                        editableEntries={true}
+                        isUrl={true}
+                    />
+                </>
+            }
         </DataEntryGroup>
      </form>
     );
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 62bd018b..e1a90f71 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -557,6 +557,19 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip: "Date of last major building refurbishment",
         example: 1920,
     },
+    sust_retrofit_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source of last significant retrofit data",
+        example: "",
+        items: commonSourceTypes
+    },
+    sust_retrofit_source_links: {
+        category: Category.Team,
+        title: "Source links",
+        tooltip: "URL(s) for last significant retrofit data source(s)",
+        example: ["", "", ""],
+    },
     sust_life_expectancy: {
         category: Category.EnergyPerformance,
         title: "Expected lifespan for typology",
@@ -837,6 +850,19 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip_extension: "This should be the year the extension was built, not the original building",
         example: 2020
     },
+    extension_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source type for extension data",
+        example: "",
+        items: commonSourceTypes
+    },
+    extension_source_links: {
+        category: Category.Team,
+        title: "Source link(s)",
+        tooltip: "Source link(s) for extension data",
+        example: ["", "", ""],
+    },
     developer_type: {
         category: Category.Team,
         title: "What type of developer built the building?",
@@ -858,6 +884,13 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip: "Free text. First name, space, then Last name",
         example: ["", "", ""],
     },
+    developer_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source type for developer data",
+        example: "",
+        items: commonSourceTypes
+    },
     developer_source_link: {
         category: Category.Team,
         title: "Source links for developer(s)",
@@ -870,10 +903,17 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip: "Free text. First name, space, then Last name",
         example: ["", "", ""],
     },
+    landowner_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source type for landowner data",
+        example: "",
+        items: commonSourceTypes
+    },
     landowner_source_link: {
         category: Category.Team,
-        title: "Source links for landowner(s)",
-        tooltip: "URL for source for landowner(s)",
+        title: "Source link(s)",
+        tooltip: "URL(s) for source for landowner data",
         example: ["", "", ""],
     },
     designers: {
@@ -882,6 +922,13 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip: "Free text. First name, space, then Last name",
         example: ["", "", ""],
     },
+    designers_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source type for designer data",
+        example: "",
+        items: commonSourceTypes
+    },
     designers_source_link: {
         category: Category.Team,
         title: "Source links for designer(s)",
@@ -918,6 +965,13 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         title: "Name of builder/construction team",
         example: ["", "", ""],
     },
+    builder_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source type for builder data",
+        example: "",
+        items: commonSourceTypes
+    },
     builder_source_link: {
         category: Category.Team,
         title: "Source for builder/construction team",
@@ -935,23 +989,26 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     disaster_type: {
         category: Category.Resilience,
-        title: "What type of disaster management do you wish to collect data for?",
+        title: "Disaster type",
+        tooltip: "What type of disaster management do you wish to collect data for?",
         example: "Flood"
     },
     disaster_severity: {
         category: Category.Resilience,
         title: "How severe do you assess the damage to be?",
+        tooltip: "Best estimate for the severity of damage to the building",
         example: "Building destroyed"
     },
     disaster_assessment_method: {
         category: Category.Resilience,
-        title: "Please add a method of assessment",
+        title: "Method of assessment",
+        tooltip: "Please add a Best estimate for the severity of damage to the building",
         example: "Citizen/Passerby by eye"
     },
     disaster_source_link: {
         category: Category.Resilience,
-        title: "Please add a source link to official documentation/photographic evidence where applicable",
-        tooltip: "URL for data sources(s)",
+        title: "Source link(s)",
+        tooltip: "Please add a source link(s) to official documentation/photographic evidence where applicable",
         example: ["", "", ""],
     },
     disaster_start_date: {
diff --git a/migrations/040.ui_revamp_sources.down.sql b/migrations/040.ui_revamp_sources.down.sql
index 3b3d4a6e..9af8c0f0 100644
--- a/migrations/040.ui_revamp_sources.down.sql
+++ b/migrations/040.ui_revamp_sources.down.sql
@@ -14,3 +14,8 @@ ALTER TABLE buildings DROP COLUMN IF EXISTS size_height_eaves;
 ALTER TABLE buildings DROP COLUMN IF EXISTS size_width_frontage_source_type;
 ALTER TABLE buildings DROP COLUMN IF EXISTS size_width_frontage_source_links;
 ALTER TABLE buildings DROP COLUMN IF EXISTS survival_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS landowner_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS designers_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS builder_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS extension_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS extension_source_links;
diff --git a/migrations/040.ui_revamp_sources.up.sql b/migrations/040.ui_revamp_sources.up.sql
index 49e3cd76..b73dc463 100644
--- a/migrations/040.ui_revamp_sources.up.sql
+++ b/migrations/040.ui_revamp_sources.up.sql
@@ -15,4 +15,9 @@ ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_floor_area_source_type text;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_floor_area_source_links text[];
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_width_frontage_source_type text;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_width_frontage_source_links text[];
-ALTER TABLE buildings ADD COLUMN IF NOT EXISTS survival_source_links text[];
\ No newline at end of file
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS survival_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS landowner_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS designers_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS builder_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS extension_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS extension_source_links text[];
\ No newline at end of file

From 31c1c382f33b7e0dd932e68a0f9a78949b8cbba9 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 24 May 2023 15:43:15 +0100
Subject: [PATCH 26/42] Remove Unused Retrofit fields

---
 .../building/data-containers/energy-performance.tsx       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/frontend/building/data-containers/energy-performance.tsx b/app/src/frontend/building/data-containers/energy-performance.tsx
index 5edfcacf..bdace92a 100644
--- a/app/src/frontend/building/data-containers/energy-performance.tsx
+++ b/app/src/frontend/building/data-containers/energy-performance.tsx
@@ -128,27 +128,27 @@ const SustainabilityView: React.FunctionComponent<CategoryViewProps> = (props) =
                         />
                     </>
                 }
-                <hr/>
+                {/* <hr/>
                 <DataEntry
                     title="Date of Significant Retrofits"
                     slug=""
                     value=""
                     mode='view'
                 />
-                {/* <Verification
+                <Verification
                     slug="date_link"
                     allow_verify={props.user !== undefined && props.building.date_link !== null && !props.edited}
                     onVerify={props.onVerify}
                     user_verified={props.user_verified.hasOwnProperty("date_link")}
                     user_verified_as={props.user_verified.date_link}
                     verified_count={props.building.verified.date_link}
-                    /> */}
+                    />
                 <DataEntry
                     title="Source"
                     slug=""
                     value=""
                     mode='view'
-                />
+                /> */}
             </DataEntryGroup>
             <DataEntryGroup name="Other sustainability features">
                 <DataEntry

From 44ab9377dda265fae5f7467e69d99fc7b73cdd67 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Fri, 26 May 2023 14:34:36 +0100
Subject: [PATCH 27/42] Re-add missing horizontal line

---
 app/src/frontend/building/data-container.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/frontend/building/data-container.tsx b/app/src/frontend/building/data-container.tsx
index c7817571..96c3fb88 100644
--- a/app/src/frontend/building/data-container.tsx
+++ b/app/src/frontend/building/data-container.tsx
@@ -362,6 +362,7 @@ const withCopyEdit: (wc: React.ComponentType<CategoryViewProps>) => DataContaine
                 <EditHistoryLatest
                     building={this.props.building}
                 />
+                <hr/>
                 {
                     this.props.inactive ?
                         <Fragment>

From 5efce50d4d7ba6ff535928b5ed8b2bc1ab023595 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 31 May 2023 12:18:34 +0100
Subject: [PATCH 28/42] Remove extraneous horizontal line

Added because it wasn't displaying, but it appears to have fixed itself *facepalm*
---
 app/src/frontend/building/data-container.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/frontend/building/data-container.tsx b/app/src/frontend/building/data-container.tsx
index 96c3fb88..c7817571 100644
--- a/app/src/frontend/building/data-container.tsx
+++ b/app/src/frontend/building/data-container.tsx
@@ -362,7 +362,6 @@ const withCopyEdit: (wc: React.ComponentType<CategoryViewProps>) => DataContaine
                 <EditHistoryLatest
                     building={this.props.building}
                 />
-                <hr/>
                 {
                     this.props.inactive ?
                         <Fragment>

From 79918c7b9ffd8aaf6096a1e00f60e91f7c87b417 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 31 May 2023 12:53:18 +0100
Subject: [PATCH 29/42] OK, *this* is where the horizontal line is supposed to
 go!

Moved it so it is always visible, not just when you are editing
---
 app/src/frontend/building/data-container.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/frontend/building/data-container.tsx b/app/src/frontend/building/data-container.tsx
index c7817571..c72fd216 100644
--- a/app/src/frontend/building/data-container.tsx
+++ b/app/src/frontend/building/data-container.tsx
@@ -413,13 +413,13 @@ const withCopyEdit: (wc: React.ComponentType<CategoryViewProps>) => DataContaine
                                                                 </button> :
                                                                 null
                                                         }
-                                                        <hr/>
                                                     </div>
                                                     
                                             }
                                         </div>
                                         : null
                                 }
+                                <hr/>
                                 <WrappedComponent
                                     intro={this.props.intro}
                                     building={currentBuilding}

From 439e415c6e45ef5c7119574e470ecaa69398e154 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 31 May 2023 21:05:02 +0100
Subject: [PATCH 30/42] Changes for #1165

---
 app/src/api/config/dataFields.ts              | 116 ++++
 .../building/data-containers/community.tsx    |  11 +-
 .../building/data-containers/land-use.tsx     |   4 +-
 .../building/data-containers/location.tsx     | 511 +++++++++---------
 .../building/data-containers/resilience.tsx   |  91 ++--
 .../building/data-containers/size.tsx         | 227 +++++---
 .../data-containers/street-context.tsx        | 358 ++++++++++--
 .../building/data-containers/team.tsx         |   2 +-
 app/src/frontend/building/sidebar.css         |   5 +
 app/src/frontend/config/categories-config.ts  |   1 -
 app/src/frontend/config/data-fields-config.ts | 251 ++++++++-
 migrations/040.ui_revamp_sources.down.sql     |  29 +
 migrations/040.ui_revamp_sources.up.sql       |  31 +-
 13 files changed, 1175 insertions(+), 462 deletions(-)

diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
index 0583c2ab..031aa840 100644
--- a/app/src/api/config/dataFields.ts
+++ b/app/src/api/config/dataFields.ts
@@ -214,6 +214,42 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true,
     },
+    size_far_ratio: {
+        edit: true,
+        verify: true,
+    },
+    size_far_ratio_source_type: {
+        edit: true,
+        verify: true,
+    },
+    size_far_ratio_source_links: {
+        edit: true,
+        verify: true,
+    },
+    size_plot_area_total: {
+        edit: true,
+        verify: true,
+    },
+    size_plot_area_total_source_type: {
+        edit: true,
+        verify: true,
+    },
+    size_plot_area_total_source_links: {
+        edit: true,
+        verify: true,
+    },
+    size_parcel_geometry: {
+        edit: true,
+        verify: true,
+    },
+    size_parcel_geometry_source_type: {
+        edit: true,
+        verify: true,
+    },
+    size_parcel_geometry_source_links: {
+        edit: true,
+        verify: true,
+    },
     construction_core_material: {
         edit: true,
         verify: true,
@@ -533,6 +569,86 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
     disaster_end_date : {
         edit: true,
         verify: true
+    },
+    context_front_garden : {
+        edit: true,
+        verify: true
+    },
+    context_back_garden : {
+        edit: true,
+        verify: true
+    },
+    context_flats_garden : {
+        edit: true,
+        verify: true
+    },
+    context_garden_source_type : {
+        edit: true,
+        verify: true
+    },
+    context_garden_source_links : {
+        edit: true,
+        verify: true
+    },
+    context_street_width : {
+        edit: true,
+        verify: true
+    },
+    context_street_width_source_type : {
+        edit: true,
+        verify: true
+    },
+    context_street_width_source_links : {
+        edit: true,
+        verify: true
+    },
+    context_pavement_width : {
+        edit: true,
+        verify: true
+    },
+    context_pavement_width_source_type : {
+        edit: true,
+        verify: true
+    },
+    context_pavement_width_source_links : {
+        edit: true,
+        verify: true
+    },
+    context_street_geometry : {
+        edit: true,
+        verify: true
+    },
+    context_street_geometry_source_type : {
+        edit: true,
+        verify: true
+    },
+    context_street_geometry_source_links : {
+        edit: true,
+        verify: true
+    },
+    context_green_space_distance : {
+        edit: true,
+        verify: true
+    },
+    context_green_space_distance_source_type : {
+        edit: true,
+        verify: true
+    },
+    context_green_space_distance_source_links : {
+        edit: true,
+        verify: true
+    },
+    context_tree_distance : {
+        edit: true,
+        verify: true
+    },
+    context_tree_distance_source_type : {
+        edit: true,
+        verify: true
+    },
+    ccontext_tree_distance_source_links : {
+        edit: true,
+        verify: true
     }
 });
 
diff --git a/app/src/frontend/building/data-containers/community.tsx b/app/src/frontend/building/data-containers/community.tsx
index 6277905a..45aee4d2 100644
--- a/app/src/frontend/building/data-containers/community.tsx
+++ b/app/src/frontend/building/data-containers/community.tsx
@@ -43,7 +43,7 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
         <DataEntryGroup name="Community views on building types">
         <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
             <i>
-            Note: We are not currently collecting data on domestic/privately owned properties, only on public buildings.
+                Note: We are currently only collecting data on non-residential buildings.
             </i>
         </div>
         <div className='community-opinion-pane'>
@@ -201,14 +201,7 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
             slug='community_public_ownership'
             title={dataFields.community_public_ownership.title}
             value={props.building.community_public_ownership}
-            options={[
-                'Government-owned',
-                'Charity-owned',
-                'Community-owned/cooperative',
-                'Owned by other non-profit body',
-                'Not in public/community ownership',
-            ]}
-
+            options={dataFields.community_public_ownership.items}
             onChange={props.onChange}
             mode={props.mode}
             copy={props.copy}
diff --git a/app/src/frontend/building/data-containers/land-use.tsx b/app/src/frontend/building/data-containers/land-use.tsx
index e8e8b1be..6a15a978 100644
--- a/app/src/frontend/building/data-containers/land-use.tsx
+++ b/app/src/frontend/building/data-containers/land-use.tsx
@@ -25,10 +25,10 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const { darkLightTheme } = useDisplayPreferences();
       return (
           <Fragment>
-                <DataEntryGroup name="Domestic/non-domestic use data">
+                <DataEntryGroup name="Residential/non-residential land use data (general)">
                     <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
                         <i>
-                            93% of properties in UK are residential dwellings so we have set 'residential' as the default value. Can you help us identify non-residential and mixed use buildings (and verify residential buildings too)?
+                            The vast majority of properties are residential (93% in the UK), so we have set 'residential' as the default value. Can you help us identify non-residential and mixed use buildings (and verify residential buildings too)?
                         </i>
                     </div>
                     <button className={`map-switcher-inline ${props.mapColourScale == "is_domestic" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToIsDomesticMapStyle}>
diff --git a/app/src/frontend/building/data-containers/location.tsx b/app/src/frontend/building/data-containers/location.tsx
index f44ecb82..94b63015 100644
--- a/app/src/frontend/building/data-containers/location.tsx
+++ b/app/src/frontend/building/data-containers/location.tsx
@@ -13,262 +13,271 @@ import { MultiDataEntry } from '../data-components/multi-data-entry/multi-data-e
 
 const locationNumberPattern = "[1-9]\\d*[a-z]?(-([1-9]\\d*))?"; ///[1-9]\d*[a-z]?(-([1-9]\d*))?/;
 
-const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => (
-    <Fragment>
-        <DataEntryGroup name="Address data">
-            <DataEntry
-                title={dataFields.location_name.title}
-                slug="location_name"
-                value={props.building.location_name}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                tooltip={dataFields.location_name.tooltip}
-                placeholder="https://..."
-                isUrl={true}
-            />
-            <Verification
-                slug="location_name"
-                allow_verify={props.user !== undefined && props.building.location_name !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("location_name")}
-                user_verified_as={props.user_verified.location_name}
-                verified_count={props.building.verified.location_name}
-            />
-            <DataEntry
-                title="Building name (domestic)"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Not yet activated.<br><br>For security reasons, we do not allow the use of free text boxes and are currently looking into alternative ways to collect this data."
-            />
-            <hr/>
-            <PatternDataEntry
-                title={dataFields.location_number.title}
-                slug="location_number"
-                value={props.building.location_number}
-                pattern={locationNumberPattern}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                tooltip={dataFields.location_number.tooltip}
+const LocationView: React.FunctionComponent<CategoryViewProps> = (props) => {
+    const osm_url = "https://www.openstreetmap.org/way/"+props.building.ref_osm_id;
+    return (
+        <Fragment>
+            <DataEntryGroup name="Address data">
+                <DataEntry
+                    title={dataFields.location_name.title}
+                    slug="location_name"
+                    value={props.building.location_name}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.location_name.tooltip}
+                    placeholder="https://..."
+                    isUrl={true}
                 />
-            <Verification
-                slug="location_number"
-                allow_verify={props.user !== undefined && props.building.location_number !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("location_number")}
-                user_verified_as={props.user_verified.location_number}
-                verified_count={props.building.verified.location_number}
+                <Verification
+                    slug="location_name"
+                    allow_verify={props.user !== undefined && props.building.location_name !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("location_name")}
+                    user_verified_as={props.user_verified.location_name}
+                    verified_count={props.building.verified.location_name}
                 />
-            <DataEntry
-                title={dataFields.location_street.title}
-                slug="location_street"
-                value={props.building.location_street}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                maxLength={30}
+                <DataEntry
+                    title="Building name (domestic)"
+                    slug=""
+                    value=""
+                    mode='view'
+                    tooltip="Not yet activated.<br><br>For security reasons, we do not allow the use of free text boxes and are currently looking into alternative ways to collect this data."
                 />
-            <Verification
-                slug="location_street"
-                allow_verify={props.user !== undefined && props.building.location_street !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("location_street")}
-                user_verified_as={props.user_verified.location_street}
-                verified_count={props.building.verified.location_street}
-                />
-            <DataEntry
-                title={dataFields.location_line_two.title}
-                slug="location_line_two"
-                value={props.building.location_line_two}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                maxLength={30}
-                />
-            <Verification
-                slug="location_line_two"
-                allow_verify={props.user !== undefined && props.building.location_line_two !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("location_line_two")}
-                user_verified_as={props.user_verified.location_line_two}
-                verified_count={props.building.verified.location_line_two}
-                />
-            <DataEntry
-                title={dataFields.location_town.title}
-                slug="location_town"
-                value={props.building.location_town}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                />
-            <Verification
-                slug="location_town"
-                allow_verify={props.user !== undefined && props.building.location_town !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("location_town")}
-                user_verified_as={props.user_verified.location_town}
-                verified_count={props.building.verified.location_town}
-                />
-            <DataEntry
-                title={dataFields.location_postcode.title}
-                slug="location_postcode"
-                value={props.building.location_postcode}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                maxLength={8}
-                valueTransform={x=>x.toUpperCase()}
-                />
-            <Verification
-                slug="location_postcode"
-                allow_verify={props.user !== undefined && props.building.location_postcode !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("location_postcode")}
-                user_verified_as={props.user_verified.location_postcode}
-                verified_count={props.building.verified.location_postcode}
-                />
-            <SelectDataEntry
-                title={dataFields.location_address_source.title}
-                slug="location_address_source"
-                value={props.building.location_address_source}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                tooltip={dataFields.location_address_source.tooltip}
-                placeholder={dataFields.location_address_source.example}
-                options={dataFields.location_address_source.items}
-                />
-            {(props.building.location_address_source == commonSourceTypes[0] ||
-                props.building.location_address_source == commonSourceTypes[1] ||
-                props.building.location_address_source == null) ? <></> :
-                <>
-                    <MultiDataEntry
-                        title={dataFields.location_address_links.title}
-                        slug="location_address_links"
-                        value={props.building.location_address_links}
-                        mode={props.mode}
-                        copy={props.copy}
-                        onChange={props.onChange}
-                        tooltip={dataFields.location_address_links.tooltip}
-                        placeholder="https://..."
-                        editableEntries={true}
-                        isUrl={true}
+                <hr/>
+                <PatternDataEntry
+                    title={dataFields.location_number.title}
+                    slug="location_number"
+                    value={props.building.location_number}
+                    pattern={locationNumberPattern}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.location_number.tooltip}
                     />
-                </>
-            }
-        </DataEntryGroup>
-        <DataEntryGroup name="Property/footprint IDs and coordinate data">
-            <DataEntry
-                title={dataFields.ref_toid.title}
-                slug="ref_toid"
-                value={props.building.ref_toid}
-                mode={props.mode}
-                copy={props.copy}
-                tooltip={dataFields.ref_toid.tooltip}
-                onChange={props.onChange}
-                disabled={true}
-                />
-            <UPRNsDataEntry
-                title={dataFields.uprns.title}
-                slug="ref_uprns"
-                value={props.building.uprns}
-                tooltip={dataFields.uprns.tooltip}
-                />
-            <DataEntry
-                title={dataFields.ref_osm_id.title}
-                slug="ref_osm_id"
-                value={props.building.ref_osm_id}
-                mode={props.mode}
-                copy={props.copy}
-                tooltip={dataFields.ref_osm_id.tooltip}
-                maxLength={20}
-                onChange={props.onChange}
-                />
-            <Verification
-                slug="ref_osm_id"
-                allow_verify={props.user !== undefined && props.building.ref_osm_id !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("ref_osm_id")}
-                user_verified_as={props.user_verified.ref_osm_id}
-                verified_count={props.building.verified.ref_osm_id}
-                />
-            <hr/>
-            <NumericDataEntry
-                title={dataFields.location_latitude.title}
-                slug="location_latitude"
-                value={props.building.location_latitude}
-                tooltip={dataFields.location_latitude.tooltip}
-                mode={props.mode}
-                copy={props.copy}
-                step={0.00001}
-                min={-90}
-                max={90}
-                placeholder="Latitude, e.g. 51.5467"
-                onChange={props.onChange}
-                />
-            <Verification
-                slug="location_latitude"
-                allow_verify={props.user !== undefined && props.building.location_latitude !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("location_latitude")}
-                user_verified_as={props.user_verified.location_latitude}
-                verified_count={props.building.verified.location_latitude}
-                />
-            <NumericDataEntry
-                title={dataFields.location_longitude.title}
-                slug="location_longitude"
-                value={props.building.location_longitude}
-                tooltip={dataFields.location_latitude.tooltip}
-                mode={props.mode}
-                copy={props.copy}
-                step={0.00001}
-                min={-180}
-                max={180}
-                placeholder="Longitude, e.g. -0.0586"
-                onChange={props.onChange}
-                />
-            <Verification
-                slug="location_longitude"
-                allow_verify={props.user !== undefined && props.building.location_longitude !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("location_longitude")}
-                user_verified_as={props.user_verified.location_longitude}
-                verified_count={props.building.verified.location_longitude}
-                />
-            <SelectDataEntry
-                title={dataFields.location_coordinates_source.title}
-                slug="location_coordinates_source"
-                value={props.building.location_coordinates_source}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                tooltip={dataFields.location_coordinates_source.tooltip}
-                placeholder={dataFields.location_coordinates_source.example}
-                options={dataFields.location_coordinates_source.items}
-                />
-            {(props.building.location_coordinates_source == commonSourceTypes[0] ||
-                props.building.location_coordinates_source == commonSourceTypes[1] ||
-                props.building.location_coordinates_source == null) ? <></> :
-                <>
-                    <MultiDataEntry
-                        title={dataFields.location_coordinates_links.title}
-                        slug="location_coordinates_links"
-                        value={props.building.location_coordinates_links}
-                        mode={props.mode}
-                        copy={props.copy}
-                        onChange={props.onChange}
-                        tooltip={dataFields.location_coordinates_links.tooltip}
-                        placeholder="https://..."
-                        editableEntries={true}
-                        isUrl={true}
+                <Verification
+                    slug="location_number"
+                    allow_verify={props.user !== undefined && props.building.location_number !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("location_number")}
+                    user_verified_as={props.user_verified.location_number}
+                    verified_count={props.building.verified.location_number}
                     />
-                </>
-            }
-        </DataEntryGroup>
-    </Fragment>
-);
+                <DataEntry
+                    title={dataFields.location_street.title}
+                    slug="location_street"
+                    value={props.building.location_street}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    maxLength={30}
+                    />
+                <Verification
+                    slug="location_street"
+                    allow_verify={props.user !== undefined && props.building.location_street !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("location_street")}
+                    user_verified_as={props.user_verified.location_street}
+                    verified_count={props.building.verified.location_street}
+                    />
+                <DataEntry
+                    title={dataFields.location_line_two.title}
+                    slug="location_line_two"
+                    value={props.building.location_line_two}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    maxLength={30}
+                    />
+                <Verification
+                    slug="location_line_two"
+                    allow_verify={props.user !== undefined && props.building.location_line_two !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("location_line_two")}
+                    user_verified_as={props.user_verified.location_line_two}
+                    verified_count={props.building.verified.location_line_two}
+                    />
+                <DataEntry
+                    title={dataFields.location_town.title}
+                    slug="location_town"
+                    value={props.building.location_town}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    />
+                <Verification
+                    slug="location_town"
+                    allow_verify={props.user !== undefined && props.building.location_town !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("location_town")}
+                    user_verified_as={props.user_verified.location_town}
+                    verified_count={props.building.verified.location_town}
+                    />
+                <DataEntry
+                    title={dataFields.location_postcode.title}
+                    slug="location_postcode"
+                    value={props.building.location_postcode}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    maxLength={8}
+                    valueTransform={x=>x.toUpperCase()}
+                    />
+                <Verification
+                    slug="location_postcode"
+                    allow_verify={props.user !== undefined && props.building.location_postcode !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("location_postcode")}
+                    user_verified_as={props.user_verified.location_postcode}
+                    verified_count={props.building.verified.location_postcode}
+                    />
+                <SelectDataEntry
+                    title={dataFields.location_address_source.title}
+                    slug="location_address_source"
+                    value={props.building.location_address_source}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.location_address_source.tooltip}
+                    placeholder={dataFields.location_address_source.example}
+                    options={dataFields.location_address_source.items}
+                    />
+                {(props.building.location_address_source == commonSourceTypes[0] ||
+                    props.building.location_address_source == commonSourceTypes[1] ||
+                    props.building.location_address_source == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.location_address_links.title}
+                            slug="location_address_links"
+                            value={props.building.location_address_links}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.location_address_links.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
+            </DataEntryGroup>
+            <DataEntryGroup name="Property/footprint IDs and coordinate data">
+                <DataEntry
+                    title={dataFields.ref_toid.title}
+                    slug="ref_toid"
+                    value={props.building.ref_toid}
+                    mode={props.mode}
+                    copy={props.copy}
+                    tooltip={dataFields.ref_toid.tooltip}
+                    onChange={props.onChange}
+                    disabled={true}
+                    />
+                <UPRNsDataEntry
+                    title={dataFields.uprns.title}
+                    slug="ref_uprns"
+                    value={props.building.uprns}
+                    tooltip={dataFields.uprns.tooltip}
+                    />
+                <DataEntry
+                    title={dataFields.ref_osm_id.title}
+                    slug="ref_osm_id"
+                    value={props.building.ref_osm_id}
+                    mode={props.mode}
+                    copy={props.copy}
+                    tooltip={dataFields.ref_osm_id.tooltip}
+                    maxLength={20}
+                    onChange={props.onChange}
+                    />
+                {
+                    (props.building.ref_osm_id == null) ? <></> :
+                    <div className={`alert alert-dark`} role="alert" style={{ fontSize: 14, backgroundColor: "#f6f8f9" }}>
+                        <i className="source-url">Source: <a href={osm_url} target={"_blank"}>{osm_url}</a></i>
+                    </div>
+                }
+                <Verification
+                    slug="ref_osm_id"
+                    allow_verify={props.user !== undefined && props.building.ref_osm_id !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("ref_osm_id")}
+                    user_verified_as={props.user_verified.ref_osm_id}
+                    verified_count={props.building.verified.ref_osm_id}
+                    />
+                <hr/>
+                <NumericDataEntry
+                    title={dataFields.location_latitude.title}
+                    slug="location_latitude"
+                    value={props.building.location_latitude}
+                    tooltip={dataFields.location_latitude.tooltip}
+                    mode={props.mode}
+                    copy={props.copy}
+                    step={0.00001}
+                    min={-90}
+                    max={90}
+                    placeholder="Latitude, e.g. 51.5467"
+                    onChange={props.onChange}
+                    />
+                <Verification
+                    slug="location_latitude"
+                    allow_verify={props.user !== undefined && props.building.location_latitude !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("location_latitude")}
+                    user_verified_as={props.user_verified.location_latitude}
+                    verified_count={props.building.verified.location_latitude}
+                    />
+                <NumericDataEntry
+                    title={dataFields.location_longitude.title}
+                    slug="location_longitude"
+                    value={props.building.location_longitude}
+                    tooltip={dataFields.location_latitude.tooltip}
+                    mode={props.mode}
+                    copy={props.copy}
+                    step={0.00001}
+                    min={-180}
+                    max={180}
+                    placeholder="Longitude, e.g. -0.0586"
+                    onChange={props.onChange}
+                    />
+                <Verification
+                    slug="location_longitude"
+                    allow_verify={props.user !== undefined && props.building.location_longitude !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("location_longitude")}
+                    user_verified_as={props.user_verified.location_longitude}
+                    verified_count={props.building.verified.location_longitude}
+                    />
+                <SelectDataEntry
+                    title={dataFields.location_coordinates_source.title}
+                    slug="location_coordinates_source"
+                    value={props.building.location_coordinates_source}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.location_coordinates_source.tooltip}
+                    placeholder={dataFields.location_coordinates_source.example}
+                    options={dataFields.location_coordinates_source.items}
+                    />
+                {(props.building.location_coordinates_source == commonSourceTypes[0] ||
+                    props.building.location_coordinates_source == commonSourceTypes[1] ||
+                    props.building.location_coordinates_source == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.location_coordinates_links.title}
+                            slug="location_coordinates_links"
+                            value={props.building.location_coordinates_links}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.location_coordinates_links.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
+            </DataEntryGroup>
+        </Fragment>
+    );
+}
 const LocationContainer = withCopyEdit(LocationView);
 
 export default LocationContainer;
diff --git a/app/src/frontend/building/data-containers/resilience.tsx b/app/src/frontend/building/data-containers/resilience.tsx
index b1e2bf97..a77a3d8f 100644
--- a/app/src/frontend/building/data-containers/resilience.tsx
+++ b/app/src/frontend/building/data-containers/resilience.tsx
@@ -23,20 +23,14 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const [ endDate, setEndDate ] = useState(null);
 
     return (<>
-        <DataEntryGroup name="Building damage assessment tool" collapsed={true} >
-            <InfoBox type='warning'>
-                This section is under development.
-            </InfoBox>
+        <DataEntryGroup name="Building damage assessment tool" collapsed={true}>
             <div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
                 <i>
                     This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters. 
                     It is intended to help support emergency services, to record damage, and to aid reconstruction programmes.
                 </i>
             </div>
-            <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
-                {(historicData === 'enabled')?'Click here to hide disaster maps':'Click here to show disaster maps'}
-            </button>
-            <p>Date of disaster</p>
+            <label>Date of disaster</label>
             <div>
                 <DatePicker 
                     showIcon
@@ -65,37 +59,37 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     maxDate={new Date()}
                 />
             </div>
+            <Verification
+                slug="disaster_end_date"
+                allow_verify={props.user !== undefined && props.building.disaster_end_date !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("disaster_end_date")}
+                user_verified_as={props.user_verified.disaster_end_date}
+                verified_count={props.building.verified.disaster_end_date}
+            />
             <SelectDataEntry
                 slug='disaster_type'
                 title={dataFields.disaster_type.title}
                 value={props.building.disaster_type}
-                options={[
-                    'Flood',
-                    'Earthquake',
-                    'Hurricane',
-                    'Fire',
-                    'Extreme heat',
-                    'Political/war damage',
-                    'Other human (blast damage/spills etc.)',
-                    'Other'
-                ]}
+                options={dataFields.disaster_type.items}
                 tooltip={dataFields.disaster_type.tooltip}
                 onChange={props.onChange}
                 mode={props.mode}
                 copy={props.copy}
             />
+            <Verification
+                slug="disaster_type"
+                allow_verify={props.user !== undefined && props.building.disaster_type !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("disaster_type")}
+                user_verified_as={props.user_verified.disaster_type}
+                verified_count={props.building.verified.disaster_type}
+            />
             <SelectDataEntry
                 slug='disaster_severity'
                 title={dataFields.disaster_severity.title}
                 value={props.building.disaster_severity}
-                options={[
-                    'Building destroyed',
-                    'Very severe',
-                    'Severe',
-                    'Moderate',
-                    'Minimal',
-                    'No damage visible',
-                ]}
+                options={dataFields.disaster_severity.items}
                 tooltip={dataFields.disaster_severity.tooltip}
                 onChange={props.onChange}
                 mode={props.mode}
@@ -113,37 +107,30 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 slug='disaster_assessment_method'
                 title={dataFields.disaster_assessment_method.title}
                 value={props.building.disaster_assessment_method}
-                options={[
-                    'Citizen/Passerby by eye',
-                    'Government assessor',
-                    'Specialist emergency group/charity',
-                    'Other',
-                ]}
+                options={dataFields.disaster_assessment_method.items}
                 tooltip={dataFields.disaster_assessment_method.tooltip}
                 onChange={props.onChange}
                 mode={props.mode}
                 copy={props.copy}
             />
-            <Verification
-                slug="disaster_assessment_method"
-                allow_verify={props.user !== undefined && props.building.disaster_assessment_method !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("disaster_assessment_method")}
-                user_verified_as={props.user_verified.disaster_assessment_method}
-                verified_count={props.building.verified.disaster_assessment_method}
-            />
-            <MultiDataEntry
-              title={dataFields.disaster_source_link.title}
-              slug="disaster_source_link"
-              value={props.building.disaster_source_link}
-              mode={props.mode}
-              copy={props.copy}
-              onChange={props.onChange}
-              tooltip={dataFields.disaster_source_link.tooltip}
-              placeholder="https://..."
-              editableEntries={true}
-              isUrl={true}
-            />
+            {(props.building.disaster_assessment_method == dataFields.disaster_assessment_method.items[0] ||
+                    props.building.disaster_assessment_method == dataFields.disaster_assessment_method.items[1] ||
+                    props.building.disaster_assessment_method == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.disaster_source_link.title}
+                            slug="disaster_source_link"
+                            value={props.building.disaster_source_link}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.disaster_source_link.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                            />
+                    </>
+                }
         </DataEntryGroup>
         <DataEntryGroup name="Resilience indicators and risk assessment" collapsed={true} >
             <InfoBox type='warning'>
diff --git a/app/src/frontend/building/data-containers/size.tsx b/app/src/frontend/building/data-containers/size.tsx
index 76151a57..02ab7344 100644
--- a/app/src/frontend/building/data-containers/size.tsx
+++ b/app/src/frontend/building/data-containers/size.tsx
@@ -262,93 +262,6 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
             }
         </DataEntryGroup>
         <DataEntryGroup name="Plot size data">
-            <NumericDataEntry
-                title={dataFields.size_plot_area_total.title}
-                slug="size_plot_area_total"
-                mode='view'
-                step={0.1}
-                min={0}
-            />
-            <DataEntry
-                title="Source type"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
-            <DataEntry
-                title="Source link"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
-            <hr/>
-            <NumericDataEntry
-                title={dataFields.size_far_ratio.title}
-                slug="size_far_ratio"
-                mode='view'
-                step={0.1}
-                min={0}
-            />
-            <DataEntry
-                title="Source type"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
-            <DataEntry
-                title="Source link"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
-            <hr/>
-            <DataEntry
-                title="Plot dimensions"
-                slug=""
-                value=""
-                mode='view'
-            />
-            <DataEntry
-                title="Source type"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
-            <DataEntry
-                title="Source link"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
-            <hr/>
-            <DataEntry
-                title="Land parcel geometry link"
-                slug=""
-                value=""
-                mode='view'
-                tooltip='INSPIRE Polygons'
-            />
-            <DataEntry
-                title="Source type"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
-            <DataEntry
-                title="Source link"
-                slug=""
-                value=""
-                mode='view'
-                tooltip="Coming Soon"
-            />
-            <hr/>
             <NumericDataEntry
                 title={dataFields.size_width_frontage.title}
                 slug="size_width_frontage"
@@ -394,6 +307,146 @@ const SizeView: React.FunctionComponent<CategoryViewProps> = (props) => (
                     />
                 </>
             }
+            <hr/>
+            <NumericDataEntry
+                title={dataFields.size_plot_area_total.title}
+                slug="size_plot_area_total"
+                tooltip={dataFields.size_plot_area_total.tooltip}
+                value={props.building.size_plot_area_total}
+                mode={props.mode}
+                onChange={props.onChange}
+                step={0.1}
+                min={0}
+            />
+            <Verification
+                slug="size_plot_area_total"
+                allow_verify={props.user !== undefined && props.building.size_plot_area_total !== null}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("size_plot_area_total")}
+                user_verified_as={props.user_verified.size_plot_area_total}
+                verified_count={props.building.verified.size_plot_area_total}
+                />
+            <SelectDataEntry
+                title={dataFields.size_plot_area_total_source_type.title}
+                slug="size_plot_area_total_source_type"
+                value={props.building.size_plot_area_total_source_type}
+                options={dataFields.size_plot_area_total_source_type.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.size_plot_area_total_source_type.tooltip}
+            />
+            {(props.building.size_plot_area_total_source_type == commonSourceTypes[0] ||
+                props.building.size_plot_area_total_source_type == commonSourceTypes[1] ||
+                props.building.size_far_ratio_source_type == null) ? <></> :
+                <><MultiDataEntry
+                    title={dataFields.size_plot_area_total_source_links.title}
+                    slug="size_plot_area_total_source_links"
+                    value={props.building.size_plot_area_total_source_links}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.size_plot_area_total_source_links.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                </>
+            }
+            <hr/>
+            <NumericDataEntry
+                title={dataFields.size_far_ratio.title}
+                value={props.building.size_far_ratio}
+                slug="size_far_ratio"
+                tooltip={dataFields.size_far_ratio.tooltip}
+                //placeholder={dataFields.size_far_ratio.example}
+                mode={props.mode}
+                onChange={props.onChange}
+                step={1}
+                min={0}
+            />
+            <Verification
+                slug="size_far_ratio"
+                allow_verify={props.user !== undefined && props.building.size_far_ratio !== null}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("size_far_ratio")}
+                user_verified_as={props.user_verified.size_far_ratio}
+                verified_count={props.building.verified.size_far_ratio}
+                />
+            <SelectDataEntry
+                title={dataFields.size_far_ratio_source_type.title}
+                slug="size_far_ratio_source_type"
+                value={props.building.size_far_ratio_source_type}
+                options={dataFields.size_far_ratio_source_type.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.size_far_ratio_source_type.tooltip}
+            />
+            {(props.building.size_far_ratio_source_type == commonSourceTypes[0] ||
+                props.building.size_far_ratio_source_type == commonSourceTypes[1] ||
+                props.building.size_far_ratio_source_type == null) ? <></> :
+                <><MultiDataEntry
+                    title={dataFields.size_far_ratio_source_links.title}
+                    slug="size_far_ratio_source_links"
+                    value={props.building.size_far_ratio_source_links}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.size_far_ratio_source_links.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                </>
+            }
+            <hr/>
+            <DataEntry
+                title={dataFields.size_parcel_geometry.title}
+                slug="size_parcel_geometry"
+                value={props.building.size_parcel_geometry}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.size_parcel_geometry.tooltip}
+                placeholder="https://..."
+                isUrl={true}
+                />
+            <Verification
+                slug="size_parcel_geometry"
+                allow_verify={props.user !== undefined && props.building.size_parcel_geometry !== null}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("size_parcel_geometry")}
+                user_verified_as={props.user_verified.size_parcel_geometry}
+                verified_count={props.building.verified.size_parcel_geometry}
+                />
+            <SelectDataEntry
+                title={dataFields.size_parcel_geometry_source_type.title}
+                slug="size_parcel_geometry_source_type"
+                value={props.building.size_parcel_geometry_source_type}
+                options={dataFields.size_parcel_geometry_source_type.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.size_parcel_geometry_source_type.tooltip}
+            />
+            {(props.building.size_parcel_geometry_source_type == commonSourceTypes[0] ||
+                props.building.size_parcel_geometry_source_type == commonSourceTypes[1] ||
+                props.building.size_parcel_geometry_source_type == null) ? <></> :
+                <><MultiDataEntry
+                    title={dataFields.size_parcel_geometry_source_links.title}
+                    slug="size_parcel_geometry_source_links"
+                    value={props.building.size_parcel_geometry_source_links}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.size_parcel_geometry_source_links.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                </>
+            }
         </DataEntryGroup>
     </Fragment>
 );
diff --git a/app/src/frontend/building/data-containers/street-context.tsx b/app/src/frontend/building/data-containers/street-context.tsx
index bb92c118..f0e85c38 100644
--- a/app/src/frontend/building/data-containers/street-context.tsx
+++ b/app/src/frontend/building/data-containers/street-context.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react';
 import InfoBox from '../../components/info-box';
-import { dataFields } from '../../config/data-fields-config';
+import { commonSourceTypes, dataFields } from '../../config/data-fields-config';
 import DataEntry from '../data-components/data-entry';
 import NumericDataEntry from '../data-components/numeric-data-entry';
 
@@ -8,59 +8,339 @@ import withCopyEdit from '../data-container';
 
 import { CategoryViewProps } from './category-view-props';
 import { DataEntryGroup } from '../data-components/data-entry-group';
+import { MultiDataEntry } from '../data-components/multi-data-entry/multi-data-entry';
+import SelectDataEntry from '../data-components/select-data-entry';
+import Verification from '../data-components/verification';
 
 /**
 * Streetscape view/edit section
 */
 const StreetscapeView: React.FunctionComponent<CategoryViewProps> = (props) => (
     <Fragment>
-        <DataEntryGroup name="Does the building have a garden(s)?">
-            <DataEntry
-                title="Does the building have a front garden?"
-                slug=""
-                value=""
-                mode='view'
-            />
-            <DataEntry
-                title="Does the building have a back garden?"
-                slug=""
-                value=""
-                mode='view'
-            />
+        <DataEntryGroup name="Does the building have a garden?">
+            <SelectDataEntry
+                title={dataFields.context_front_garden.title}
+                slug="context_front_garden"
+                value={props.building.context_front_garden}
+                options={dataFields.context_front_garden.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.context_front_garden.tooltip}
+                />
+            <Verification
+                slug="context_front_garden"
+                allow_verify={props.user !== undefined && props.building.context_front_garden !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("context_front_garden")}
+                user_verified_as={props.user_verified.context_front_garden}
+                verified_count={props.building.verified.context_front_garden}
+                />
+            <SelectDataEntry
+                title={dataFields.context_back_garden.title}
+                slug="context_back_garden"
+                value={props.building.context_back_garden}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.context_back_garden.tooltip}
+                //placeholder={dataFields.context_back_garden.example}
+                options={dataFields.context_back_garden.items}
+                />
+            <Verification
+                slug="context_back_garden"
+                allow_verify={props.user !== undefined && props.building.context_back_garden !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("context_back_garden")}
+                user_verified_as={props.user_verified.context_back_garden}
+                verified_count={props.building.verified.context_back_garden}
+                />
+            <SelectDataEntry
+                title={dataFields.context_flats_garden.title}
+                slug="context_flats_garden"
+                value={props.building.context_flats_garden}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.context_flats_garden.tooltip}
+                //placeholder={dataFields.context_flats_garden.example}
+                options={dataFields.context_flats_garden.items}
+                />
+            <Verification
+                slug="context_flats_garden"
+                allow_verify={props.user !== undefined && props.building.context_flats_garden !== null && !props.edited}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("context_flats_garden")}
+                user_verified_as={props.user_verified.context_flats_garden}
+                verified_count={props.building.verified.context_flats_garden}
+                />
+            <hr/>
+            <SelectDataEntry
+                title={dataFields.context_garden_source_type.title}
+                slug="context_garden_source_type"
+                value={props.building.context_garden_source_type}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.context_garden_source_type.tooltip}
+                placeholder={dataFields.context_garden_source_type.example}
+                options={dataFields.context_garden_source_type.items}
+                />
+            {(props.building.context_garden_source_type == commonSourceTypes[0] ||
+                props.building.context_garden_source_type == commonSourceTypes[1] ||
+                props.building.context_garden_source_type == null) ? <></> :
+                <>
+                    <MultiDataEntry
+                        title={dataFields.context_garden_source_links.title}
+                        slug="context_garden_source_links"
+                        value={props.building.context_garden_source_links}
+                        mode={props.mode}
+                        copy={props.copy}
+                        onChange={props.onChange}
+                        tooltip={dataFields.context_garden_source_links.tooltip}
+                        placeholder="https://..."
+                        editableEntries={true}
+                        isUrl={true}
+                    />
+                </>
+            }
         </DataEntryGroup>
         <DataEntryGroup name="Street/pavement properties">
-            <DataEntry
-                title="Street width"
-                slug=""
-                value=""
-                mode='view'
+            <NumericDataEntry
+                title={dataFields.context_street_width.title}
+                value={props.building.context_street_width}
+                slug="context_street_width"
+                tooltip={dataFields.context_street_width.tooltip}
+                //placeholder={dataFields.context_street_width.example}
+                mode={props.mode}
+                onChange={props.onChange}
+                step={1}
+                min={0}
             />
-            <DataEntry
-                title="Pavement width"
-                slug=""
-                value=""
-                mode='view'
+            <Verification
+                slug="context_street_width"
+                allow_verify={props.user !== undefined && props.building.context_street_width !== null}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("context_street_width")}
+                user_verified_as={props.user_verified.context_street_width}
+                verified_count={props.building.verified.context_street_width}
+                />
+            <SelectDataEntry
+                title={dataFields.context_street_width_source_type.title}
+                slug="context_street_width_source_type"
+                value={props.building.context_street_width_source_type}
+                options={dataFields.context_street_width_source_type.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.context_street_width_source_type.tooltip}
             />
-            <DataEntry
-                title="Street network geometry link"
-                slug=""
-                value=""
-                mode='view'
+            {(props.building.context_street_width_source_type == commonSourceTypes[0] ||
+                props.building.context_street_width_source_type == commonSourceTypes[1] ||
+                props.building.context_street_width_source_type == null) ? <></> :
+                <><MultiDataEntry
+                    title={dataFields.context_street_width_source_links.title}
+                    slug="context_street_width_source_links"
+                    value={props.building.context_street_width_source_links}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.context_street_width_source_links.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                </>
+            }
+            <hr/>
+            <NumericDataEntry
+                title={dataFields.context_pavement_width.title}
+                value={props.building.context_pavement_width}
+                slug="context_pavement_width"
+                tooltip={dataFields.context_pavement_width.tooltip}
+                //placeholder={dataFields.context_pavement_width.example}
+                mode={props.mode}
+                onChange={props.onChange}
+                step={1}
+                min={0}
             />
+            <Verification
+                slug="context_pavement_width"
+                allow_verify={props.user !== undefined && props.building.context_pavement_width !== null}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("context_pavement_width")}
+                user_verified_as={props.user_verified.context_pavement_width}
+                verified_count={props.building.verified.context_pavement_width}
+                />
+            <SelectDataEntry
+                title={dataFields.context_pavement_width_source_type.title}
+                slug="context_pavement_width_source_type"
+                value={props.building.context_pavement_width_source_type}
+                options={dataFields.context_pavement_width_source_type.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.context_pavement_width_source_type.tooltip}
+            />
+            {(props.building.context_pavement_width_source_type == commonSourceTypes[0] ||
+                props.building.context_pavement_width_source_type == commonSourceTypes[1] ||
+                props.building.context_pavement_width_source_type == null) ? <></> :
+                <><MultiDataEntry
+                    title={dataFields.context_pavement_width_source_links.title}
+                    slug="context_pavement_width_source_links"
+                    value={props.building.context_pavement_width_source_links}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.context_pavement_width_source_links.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                </>
+            }
+            <hr/>
+            <DataEntry
+                    title={dataFields.context_street_geometry.title}
+                    slug="context_street_geometry"
+                    value={props.building.context_street_geometry}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.context_street_geometry.tooltip}
+                    placeholder="https://..."
+                    isUrl={true}
+                />
+            <Verification
+                slug="context_street_geometry"
+                allow_verify={props.user !== undefined && props.building.context_street_geometry !== null}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("context_street_geometry")}
+                user_verified_as={props.user_verified.context_street_geometry}
+                verified_count={props.building.verified.context_street_geometry}
+                />
+            <SelectDataEntry
+                title={dataFields.context_street_geometry_source_type.title}
+                slug="context_street_geometry_source_type"
+                value={props.building.context_street_geometry_source_type}
+                options={dataFields.context_street_geometry_source_type.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.context_street_geometry_source_type.tooltip}
+            />
+            {(props.building.context_street_geometry_source_type == commonSourceTypes[0] ||
+                props.building.context_street_geometry_source_type == commonSourceTypes[1] ||
+                props.building.context_street_geometry_source_type == null) ? <></> :
+                <><MultiDataEntry
+                    title={dataFields.context_street_geometry_source_links.title}
+                    slug="context_street_geometry_source_links"
+                    value={props.building.context_street_geometry_source_links}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.context_street_geometry_source_links.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                </>
+            }
         </DataEntryGroup>
         <DataEntryGroup name="Access to green space">
-            <DataEntry
-                title="Distance from public green space"
-                slug=""
-                value=""
-                mode='view'
+            <NumericDataEntry
+                title={dataFields.context_green_space_distance.title}
+                value={props.building.context_green_space_distance}
+                slug="context_green_space_distance"
+                tooltip={dataFields.context_green_space_distance.tooltip}
+                //placeholder={dataFields.context_green_space_distance.example}
+                mode={props.mode}
+                onChange={props.onChange}
+                step={1}
+                min={0}
             />
-            <DataEntry
-                title="Distance from front door to nearest tree"
-                slug=""
-                value=""
-                mode='view'
+            <Verification
+                slug="context_green_space_distance"
+                allow_verify={props.user !== undefined && props.building.context_green_space_distance !== null}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("context_green_space_distance")}
+                user_verified_as={props.user_verified.context_green_space_distance}
+                verified_count={props.building.verified.context_green_space_distance}
+                />
+            <SelectDataEntry
+                title={dataFields.context_green_space_distance_source_type.title}
+                slug="context_green_space_distance_source_type"
+                value={props.building.context_green_space_distance_source_type}
+                options={dataFields.context_green_space_distance_source_type.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.context_green_space_distance_source_type.tooltip}
             />
+            {(props.building.context_green_space_distance_source_type == commonSourceTypes[0] ||
+                props.building.context_green_space_distance_source_type == commonSourceTypes[1] ||
+                props.building.context_green_space_distance_source_type == null) ? <></> :
+                <><MultiDataEntry
+                    title={dataFields.context_green_space_distance_source_links.title}
+                    slug="context_green_space_distance_source_links"
+                    value={props.building.context_green_space_distance_source_links}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.context_green_space_distance_source_links.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                </>
+            }
+            <hr/>
+            <NumericDataEntry
+                title={dataFields.context_tree_distance.title}
+                value={props.building.context_tree_distance}
+                slug="context_tree_distance"
+                tooltip={dataFields.context_tree_distance.tooltip}
+                //placeholder={dataFields.context_tree_distance.example}
+                mode={props.mode}
+                onChange={props.onChange}
+                step={1}
+                min={0}
+            />
+            <Verification
+                slug="context_tree_distance"
+                allow_verify={props.user !== undefined && props.building.context_tree_distance !== null}
+                onVerify={props.onVerify}
+                user_verified={props.user_verified.hasOwnProperty("context_tree_distance")}
+                user_verified_as={props.user_verified.context_tree_distance}
+                verified_count={props.building.verified.context_tree_distance}
+                />
+            <SelectDataEntry
+                title={dataFields.context_tree_distance_source_type.title}
+                slug="context_tree_distance_source_type"
+                value={props.building.context_tree_distance_source_type}
+                options={dataFields.context_tree_distance_source_type.items}
+                mode={props.mode}
+                copy={props.copy}
+                onChange={props.onChange}
+                tooltip={dataFields.context_tree_distance_source_type.tooltip}
+            />
+            {(props.building.context_tree_distance_source_type == commonSourceTypes[0] ||
+                props.building.context_tree_distance_source_type == commonSourceTypes[1] ||
+                props.building.context_tree_distance_source_type == null) ? <></> :
+                <><MultiDataEntry
+                    title={dataFields.context_tree_distance_source_links.title}
+                    slug="context_tree_distance_source_links"
+                    value={props.building.context_tree_distance_source_links}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.context_tree_distance_source_links.tooltip}
+                    placeholder="https://..."
+                    editableEntries={true}
+                    isUrl={true}
+                    />
+                </>
+            }
         </DataEntryGroup>
     </Fragment>
 );
diff --git a/app/src/frontend/building/data-containers/team.tsx b/app/src/frontend/building/data-containers/team.tsx
index 73c7bb09..0f15c2cf 100644
--- a/app/src/frontend/building/data-containers/team.tsx
+++ b/app/src/frontend/building/data-containers/team.tsx
@@ -21,7 +21,7 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const currentBuildingConstructionYear = building.date_year || undefined;
       return (
        <form>
-            <DataEntryGroup name="Dates of construction/extension">
+            <DataEntryGroup name="Dates of construction and extension(s)">
                 <NumericDataEntry
                     slug='date_year'
                     title={dataFields.date_year.title}
diff --git a/app/src/frontend/building/sidebar.css b/app/src/frontend/building/sidebar.css
index fbbc0c44..5f915241 100644
--- a/app/src/frontend/building/sidebar.css
+++ b/app/src/frontend/building/sidebar.css
@@ -178,4 +178,9 @@
 
 .data-entry-list-button {
     width: 2.5em;
+}
+
+.source-url {
+    padding-top: 0px;
+    padding-bottom: 5px;
 }
\ No newline at end of file
diff --git a/app/src/frontend/config/categories-config.ts b/app/src/frontend/config/categories-config.ts
index 2a3083cc..06906091 100644
--- a/app/src/frontend/config/categories-config.ts
+++ b/app/src/frontend/config/categories-config.ts
@@ -107,7 +107,6 @@ export const categoriesConfig: {[key in Category]: CategoryDefinition} = {
         intro: 'How are buildings used, and how does use change over time?',
     },
     [Category.StreetContext]: {
-        inactive: true,
         slug: 'street-context',
         name: 'Street Context',
         aboutUrl: 'https://pages.colouring.london/greenery',
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index e1a90f71..79207253 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -6,12 +6,15 @@ let ccconfig: CCConfig = require('../../cc-config.json')
  * Common list of Source Types, used in multiple menus
 */
 export const commonSourceTypes = [
-    "Expert knowledge",
-    "Observed from the street",
-    "Google or other photograph/satellite imagery",
-    "Government/public record/database",
-    "Independently managed record/database",
-    "Other type of record/database"
+    "Assessed by eye",
+    "Assessed using expert knowledge of building or building type",
+    "Assessed using streetview photographs or satellite imagery",
+    "Assessed by specialist emergency group",
+    "Live streamed from a government source",
+    "Current government record/dataset",
+    "Independently managed public database",
+    "Commercial database",
+    "Inferred computationally using existing open attribute data",
 ];
 
 /**
@@ -142,7 +145,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     location_name: {
         category: Category.Location,
         title: "Building name (non-domestic)",
-        tooltip: "Link to a website with the name of the building.<br/><br/>(For security reasons, we currently only collect the names of well-known public buildings.)",
+        tooltip: "Link to a website with the name of the building.<br/><br/>(For security reasons, we currently only collect the names of non-residential buildings).",
         example: "https://en.wikipedia.org/wiki/Palace_of_Westminster",
     },
     location_number: {
@@ -165,13 +168,13 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     location_town: {
         category: Category.Location,
-        title: "Town/city",
+        title: "Town/City",
         example: "London",
         //tooltip: ,
     },
     location_postcode: {
         category: Category.Location,
-        title: ccconfig.postcode,
+        title: "Area code/"+ccconfig.postcode,
         example: "W1W 6TR",
         //tooltip: ,
     },
@@ -503,13 +506,58 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         category: Category.StreetContext,
         title: "Total area of plot (m²)",
         example: 123.02,
-        //tooltip: ,
+        tooltip: "Total area of plot (m²)",
+    },
+    size_plot_area_total_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source of plot area data",
+        example: "",
+        items: commonSourceTypes
+    },
+    size_plot_area_total_source_links: {
+        category: Category.Team,
+        title: "Source links",
+        tooltip: "URL(s) for plot area data source(s)",
+        example: ["", "", ""],
     },
     size_far_ratio: {
         category: Category.StreetContext,
         title: "FAR ratio (percentage of plot covered by building)",
-        example: 0.1,
-        //tooltip: ,
+        example: 1.0,
+        tooltip: "boobs",
+    },
+    size_far_ratio_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source of FAR ratio data",
+        example: "",
+        items: commonSourceTypes
+    },
+    size_far_ratio_source_links: {
+        category: Category.Team,
+        title: "Source links",
+        tooltip: "URL(s) for FAR ratio data source(s)",
+        example: ["", "", ""],
+    },
+    size_parcel_geometry: {
+        category: Category.StreetContext,
+        title: "Land parcel geometry link",
+        example: "https://",
+        tooltip: "INSPIRE Polygons",
+    },
+    size_parcel_geometry_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source of parcel geometry data",
+        example: "",
+        items: commonSourceTypes
+    },
+    size_parcel_geometry_source_links: {
+        category: Category.Team,
+        title: "Source links",
+        tooltip: "URL(s) for parcel geometry data source(s)",
+        example: ["", "", ""],
     },
 
     construction_core_material: {
@@ -784,13 +832,20 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     //     title: "When was this building used for community activities?"
     // },
 
-
     community_public_ownership: {
         category: Category.Community,
         title: "Is the building in public/community ownership?",
-        example: "Not in public/community ownership"
+        example: "Privately owned (non-corporate)",
+        items: [
+            'State-owned',
+            'Charity-owned',
+            'Community-owned',
+            'Owned by other non-profit body',
+            'Privately owned (non-corporate)',
+            'Privately owned (corporate)',
+            'Other'
+        ]
     },
-
     community_public_ownership_sources: {
         category: Category.Community,
         title: "Community ownership source link",
@@ -991,19 +1046,38 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         category: Category.Resilience,
         title: "Disaster type",
         tooltip: "What type of disaster management do you wish to collect data for?",
-        example: "Flood"
+        example: "Flood",
+        items: [
+            'Flood',
+            'Earthquake',
+            'Hurricane',
+            'Fire',
+            'Extreme heat',
+            'Political/war damage',
+            'Other human (blast damage/spills etc.)',
+            'Other'
+        ]
     },
     disaster_severity: {
         category: Category.Resilience,
         title: "How severe do you assess the damage to be?",
         tooltip: "Best estimate for the severity of damage to the building",
-        example: "Building destroyed"
+        example: "Building destroyed",
+        items: [
+            'Building destroyed',
+            'Very severe',
+            'Severe',
+            'Moderate',
+            'Minimal',
+            'No damage visible',
+        ]
     },
     disaster_assessment_method: {
         category: Category.Resilience,
-        title: "Method of assessment",
+        title: "Source Type",
         tooltip: "Please add a Best estimate for the severity of damage to the building",
-        example: "Citizen/Passerby by eye"
+        example: "Citizen/Passerby by eye",
+        items: commonSourceTypes
     },
     disaster_source_link: {
         category: Category.Resilience,
@@ -1021,6 +1095,145 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         title: "What was the end date of the disaster? (if applicable)",
         example: "03/04/2023"
     },
+
+    context_front_garden: {
+        category: Category.StreetContext,
+        title: "Does the building have a front garden?",
+        tooltip: "Is the front garden mainly green/planted?",
+        example: "",
+        items: [
+            "Yes",
+            "No"
+        ]
+    },
+    context_back_garden: {
+        category: Category.StreetContext,
+        title: "Does the building have a back garden?",
+        tooltip: "Is the back garden mainly green/planted?",
+        example: "",
+        items: [
+            "Yes",
+            "No"
+        ]
+    },
+    context_flats_garden: {
+        category: Category.StreetContext,
+        title: "Is the building flats with a dedicated green space?",
+        tooltip: "If the building is a block of flats, does it have a dedicated garden area/green space?",
+        example: "",
+        items: [
+            "Yes",
+            "No"
+        ]
+    },
+    context_garden_source_type: {
+        category: Category.StreetContext,
+        title: "Source type",
+        tooltip: "Source type for garden data",
+        example: "",
+        items: commonSourceTypes
+    },
+    context_garden_source_links: {
+        category: Category.StreetContext,
+        title: "Source link(s)",
+        tooltip: "Source link(s) for garden data source(s)",
+        example: ["", "", ""],
+    },
+    context_street_width: {
+        category: Category.Team,
+        title: "Street width (m)",
+        tooltip: "Width of the street in metres.",
+        example: 10
+    },
+    context_street_width_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source type for street width data",
+        example: "",
+        items: commonSourceTypes
+    },
+    context_street_width_source_links: {
+        category: Category.Team,
+        title: "Source link(s)",
+        tooltip: "Source link(s) for street width data",
+        example: ["", "", ""],
+    },
+    context_pavement_width: {
+        category: Category.Team,
+        title: "Pavement width (m)",
+        tooltip: "Width of the pavement in metres.",
+        example: 10
+    },
+    context_pavement_width_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source type for pavement width data",
+        example: "",
+        items: commonSourceTypes
+    },
+    context_pavement_width_source_links: {
+        category: Category.Team,
+        title: "Source link(s)",
+        tooltip: "Source link(s) for pavement width data",
+        example: ["", "", ""],
+    },
+    context_green_space_distance: {
+        category: Category.Team,
+        title: "Distance to nearest green space (m)",
+        tooltip: "Approximate distance from the front door of the building to the nearest public green space.",
+        example: 10
+    },
+    context_green_space_distance_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source type for green space data",
+        example: "",
+        items: commonSourceTypes
+    },
+    context_green_space_distance_source_links: {
+        category: Category.Team,
+        title: "Source link(s)",
+        tooltip: "Source link(s) for green space data",
+        example: ["", "", ""],
+    },
+    context_tree_distance: {
+        category: Category.Team,
+        title: "Distance to nearest tree (m)",
+        tooltip: "Approximate distance from the front door of the building to the nearest tree.",
+        example: 10
+    },
+    context_tree_distance_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source type for tree data",
+        example: "",
+        items: commonSourceTypes
+    },
+    context_tree_distance_source_links: {
+        category: Category.Team,
+        title: "Source link(s)",
+        tooltip: "Source link(s) for tree data",
+        example: ["", "", ""],
+    },
+    context_street_geometry: {
+        category: Category.Team,
+        title: "Street network geometry link",
+        tooltip: "Link to a website with the name of the building..",
+        example: "https://en.wikipedia.org/",
+    },
+    context_street_geometry_source_type: {
+        category: Category.Team,
+        title: "Source type",
+        tooltip: "Source type for tree data",
+        example: "",
+        items: commonSourceTypes
+    },
+    context_street_geometry_source_links: {
+        category: Category.Team,
+        title: "Source link(s)",
+        tooltip: "Source link(s) for tree data",
+        example: ["", "", ""],
+    },
 };
 
 export const allFieldsConfig = { ...dataFields, ...buildingUserFields };
\ No newline at end of file
diff --git a/migrations/040.ui_revamp_sources.down.sql b/migrations/040.ui_revamp_sources.down.sql
index 9af8c0f0..75c07ebe 100644
--- a/migrations/040.ui_revamp_sources.down.sql
+++ b/migrations/040.ui_revamp_sources.down.sql
@@ -19,3 +19,32 @@ ALTER TABLE buildings DROP COLUMN IF EXISTS designers_source_type;
 ALTER TABLE buildings DROP COLUMN IF EXISTS builder_source_type;
 ALTER TABLE buildings DROP COLUMN IF EXISTS extension_source_type;
 ALTER TABLE buildings DROP COLUMN IF EXISTS extension_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_far_ratio;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_far_ratio_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_far_ratio_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_plot_area_total;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_plot_area_total_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_plot_area_total_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_parcel_geometry;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_parcel_geometry_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS size_parcel_geometry_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_front_garden;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_back_garden;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_flats_garden;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_garden_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_garden_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_street_width;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_street_width_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_street_width_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_pavement_width;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_pavement_width_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_pavement_width_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_green_space_distance;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_green_space_distance_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_green_space_distance_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_tree_distance;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_tree_distance_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_tree_distance_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_street_geometry;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_street_geometry_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_street_geometry_source_links;
\ No newline at end of file
diff --git a/migrations/040.ui_revamp_sources.up.sql b/migrations/040.ui_revamp_sources.up.sql
index b73dc463..f27fdb1a 100644
--- a/migrations/040.ui_revamp_sources.up.sql
+++ b/migrations/040.ui_revamp_sources.up.sql
@@ -20,4 +20,33 @@ ALTER TABLE buildings ADD COLUMN IF NOT EXISTS landowner_source_type text;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS designers_source_type text;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS builder_source_type text;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS extension_source_type text;
-ALTER TABLE buildings ADD COLUMN IF NOT EXISTS extension_source_links text[];
\ No newline at end of file
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS extension_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_far_ratio text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_far_ratio_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_far_ratio_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_plot_area_total text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_plot_area_total_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_plot_area_total_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_parcel_geometry text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_parcel_geometry_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS size_parcel_geometry_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_front_garden text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_back_garden text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_flats_garden text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_garden_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_garden_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_street_width text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_street_width_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_street_width_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_pavement_width text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_pavement_width_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_pavement_width_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_green_space_distance text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_green_space_distance_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_green_space_distance_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_tree_distance text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_tree_distance_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_tree_distance_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_street_geometry text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_street_geometry_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_street_geometry_source_links text[];
\ No newline at end of file

From d40410e0fab77899e2ce9ffa7d28a2150cf19742 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 31 May 2023 21:09:01 +0100
Subject: [PATCH 31/42] Add new fields to export_attributes.sql

---
 .../extract_data/export_attributes.sql        | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/maintenance/extract_data/export_attributes.sql b/maintenance/extract_data/export_attributes.sql
index 6b0825b5..b874f26c 100644
--- a/maintenance/extract_data/export_attributes.sql
+++ b/maintenance/extract_data/export_attributes.sql
@@ -78,7 +78,36 @@ COPY (SELECT
     disaster_assessment_method,
     disaster_source_link,
     disaster_start_date,
-    disaster_end_date
+    disaster_end_date,
+    size_far_ratio,
+    size_far_ratio_source_type,
+    size_far_ratio_source_links,
+    size_plot_area_total,
+    size_plot_area_total_source_type,
+    size_plot_area_total_source_links,
+    size_parcel_geometry,
+    size_parcel_geometry_source_type,
+    size_parcel_geometry_source_links,
+    context_front_garden,
+    context_back_garden,
+    context_flats_garden,
+    context_garden_source_type,
+    context_garden_source_type,
+    context_street_width,
+    context_street_width_source_type,
+    context_street_width_source_links,
+    context_pavement_width,
+    context_pavement_width_source_type,
+    context_pavement_width_source_links,
+    context_street_geometry,
+    context_street_geometry_source_type,
+    context_street_geometry_source_links,
+    context_green_space_distance,
+    context_green_space_distance,
+    context_green_space_distance_source_links,
+    context_tree_distance,
+    context_tree_distance_source_type,
+    ccontext_tree_distance_source_links
 FROM buildings)
 TO '/tmp/building_attributes.csv'
 WITH CSV HEADER

From 7b024ebb5c5552fd21bff327dd43cdd3bdffef1f Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 31 May 2023 21:36:53 +0100
Subject: [PATCH 32/42] Activate fields on Age & History

See issue #1169
---
 app/src/api/config/dataFields.ts              |  38 +-
 .../building/data-containers/age-history.tsx  | 392 ++++++++++++++----
 app/src/frontend/config/data-fields-config.ts |  57 +++
 .../extract_data/export_attributes.sql        |  11 +-
 migrations/040.ui_revamp_sources.down.sql     |  11 +-
 migrations/040.ui_revamp_sources.up.sql       |  11 +-
 6 files changed, 428 insertions(+), 92 deletions(-)

diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
index 031aa840..8f150f47 100644
--- a/app/src/api/config/dataFields.ts
+++ b/app/src/api/config/dataFields.ts
@@ -646,7 +646,43 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true
     },
-    ccontext_tree_distance_source_links : {
+    context_tree_distance_source_links : {
+        edit: true,
+        verify: true
+    },
+    age_cladding_date : {
+        edit: true,
+        verify: true
+    },
+    age_cladding_date_source_type : {
+        edit: true,
+        verify: true
+    },
+    age_cladding_date_source_links : {
+        edit: true,
+        verify: true
+    },
+    age_extension_date : {
+        edit: true,
+        verify: true
+    },
+    age_extension_date_source_type : {
+        edit: true,
+        verify: true
+    },
+    age_extension_date_source_links : {
+        edit: true,
+        verify: true
+    },
+    age_retrofit_date : {
+        edit: true,
+        verify: true
+    },
+    age_retrofit_date_source_type : {
+        edit: true,
+        verify: true
+    },
+    age_retrofit_date_source_links : {
         edit: true,
         verify: true
     }
diff --git a/app/src/frontend/building/data-containers/age-history.tsx b/app/src/frontend/building/data-containers/age-history.tsx
index 0b491e85..e19e5807 100644
--- a/app/src/frontend/building/data-containers/age-history.tsx
+++ b/app/src/frontend/building/data-containers/age-history.tsx
@@ -123,29 +123,158 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                         isUrl={true}
                     />
                 </>
-            }
+                }
+            </DataEntryGroup>
+            <DataEntryGroup name="Cladding, extensions and retrofits">
+                <NumericDataEntry
+                    slug='age_cladding_date'
+                    title={dataFields.age_cladding_date.title}
+                    value={props.building.age_cladding_date}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    step={1}
+                    min={1}
+                    max={currentYear}
+                    tooltip={dataFields.extension_year.tooltip}
+                    />
+                <Verification
+                    slug="age_cladding_date"
+                    allow_verify={props.user !== undefined && props.building.age_cladding_date !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("age_cladding_date")}
+                    user_verified_as={props.user_verified.age_cladding_date}
+                    verified_count={props.building.verified.age_cladding_date}
+                    />
+                <SelectDataEntry
+                    title={dataFields.age_cladding_date_source_type.title}
+                    slug="age_cladding_date_source_type"
+                    value={props.building.age_cladding_date_source_type}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.age_cladding_date_source_type.tooltip}
+                    options={dataFields.age_cladding_date_source_type.items}
+                    placeholder={dataFields.age_cladding_date_source_type.example}
+                    />
+                {(props.building.age_cladding_date_source_type == dataFields.age_cladding_date_source_type.items[0] ||
+                    props.building.age_cladding_date_source_type == dataFields.age_cladding_date_source_type.items[1] ||
+                    props.building.age_cladding_date_source_type == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.age_cladding_date_source_links.title}
+                            slug="age_cladding_date_source_links"
+                            value={props.building.age_cladding_date_source_links}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.age_cladding_date_source_links.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
                 <hr/>
-                <InfoBox type='warning'>
-                    This section is under development.
-                </InfoBox>
-                <DataEntry
-                    title="Cladding date"
-                    slug=""
-                    value=""
-                    mode='view'
-                />
-                <DataEntry
-                    title="Date of significant extensions"
-                    slug=""
-                    value=""
-                    mode='view'
-                />
-                <DataEntry
-                    title="Date of significant retrofits"
-                    slug=""
-                    value=""
-                    mode='view'
-                />
+                <NumericDataEntry
+                    slug='age_extension_date'
+                    title={dataFields.age_extension_date.title}
+                    value={props.building.age_extension_date}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    step={1}
+                    min={1}
+                    max={currentYear}
+                    tooltip={dataFields.extension_year.tooltip}
+                    />
+                <Verification
+                    slug="age_extension_date"
+                    allow_verify={props.user !== undefined && props.building.age_extension_date !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("age_extension_date")}
+                    user_verified_as={props.user_verified.age_extension_date}
+                    verified_count={props.building.verified.age_extension_date}
+                    />
+                <SelectDataEntry
+                    title={dataFields.age_extension_date_source_type.title}
+                    slug="age_extension_date_source_type"
+                    value={props.building.age_extension_date_source_type}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.age_extension_date_source_type.tooltip}
+                    options={dataFields.age_extension_date_source_type.items}
+                    placeholder={dataFields.age_extension_date_source_type.example}
+                    />
+                {(props.building.age_extension_date_source_type == dataFields.age_extension_date_source_type.items[0] ||
+                    props.building.age_extension_date_source_type == dataFields.age_extension_date_source_type.items[1] ||
+                    props.building.age_extension_date_source_type == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.age_extension_date_source_links.title}
+                            slug="age_extension_date_source_links"
+                            value={props.building.age_extension_date_source_links}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.age_extension_date_source_links.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
+                <hr/>
+                <NumericDataEntry
+                    slug='age_retrofit_date'
+                    title={dataFields.age_retrofit_date.title}
+                    value={props.building.age_retrofit_date}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    step={1}
+                    min={1}
+                    max={currentYear}
+                    tooltip={dataFields.extension_year.tooltip}
+                    />
+                <Verification
+                    slug="age_retrofit_date"
+                    allow_verify={props.user !== undefined && props.building.age_retrofit_date !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("age_retrofit_date")}
+                    user_verified_as={props.user_verified.age_retrofit_date}
+                    verified_count={props.building.verified.age_retrofit_date}
+                    />
+                <SelectDataEntry
+                    title={dataFields.age_retrofit_date_source_type.title}
+                    slug="age_retrofit_date_source_type"
+                    value={props.building.age_retrofit_date_source_type}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.age_retrofit_date_source_type.tooltip}
+                    options={dataFields.age_retrofit_date_source_type.items}
+                    placeholder={dataFields.age_retrofit_date_source_type.example}
+                    />
+                {(props.building.age_retrofit_date_source_type == dataFields.age_retrofit_date_source_type.items[0] ||
+                    props.building.age_retrofit_date_source_type == dataFields.age_retrofit_date_source_type.items[1] ||
+                    props.building.age_retrofit_date_source_type == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.age_retrofit_date_source_links.title}
+                            slug="age_retrofit_date_source_links"
+                            value={props.building.age_retrofit_date_source_links}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.age_retrofit_date_source_links.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
             </DataEntryGroup>
             <DataEntryGroup name="Lifespan and site history">
                 <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
@@ -291,7 +420,7 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
       };
     return (
         <Fragment>
-            <DataEntryGroup name="Building Age">
+            <DataEntryGroup name="Building age">
                 <YearDataEntry
                     year={props.building.date_year}
                     upper={props.building.date_upper}
@@ -367,72 +496,159 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                         />
                     </>
                 }
-                <hr/>
-                <InfoBox type='warning'>
-                    This section is under development.
-                </InfoBox>
-                <DataEntry
-                    title="Cladding Date"
-                    slug=""
-                    value=""
-                    mode='view'
-                />
-                <Verification
-                    slug="date_link"
-                    allow_verify={props.user !== undefined && props.building.date_link !== null && !props.edited}
-                    onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("date_link")}
-                    user_verified_as={props.user_verified.date_link}
-                    verified_count={props.building.verified.date_link}
-                    />
-                <DataEntry
-                    title="Source"
-                    slug=""
-                    value=""
-                    mode='view'
-                />
-                <DataEntry
-                    title="Date of Significant Extensions"
-                    slug=""
-                    value=""
-                    mode='view'
-                />
-                {/* <Verification
-                    slug="date_link"
-                    allow_verify={props.user !== undefined && props.building.date_link !== null && !props.edited}
-                    onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("date_link")}
-                    user_verified_as={props.user_verified.date_link}
-                    verified_count={props.building.verified.date_link}
-                    /> */}
-                <DataEntry
-                    title="Source"
-                    slug=""
-                    value=""
-                    mode='view'
-                />
-                <DataEntry
-                    title="Date of Significant Retrofits"
-                    slug=""
-                    value=""
-                    mode='view'
-                />
-                {/* <Verification
-                    slug="date_link"
-                    allow_verify={props.user !== undefined && props.building.date_link !== null && !props.edited}
-                    onVerify={props.onVerify}
-                    user_verified={props.user_verified.hasOwnProperty("date_link")}
-                    user_verified_as={props.user_verified.date_link}
-                    verified_count={props.building.verified.date_link}
-                    /> */}
-                <DataEntry
-                    title="Source"
-                    slug=""
-                    value=""
-                    mode='view'
-                />
             </DataEntryGroup>
-            <DataEntryGroup name="Lifespan and Site History">
+            <DataEntryGroup name="Cladding, extensions and retrofits">
+                <NumericDataEntry
+                    slug='age_cladding_date'
+                    title={dataFields.age_cladding_date.title}
+                    value={props.building.age_cladding_date}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    step={1}
+                    min={1}
+                    max={currentYear}
+                    tooltip={dataFields.extension_year.tooltip}
+                    />
+                <Verification
+                    slug="age_cladding_date"
+                    allow_verify={props.user !== undefined && props.building.age_cladding_date !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("age_cladding_date")}
+                    user_verified_as={props.user_verified.age_cladding_date}
+                    verified_count={props.building.verified.age_cladding_date}
+                    />
+                <SelectDataEntry
+                    title={dataFields.age_cladding_date_source_type.title}
+                    slug="age_cladding_date_source_type"
+                    value={props.building.age_cladding_date_source_type}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.age_cladding_date_source_type.tooltip}
+                    options={dataFields.age_cladding_date_source_type.items}
+                    placeholder={dataFields.age_cladding_date_source_type.example}
+                    />
+                {(props.building.age_cladding_date_source_type == dataFields.age_cladding_date_source_type.items[0] ||
+                    props.building.age_cladding_date_source_type == dataFields.age_cladding_date_source_type.items[1] ||
+                    props.building.age_cladding_date_source_type == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.age_cladding_date_source_links.title}
+                            slug="age_cladding_date_source_links"
+                            value={props.building.age_cladding_date_source_links}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.age_cladding_date_source_links.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
+                <hr/>
+                <NumericDataEntry
+                    slug='age_extension_date'
+                    title={dataFields.age_extension_date.title}
+                    value={props.building.age_extension_date}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    step={1}
+                    min={1}
+                    max={currentYear}
+                    tooltip={dataFields.extension_year.tooltip}
+                    />
+                <Verification
+                    slug="age_extension_date"
+                    allow_verify={props.user !== undefined && props.building.age_extension_date !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("age_extension_date")}
+                    user_verified_as={props.user_verified.age_extension_date}
+                    verified_count={props.building.verified.age_extension_date}
+                    />
+                <SelectDataEntry
+                    title={dataFields.age_extension_date_source_type.title}
+                    slug="age_extension_date_source_type"
+                    value={props.building.age_extension_date_source_type}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.age_extension_date_source_type.tooltip}
+                    options={dataFields.age_extension_date_source_type.items}
+                    placeholder={dataFields.age_extension_date_source_type.example}
+                    />
+                {(props.building.age_extension_date_source_type == dataFields.age_extension_date_source_type.items[0] ||
+                    props.building.age_extension_date_source_type == dataFields.age_extension_date_source_type.items[1] ||
+                    props.building.age_extension_date_source_type == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.age_extension_date_source_links.title}
+                            slug="age_extension_date_source_links"
+                            value={props.building.age_extension_date_source_links}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.age_extension_date_source_links.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
+                <hr/>
+                <NumericDataEntry
+                    slug='age_retrofit_date'
+                    title={dataFields.age_retrofit_date.title}
+                    value={props.building.age_retrofit_date}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    step={1}
+                    min={1}
+                    max={currentYear}
+                    tooltip={dataFields.extension_year.tooltip}
+                    />
+                <Verification
+                    slug="age_retrofit_date"
+                    allow_verify={props.user !== undefined && props.building.age_retrofit_date !== null && !props.edited}
+                    onVerify={props.onVerify}
+                    user_verified={props.user_verified.hasOwnProperty("age_retrofit_date")}
+                    user_verified_as={props.user_verified.age_retrofit_date}
+                    verified_count={props.building.verified.age_retrofit_date}
+                    />
+                <SelectDataEntry
+                    title={dataFields.age_retrofit_date_source_type.title}
+                    slug="age_retrofit_date_source_type"
+                    value={props.building.age_retrofit_date_source_type}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    tooltip={dataFields.age_retrofit_date_source_type.tooltip}
+                    options={dataFields.age_retrofit_date_source_type.items}
+                    placeholder={dataFields.age_retrofit_date_source_type.example}
+                    />
+                {(props.building.age_retrofit_date_source_type == dataFields.age_retrofit_date_source_type.items[0] ||
+                    props.building.age_retrofit_date_source_type == dataFields.age_retrofit_date_source_type.items[1] ||
+                    props.building.age_retrofit_date_source_type == null) ? <></> :
+                    <>
+                        <MultiDataEntry
+                            title={dataFields.age_retrofit_date_source_links.title}
+                            slug="age_retrofit_date_source_links"
+                            value={props.building.age_retrofit_date_source_links}
+                            mode={props.mode}
+                            copy={props.copy}
+                            onChange={props.onChange}
+                            tooltip={dataFields.age_retrofit_date_source_links.tooltip}
+                            placeholder="https://..."
+                            editableEntries={true}
+                            isUrl={true}
+                        />
+                    </>
+                }
+            </DataEntryGroup>
+            <DataEntryGroup name="Lifespan and site history">
                 <button className={`map-switcher-inline ${historicData} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
                     {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
                 </button>
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 79207253..388a8d0f 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -1234,6 +1234,63 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         tooltip: "Source link(s) for tree data",
         example: ["", "", ""],
     },
+    age_cladding_date: {
+        category: Category.Age,
+        title: "Cladding date",
+        tooltip: "Width of the street in metres.",
+        example: 1970
+    },
+    age_cladding_date_source_type: {
+        category: Category.Age,
+        title: "Source type",
+        tooltip: "Source type for street width data",
+        example: "",
+        items: commonSourceTypes
+    },
+    age_cladding_date_source_links: {
+        category: Category.Age,
+        title: "Source link(s)",
+        tooltip: "Source link(s) for street width data",
+        example: ["", "", ""],
+    },
+    age_extension_date: {
+        category: Category.Age,
+        title: "Date of significant extensions",
+        tooltip: "Width of the street in metres.",
+        example: 1970
+    },
+    age_extension_date_source_type: {
+        category: Category.Age,
+        title: "Source type",
+        tooltip: "Source type for street width data",
+        example: "",
+        items: commonSourceTypes
+    },
+    age_extension_date_source_links: {
+        category: Category.Age,
+        title: "Source link(s)",
+        tooltip: "Source link(s) for street width data",
+        example: ["", "", ""],
+    },
+    age_retrofit_date: {
+        category: Category.Age,
+        title: "Date of significant retrofits",
+        tooltip: "Width of the street in metres.",
+        example: 1970
+    },
+    age_retrofit_date_source_type: {
+        category: Category.Age,
+        title: "Source type",
+        tooltip: "Source type for street width data",
+        example: "",
+        items: commonSourceTypes
+    },
+    age_retrofit_date_source_links: {
+        category: Category.Age,
+        title: "Source link(s)",
+        tooltip: "Source link(s) for street width data",
+        example: ["", "", ""],
+    },
 };
 
 export const allFieldsConfig = { ...dataFields, ...buildingUserFields };
\ No newline at end of file
diff --git a/maintenance/extract_data/export_attributes.sql b/maintenance/extract_data/export_attributes.sql
index b874f26c..b87926f7 100644
--- a/maintenance/extract_data/export_attributes.sql
+++ b/maintenance/extract_data/export_attributes.sql
@@ -107,7 +107,16 @@ COPY (SELECT
     context_green_space_distance_source_links,
     context_tree_distance,
     context_tree_distance_source_type,
-    ccontext_tree_distance_source_links
+    context_tree_distance_source_links,
+    age_cladding_date,
+    age_cladding_date_source_type,
+    age_cladding_date_source_links,
+    age_extension_date,
+    age_extension_date_source_type,
+    age_extension_date_source_links,
+    age_retrofit_date,
+    age_retrofit_date_source_type,
+    age_retrofit_date_source_links,
 FROM buildings)
 TO '/tmp/building_attributes.csv'
 WITH CSV HEADER
diff --git a/migrations/040.ui_revamp_sources.down.sql b/migrations/040.ui_revamp_sources.down.sql
index 75c07ebe..41fe9be1 100644
--- a/migrations/040.ui_revamp_sources.down.sql
+++ b/migrations/040.ui_revamp_sources.down.sql
@@ -47,4 +47,13 @@ ALTER TABLE buildings DROP COLUMN IF EXISTS context_tree_distance_source_type;
 ALTER TABLE buildings DROP COLUMN IF EXISTS context_tree_distance_source_links;
 ALTER TABLE buildings DROP COLUMN IF EXISTS context_street_geometry;
 ALTER TABLE buildings DROP COLUMN IF EXISTS context_street_geometry_source_type;
-ALTER TABLE buildings DROP COLUMN IF EXISTS context_street_geometry_source_links;
\ No newline at end of file
+ALTER TABLE buildings DROP COLUMN IF EXISTS context_street_geometry_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS age_cladding_date;
+ALTER TABLE buildings DROP COLUMN IF EXISTS age_cladding_date_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS age_cladding_date_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS age_extension_date;
+ALTER TABLE buildings DROP COLUMN IF EXISTS age_extension_date_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS age_extension_date_source_links;
+ALTER TABLE buildings DROP COLUMN IF EXISTS age_retrofit_date;
+ALTER TABLE buildings DROP COLUMN IF EXISTS age_retrofit_date_source_type;
+ALTER TABLE buildings DROP COLUMN IF EXISTS age_retrofit_date_source_links;
\ No newline at end of file
diff --git a/migrations/040.ui_revamp_sources.up.sql b/migrations/040.ui_revamp_sources.up.sql
index f27fdb1a..80856473 100644
--- a/migrations/040.ui_revamp_sources.up.sql
+++ b/migrations/040.ui_revamp_sources.up.sql
@@ -49,4 +49,13 @@ ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_tree_distance_source_type
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_tree_distance_source_links text[];
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_street_geometry text;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_street_geometry_source_type text;
-ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_street_geometry_source_links text[];
\ No newline at end of file
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS context_street_geometry_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS age_cladding_date text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS age_cladding_date_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS age_cladding_date_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS age_extension_date text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS age_extension_date_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS age_extension_date_source_links text[];
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS age_retrofit_date text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS age_retrofit_date_source_type text;
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS age_retrofit_date_source_links text[];
\ No newline at end of file

From c8694ba0f56698cc49d5375e5b2efb814caee7bf Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Wed, 31 May 2023 21:37:02 +0100
Subject: [PATCH 33/42] Tweak logo to match new category layout

---
 app/src/frontend/components/logo.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/frontend/components/logo.tsx b/app/src/frontend/components/logo.tsx
index 2ffb70de..4d24acc0 100644
--- a/app/src/frontend/components/logo.tsx
+++ b/app/src/frontend/components/logo.tsx
@@ -32,17 +32,17 @@ const LogoGrid: React.FunctionComponent = () => (
             <div className="cell background-location"></div>
             <div className="cell background-land-use"></div>
             <div className="cell background-typology"></div>
-            <div className="cell background-age"></div>
+            <div className="cell background-size"></div>
         </div>
         <div className="row">
-            <div className="cell background-size"></div>
             <div className="cell background-construction"></div>
+            <div className="cell background-age"></div>
             <div className="cell background-street-context"></div>
             <div className="cell background-team"></div>
         </div>
         <div className="row">
-            <div className="cell background-energy-performance"></div>
             <div className="cell background-planning"></div>
+            <div className="cell background-energy-performance"></div>
             <div className="cell background-resilience"></div>
             <div className="cell background-community"></div>
         </div>

From b6fad2774f6255becfaa4b6d4665c85bf84f258c Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 6 Jun 2023 12:08:59 +0100
Subject: [PATCH 34/42] Rename Subcategory

---
 app/src/frontend/building/data-containers/team.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/frontend/building/data-containers/team.tsx b/app/src/frontend/building/data-containers/team.tsx
index 0f15c2cf..3f9a7c32 100644
--- a/app/src/frontend/building/data-containers/team.tsx
+++ b/app/src/frontend/building/data-containers/team.tsx
@@ -21,7 +21,7 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const currentBuildingConstructionYear = building.date_year || undefined;
       return (
        <form>
-            <DataEntryGroup name="Dates of construction and extension(s)">
+            <DataEntryGroup name="Data relating to original building or extension?">
                 <NumericDataEntry
                     slug='date_year'
                     title={dataFields.date_year.title}

From d2c4c21280272e2490259a9026bfb621ea246258 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 6 Jun 2023 12:09:41 +0100
Subject: [PATCH 35/42] Tweak data label

---
 app/src/frontend/config/data-fields-config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 388a8d0f..91a1ba6c 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -324,7 +324,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
     },
     date_year: {
         category: Category.Age,
-        title: "Year of construction (best estimate)",
+        title: "Year of construction of main building (best estimate)",
         tooltip: "Best estimate for construction of main body of the building.",
         example: 1924,
     },

From afd414902172059f727b9d2d1261f58d174c11a3 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 6 Jun 2023 12:09:51 +0100
Subject: [PATCH 36/42] Tweak Key text

---
 app/src/frontend/config/category-maps-config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts
index f8f75e63..4f9dfd80 100644
--- a/app/src/frontend/config/category-maps-config.ts
+++ b/app/src/frontend/config/category-maps-config.ts
@@ -144,7 +144,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
         {
             mapStyle: 'typology_likes',
             legend: {
-                title: 'Liked typologies',
+                title: 'Liked non-residential buildings',
                 elements: [
                     { color: '#bd0026', text: '👍👍👍👍 100+' },
                     { color: '#e31a1c', text: '👍👍👍 50–99' },

From 355b1078c2059fc0e2436a5f21ad7ca81bd46f8b Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 6 Jun 2023 13:25:36 +0100
Subject: [PATCH 37/42] Fix Residential button toggle

---
 app/src/frontend/building/data-containers/land-use.tsx | 9 ++++++++-
 app/src/frontend/config/tileserver-config.ts           | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/frontend/building/data-containers/land-use.tsx b/app/src/frontend/building/data-containers/land-use.tsx
index 6a15a978..3cc4e429 100644
--- a/app/src/frontend/building/data-containers/land-use.tsx
+++ b/app/src/frontend/building/data-containers/land-use.tsx
@@ -20,8 +20,15 @@ import { DataEntryGroup } from '../data-components/data-entry-group';
 const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const switchToIsDomesticMapStyle = (e) => {
         e.preventDefault();
-        props.onMapColourScale('is_domestic')
+
+        if (props.mapColourScale == "is_domestic") {
+            props.onMapColourScale('landuse');
+        }
+        else {
+            props.onMapColourScale('is_domestic');
+        }
     }
+
     const { darkLightTheme } = useDisplayPreferences();
       return (
           <Fragment>
diff --git a/app/src/frontend/config/tileserver-config.ts b/app/src/frontend/config/tileserver-config.ts
index 0ad39b90..990536ef 100644
--- a/app/src/frontend/config/tileserver-config.ts
+++ b/app/src/frontend/config/tileserver-config.ts
@@ -3,7 +3,8 @@
  * Adjust the values here if modifying the list of styles in the tileserver.
  */
 
-export type BuildingMapTileset = 'date_year' | 
+export type BuildingMapTileset = 
+    'date_year' | 
     'size_height' |
     'construction_core_material' |
     'location' |

From 40285bef329c0d84e96c9be9fa453d7918947d36 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 6 Jun 2023 13:54:06 +0100
Subject: [PATCH 38/42] Remove unused code

---
 app/src/frontend/building/data-containers/resilience.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/frontend/building/data-containers/resilience.tsx b/app/src/frontend/building/data-containers/resilience.tsx
index a77a3d8f..592b5bc5 100644
--- a/app/src/frontend/building/data-containers/resilience.tsx
+++ b/app/src/frontend/building/data-containers/resilience.tsx
@@ -18,7 +18,6 @@ import "react-datepicker/dist/react-datepicker.css";
 */
 const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
     
-    const { historicData, historicDataSwitchOnClick, darkLightTheme } = useDisplayPreferences();
     const [ startDate, setStartDate ] = useState(null);
     const [ endDate, setEndDate ] = useState(null);
 

From 2da2834a72f3a6a14272f98ccda845a9a1831fce Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 6 Jun 2023 13:54:42 +0100
Subject: [PATCH 39/42] Fix historical maps (age and history)

Will now change key when switching between historical maps and default view (building age)
---
 .../building/data-containers/age-history.tsx  | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/src/frontend/building/data-containers/age-history.tsx b/app/src/frontend/building/data-containers/age-history.tsx
index e19e5807..053108b0 100644
--- a/app/src/frontend/building/data-containers/age-history.tsx
+++ b/app/src/frontend/building/data-containers/age-history.tsx
@@ -41,6 +41,19 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
 
     const { historicData, historicDataSwitchOnClick, darkLightTheme } = useDisplayPreferences();
 
+    const switchToSurvivalMapStyle = (e) => {
+        e.preventDefault();
+
+        if (props.mapColourScale == "survival_status") {
+            props.onMapColourScale('date_year');
+            historicDataSwitchOnClick(e);
+        }
+        else {
+            props.onMapColourScale('survival_status');
+            historicDataSwitchOnClick(e);
+        }
+    }
+
     if (props.building.date_source == "Expert knowledge of building" ||
         props.building.date_source == "Expert estimate from image" ||
         props.building.date_source == null
@@ -277,8 +290,8 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 }
             </DataEntryGroup>
             <DataEntryGroup name="Lifespan and site history">
-                <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
-                    {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
+                <button className={`map-switcher-inline ${props.mapColourScale == "survival_status" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToSurvivalMapStyle}>
+                    {(props.mapColourScale == "is_domestic")? 'Click here to hide historical maps':'Click here to show historical maps'}
                 </button>
                 <DataEntryGroup name="Constructions and demolitions on this site" showCount={false}>
                     <DynamicsBuildingPane>
@@ -373,8 +386,8 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                         Choose a colour to indicate whether the building has survived.
                     </i>
                 </div>
-                <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
-                    {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
+                <button className={`map-switcher-inline ${props.mapColourScale == "survival_status" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToSurvivalMapStyle}>
+                    {(props.mapColourScale == "is_domestic")? 'Click here to hide historical maps':'Click here to show historical maps'}
                 </button>
                 <SelectDataEntry
                     title={dataFields.survival_status.title}
@@ -649,8 +662,8 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 }
             </DataEntryGroup>
             <DataEntryGroup name="Lifespan and site history">
-                <button className={`map-switcher-inline ${historicData} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
-                    {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
+                <button className={`map-switcher-inline ${props.mapColourScale == "survival_status" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToSurvivalMapStyle}>
+                    {(props.mapColourScale == "is_domestic")? 'Click here to hide historical maps':'Click here to show historical maps'}
                 </button>
                 <DataEntryGroup name="Constructions and demolitions on this site" showCount={false}>
                     <DynamicsBuildingPane>
@@ -745,8 +758,8 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                         Choose a colour to indicate whether the building has survived.
                     </i>
                 </div>
-                <button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}> 
-                    {(historicData === 'enabled')?'Click here to hide historical maps':'Click here to show historical maps'}
+                <button className={`map-switcher-inline ${props.mapColourScale == "survival_status" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToSurvivalMapStyle}>
+                    {(props.mapColourScale == "is_domestic")? 'Click here to hide historical maps':'Click here to show historical maps'}
                 </button>
                 <SelectDataEntry
                     title={dataFields.survival_status.title}

From 435d0cb2f3d0edc3f4f49a3c29868e636cf55ea6 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 6 Jun 2023 14:48:15 +0100
Subject: [PATCH 40/42] Fix Key change buttons

---
 .../building/data-containers/community.tsx    | 110 +++++++-----------
 1 file changed, 45 insertions(+), 65 deletions(-)

diff --git a/app/src/frontend/building/data-containers/community.tsx b/app/src/frontend/building/data-containers/community.tsx
index 45aee4d2..2b137ca7 100644
--- a/app/src/frontend/building/data-containers/community.tsx
+++ b/app/src/frontend/building/data-containers/community.tsx
@@ -7,7 +7,6 @@ import { MultiSelectDataEntry } from '../data-components/multi-select-data-entry
 import { DataEntryGroup } from '../data-components/data-entry-group';
 
 import { CategoryViewProps } from './category-view-props';
-import InfoBox from '../../components/info-box';
 import { LogicalDataEntry, LogicalDataEntryYesOnlyWithExplanation } from '../data-components/logical-data-entry/logical-data-entry';
 import { buildingUserFields, dataFields } from '../../config/data-fields-config';
 
@@ -47,9 +46,7 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
             </i>
         </div>
         <div className='community-opinion-pane'>
-            {
-            
-            (props.building.is_domestic === "no" || props.building.is_domestic === "mixed domestic/non-domestic") ?
+            {(props.building.is_domestic === "no" || props.building.is_domestic === "mixed domestic/non-domestic") ?
             <>
                 <UserOpinionEntry
                     slug='community_like'
@@ -61,13 +58,10 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     mode={props.mode}
                     copy={props.copy}
                 />
-                <button className={`map-switcher-inline ${props.mapColourScale == "likes" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`}>
-                    {(props.mapColourScale == "likes")? 'Showing likes for specific buildings' : 'Click to see likes for specific buildings mapped'}
-                </button>
                 </>
-            : <></>}
-            
-            
+            : 
+                <></>
+            }
             <LogicalDataEntryYesOnlyWithExplanation
                 slug='community_type_worth_keeping'
                 title={buildingUserFields.community_type_worth_keeping.title}
@@ -80,6 +74,15 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 mode={props.mode}
 
             />
+            {(props.mapColourScale == "typology_likes") ? 
+                <button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToLocalSignificanceMapStyle}>
+                    {'Click here to change map to buildings of local interest.'}
+                </button>
+            :
+                <button className={`map-switcher-inline disabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToTypologyMapStyle}>
+                    {"Click to return to liked typologies mapped."}
+                </button>
+            }
             {
                 props.building.community_type_worth_keeping === true &&
                 <MultiSelectDataEntry
@@ -99,16 +102,7 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
                     mode={props.mode}
                 />
             }
-            {
-            /*
-            <button className={`map-switcher-inline ${props.mapColourScale == "typology_likes" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToTypologyMapStyle}>
-                {(props.mapColourScale == "typology_likes")? 'Showing likes for typologies (not about specific buildings)' : 'Click to see views on building typologies'}
-            </button>
-            */
-            }
             <hr />
-            
-
             <UserOpinionEntry
                 slug='community_local_significance'
                 title={buildingUserFields.community_local_significance.title}
@@ -120,15 +114,14 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 copy={props.copy}
             />
             {(props.mapColourScale == "community_local_significance_total") ? 
-            <button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToTypologyMapStyle}>
-            {'Click to return to liked typologies mapped.'}
-        </button>
+                <button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToTypologyMapStyle}>
+                    {'Click to return to liked typologies mapped.'}
+                </button>
             :
-            <button className={`map-switcher-inline disabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToLocalSignificanceMapStyle}>
-            {"Click here to change map to buildings of local interest."}
-            </button>
+                <button className={`map-switcher-inline disabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToLocalSignificanceMapStyle}>
+                    {"Click here to change map to buildings of local interest."}
+                </button>
             }
-
             <hr />
             <UserOpinionEntry
                 slug='community_expected_planning_application'
@@ -141,16 +134,14 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 copy={props.copy}
             />
             {(props.mapColourScale == "community_expected_planning_application_total") ? 
-            <button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToTypologyMapStyle}>
-            {'Click to return to liked typologies mapped.'}
-        </button>
+                <button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToTypologyMapStyle}>
+                    {'Click to return to liked typologies mapped.'}
+                </button>
             :
-            <button className={`map-switcher-inline disabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToExpectedApplicationMapStyle}>
-            {"Click here to change map to planning applications expected by community."}
-            </button>
+                <button className={`map-switcher-inline disabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToExpectedApplicationMapStyle}>
+                    {"Click here to change map to planning applications expected by community."}
+                </button>
             }
-
-
         </div>
         </DataEntryGroup>
         <DataEntryGroup name="Building use for community activities">
@@ -186,17 +177,6 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
             onChange={props.onChange}
             mode={props.mode}
         />
-        {/* TODO: dates */}
-        {
-            // props.building.community_activities === true &&
-            // <FieldRow>
-            //     <div>
-            //     </div>
-            //     <div>
-            //     </div>
-            // </FieldRow>
-        }
-        
         <SelectDataEntry
             slug='community_public_ownership'
             title={dataFields.community_public_ownership.title}
@@ -207,13 +187,13 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
             copy={props.copy}
         />
         <Verification
-                slug="community_public_ownership"
-                allow_verify={props.user !== undefined && props.building.community_public_ownership !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("community_public_ownership")}
-                user_verified_as={props.user_verified.community_public_ownership}
-                verified_count={props.building.verified.community_public_ownership}
-                />
+            slug="community_public_ownership"
+            allow_verify={props.user !== undefined && props.building.community_public_ownership !== null && !props.edited}
+            onVerify={props.onVerify}
+            user_verified={props.user_verified.hasOwnProperty("community_public_ownership")}
+            user_verified_as={props.user_verified.community_public_ownership}
+            verified_count={props.building.verified.community_public_ownership}
+            />
         <MultiDataEntry
             slug='community_public_ownership_sources'
             title={dataFields.community_public_ownership_sources.title}
@@ -226,21 +206,21 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
             copy={props.copy}
         />
         <Verification
-                slug="community_public_ownership_sources"
-                allow_verify={props.user !== undefined && props.building.community_public_ownership_sources !== null && !props.edited}
-                onVerify={props.onVerify}
-                user_verified={props.user_verified.hasOwnProperty("community_public_ownership_sources")}
-                user_verified_as={props.user_verified.community_public_ownership_sources}
-                verified_count={props.building.verified.community_public_ownership_sources}
-                />
+            slug="community_public_ownership_sources"
+            allow_verify={props.user !== undefined && props.building.community_public_ownership_sources !== null && !props.edited}
+            onVerify={props.onVerify}
+            user_verified={props.user_verified.hasOwnProperty("community_public_ownership_sources")}
+            user_verified_as={props.user_verified.community_public_ownership_sources}
+            verified_count={props.building.verified.community_public_ownership_sources}
+            />
         {(props.mapColourScale == "community_in_public_ownership") ? 
-        <button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToTypologyMapStyle}>
-        {'Click to return to liked typologies mapped.'}
-    </button>
+            <button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToTypologyMapStyle}>
+                {'Click to return to liked typologies mapped.'}
+            </button>
         :
-        <button className={`map-switcher-inline disabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToPublicOwnershipMapStyle}>
-        {"Click here to see ownership type mapped."}
-        </button>
+            <button className={`map-switcher-inline disabled-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToPublicOwnershipMapStyle}>
+                {"Click here to see ownership type mapped."}
+            </button>
         }
         </DataEntryGroup>
     </>

From 0a38a3ec23d56e51cf7031d6302eb0fd001aa14f Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 6 Jun 2023 15:03:22 +0100
Subject: [PATCH 41/42] Revert for now

---
 app/src/frontend/config/data-fields-config.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 91a1ba6c..ecb765cd 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -837,13 +837,11 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         title: "Is the building in public/community ownership?",
         example: "Privately owned (non-corporate)",
         items: [
-            'State-owned',
+            'Government-owned',
             'Charity-owned',
-            'Community-owned',
+            'Community-owned/cooperative',
             'Owned by other non-profit body',
-            'Privately owned (non-corporate)',
-            'Privately owned (corporate)',
-            'Other'
+            'Not in public/community ownership'
         ]
     },
     community_public_ownership_sources: {

From e72d496e41a860a3b1b1273b3f833807b265f6b2 Mon Sep 17 00:00:00 2001
From: Mike Simpson <mike.simpson@ncl.ac.uk>
Date: Tue, 6 Jun 2023 15:41:08 +0100
Subject: [PATCH 42/42] Fix categories menu resizing from Welcome to Category
 pages

---
 app/src/frontend/building/categories.css | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/frontend/building/categories.css b/app/src/frontend/building/categories.css
index 880e6898..7adc9af9 100644
--- a/app/src/frontend/building/categories.css
+++ b/app/src/frontend/building/categories.css
@@ -1,8 +1,12 @@
 .data-category-list {
   margin: 0;
-  margin-bottom: 10px;
-  padding: 2px;
+  margin-bottom: 25px;
+  padding-top: 12px;
+  padding-left: 12px;
+  padding-right: 12px;
+  padding-bottom: 12px;
   width: 100%;
+  min-height: 340px;
   height: 340px;
   max-height: 340px;
   max-width: 470px;
@@ -14,6 +18,10 @@
   list-style: none;
 }
 
+.welcome .data-category-list {
+  padding: 0px;
+}
+
 .data-category-list li {
   box-sizing: border-box;
   flex-basis: 7rem;