diff --git a/app/src/frontend/building/data-containers/age.tsx b/app/src/frontend/building/data-containers/age.tsx
index 4caf5bd9..d493d61f 100644
--- a/app/src/frontend/building/data-containers/age.tsx
+++ b/app/src/frontend/building/data-containers/age.tsx
@@ -16,7 +16,58 @@ 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" || "Expert estimate from image"){
+      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=""
+                  options={dataFields.date_source.items}
+                  />
+          </Fragment>
+        );
+      };
     return (
         <Fragment>
             <YearDataEntry
@@ -65,15 +116,6 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 placeholder=""
                 options={dataFields.date_source.items}
                 />
-            <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}
-                />
             <MultiDataEntry
                 title={dataFields.date_link.title}
                 slug="date_link"