diff --git a/app/src/frontend/building/data-containers/age.tsx b/app/src/frontend/building/data-containers/age.tsx
index 7175d54d..15ff3c70 100644
--- a/app/src/frontend/building/data-containers/age.tsx
+++ b/app/src/frontend/building/data-containers/age.tsx
@@ -16,7 +16,61 @@ import { CategoryViewProps } from './category-view-props';
 */
 const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
     const currentYear = new Date().getFullYear();
+    if (props.building.date_source == "Expert knowledge of building" ||
+        props.building.date_source == "Expert estimate from image" ||
+        props.building.date_source == null
+       ){
+      return (
+          <Fragment>
+              <YearDataEntry
+                  year={props.building.date_year}
+                  upper={props.building.date_upper}
+                  lower={props.building.date_lower}
+                  mode={props.mode}
+                  copy={props.copy}
+                  onChange={props.onChange}
 
+                  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}
+                  />
+              <NumericDataEntry
+                  title={dataFields.facade_year.title}
+                  slug="facade_year"
+                  value={props.building.facade_year}
+                  mode={props.mode}
+                  copy={props.copy}
+                  onChange={props.onChange}
+                  step={1}
+                  min={1}
+                  max={currentYear}
+                  tooltip={dataFields.facade_year.tooltip}
+                  />
+              <Verification
+                  slug="facade_year"
+                  allow_verify={props.user !== undefined && props.building.facade_year !== null && !props.edited}
+                  onVerify={props.onVerify}
+                  user_verified={props.user_verified.hasOwnProperty("facade_year")}
+                  user_verified_as={props.user_verified.facade_year}
+                  verified_count={props.building.verified.facade_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}
+                  placeholder={dataFields.date_source.example}
+                  options={dataFields.date_source.items}
+                  />
+          </Fragment>
+        );
+      };
     return (
         <Fragment>
             <YearDataEntry
@@ -62,32 +116,8 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 copy={props.copy}
                 onChange={props.onChange}
                 tooltip={dataFields.date_source.tooltip}
-                placeholder=""
-                options={[
-                    "Expert knowledge of building",
-                    "Expert estimate from image",
-                    "Survey of London",
-                    "Pevsner Guides",
-                    "Victoria County History",
-                    "Local history publication",
-                    "Other publication",
-                    "National Heritage List for England",
-                    "Other database or gazetteer",
-                    "Historical map",
-                    "Other archive document",
-                    "Film/Video",
-                    "Other website",
-                    "Other"
-                ]}
-                />
-            <TextboxDataEntry
-                title={dataFields.date_source_detail.title}
-                slug="date_source_detail"
-                value={props.building.date_source_detail}
-                mode={props.mode}
-                copy={props.copy}
-                onChange={props.onChange}
-                tooltip={dataFields.date_source_detail.tooltip}
+                options={dataFields.date_source.items}
+                placeholder={dataFields.date_source.example}
                 />
             <MultiDataEntry
                 title={dataFields.date_link.title}
diff --git a/app/src/frontend/building/data-containers/use.tsx b/app/src/frontend/building/data-containers/use.tsx
index 04090357..64ba958c 100644
--- a/app/src/frontend/building/data-containers/use.tsx
+++ b/app/src/frontend/building/data-containers/use.tsx
@@ -14,77 +14,128 @@ import Verification from '../data-components/verification';
 /**
  * Use view/edit section
  */
-const UseView: React.FunctionComponent<CategoryViewProps> = (props) => (
-    <Fragment>
-        <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}
+const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
+    if (props.building.current_landuse_source == "Expert/personal knowledge of building" ||
+        props.building.current_landuse_source == "Online streetview image" ||
+        props.building.current_landuse_source == null
+       ){
+      return (
+          <Fragment>
+              <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.date_source.example}
+                  options={dataFields.current_landuse_source.items}
+                  />
+          </Fragment>
+        );
+      };
+    return (
+        <Fragment>
+            <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}
             />
-        {
-            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=""
-            options={[
-                "Expert/personal knowledge of building",
-                "Online streetview image",
-                "Open planning authority dataset",
-                "Open property tax dataset",
-                "Open housing dataset",
-                "Open address dataset",
-                "Other"
-            ]}
+            <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}
             />
-        <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}
-            />
-    </Fragment>
-);
+            <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.date_source.example}
+                options={dataFields.current_landuse_source.items}
+                />
+            <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}
+                />
+        </Fragment>
+      );
+};
 const UseContainer = withCopyEdit(UseView);
 
 export default UseContainer;
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 828c8c5b..f808f000 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -198,6 +198,15 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         title: "Source of information",
         tooltip: "Source for the current land use",
         example: "",
+        items: [
+            "Expert/personal knowledge of building",
+            "Online streetview image",
+            "Open planning authority dataset",
+            "Open property tax dataset",
+            "Open housing dataset",
+            "Open address dataset",
+            "Other"
+        ],
     },
     current_landuse_source_detail: {
         category: Category.LandUse,
@@ -269,6 +278,22 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         category: Category.Age,
         title: "Source of information",
         tooltip: "Source for the main start date",
+        items: [
+            "Expert knowledge of building",
+            "Expert estimate from image",
+            "Survey of London",
+            "Pevsner Guides",
+            "Victoria County History",
+            "Local history publication",
+            "Other publication",
+            "National Heritage List for England",
+            "Other database or gazetteer",
+            "Historical map",
+            "Other archive document",
+            "Film/Video",
+            "Other website",
+            "Other"
+        ],
         example: "",
     },
     date_source_detail: {