diff --git a/components/newappeal/aboutyou.js b/components/newappeal/aboutyou.js
index f52596b6..24a4c304 100644
--- a/components/newappeal/aboutyou.js
+++ b/components/newappeal/aboutyou.js
@@ -10,6 +10,99 @@ import {
     MultiLinefield,
 } from "../elements";
 
+const RenderTextfield = ({
+    id,
+    className,
+    rows,
+    datafieldname,
+    name,
+    label,
+    input,
+    type,
+    errorMsg,
+    disabled,
+    meta: { touched, error },
+    ...custom
+}) => {
+    return (
+        <>
+            <div
+                className={
+                    touched && error
+                        ? "govuk-form-group govuk-form-group--error"
+                        : "govuk-form-group "
+                }
+            >
+                <label className="govuk-label " htmlFor={id} id={id + "_label"}>
+                    {label}
+                </label>
+                {touched && error && (
+                    <span id={id + "-error"} className="govuk-error-message">
+                        <span className="govuk-visually-hidden">Error:</span>{" "}
+                        {touched &&
+                            ((error && (
+                                <span>{errorMsg ? errorMsg : error}</span>
+                            )) ||
+                                (warning && <span>{warning}</span>))}
+                    </span>
+                )}
+                <input
+                    {...input}
+                    className={className}
+                    name={id}
+                    id={id}
+                    type={type}
+                    disabled={disabled ? true : false}
+                />
+            </div>
+        </>
+    );
+};
+
+const RenderMultiline = ({
+    id,
+    className,
+    rows,
+    datafieldname,
+    name,
+    label,
+    input,
+    errorMsg,
+    meta: { touched, error },
+    ...custom
+}) => {
+    return (
+        <>
+            <div
+                className={
+                    touched && error
+                        ? "govuk-form-group govuk-form-group--error"
+                        : "govuk-form-group "
+                }
+            >
+                <label className="govuk-label " htmlFor={id} id={id + "_label"}>
+                    {label}
+                </label>
+                {touched && error && (
+                    <span id={id + "-error"} className="govuk-error-message">
+                        <span className="govuk-visually-hidden">Error:</span>{" "}
+                        {touched &&
+                            ((error && (
+                                <span>{errorMsg ? errorMsg : error}</span>
+                            )) ||
+                                (warning && <span>{warning}</span>))}
+                    </span>
+                )}
+                <textarea
+                    {...input}
+                    rows={rows}
+                    className={className}
+                ></textarea>
+            </div>
+        </>
+    );
+};
+
 let AboutYou = (props) => {
     let { t } = useTranslation();
 
@@ -44,64 +137,6 @@ let AboutYou = (props) => {
             ? "Invalid phone number"
             : undefined;
 
-    const RenderTextfield = ({
-        id,
-        className,
-        rows,
-        datafieldname,
-        name,
-        label,
-        input,
-        type,
-        errorMsg,
-        disabled,
-        meta: { touched, error },
-        ...custom
-    }) => {
-        return (
-            <>
-                <div
-                    className={
-                        touched && error
-                            ? "govuk-form-group govuk-form-group--error"
-                            : "govuk-form-group "
-                    }
-                >
-                    <label
-                        className="govuk-label "
-                        htmlFor={id}
-                        id={id + "_label"}
-                    >
-                        {label}
-                    </label>
-                    {touched && error && (
-                        <span
-                            id={id + "-error"}
-                            className="govuk-error-message"
-                        >
-                            <span className="govuk-visually-hidden">
-                                Error:
-                            </span>{" "}
-                            {touched &&
-                                ((error && (
-                                    <span>{errorMsg ? errorMsg : error}</span>
-                                )) ||
-                                    (warning && <span>{warning}</span>))}
-                        </span>
-                    )}
-                    <input
-                        {...input}
-                        className={className}
-                        name={id}
-                        id={id}
-                        type={type}
-                        disabled={disabled ? true : false}
-                    />
-                </div>
-            </>
-        );
-    };
-
     const RenderYesNo = ({
         datafieldname,
         name,
@@ -174,58 +209,6 @@ let AboutYou = (props) => {
             </>
         );
     };
-    const RenderMultiline = ({
-        id,
-        className,
-        rows,
-        datafieldname,
-        name,
-        label,
-        input,
-        errorMsg,
-        meta: { touched, error },
-        ...custom
-    }) => {
-        return (
-            <>
-                <div
-                    className={
-                        touched && error
-                            ? "govuk-form-group govuk-form-group--error"
-                            : "govuk-form-group "
-                    }
-                >
-                    <label
-                        className="govuk-label "
-                        htmlFor={id}
-                        id={id + "_label"}
-                    >
-                        {label}
-                    </label>
-                    {touched && error && (
-                        <span
-                            id={id + "-error"}
-                            className="govuk-error-message"
-                        >
-                            <span className="govuk-visually-hidden">
-                                Error:
-                            </span>{" "}
-                            {touched &&
-                                ((error && (
-                                    <span>{errorMsg ? errorMsg : error}</span>
-                                )) ||
-                                    (warning && <span>{warning}</span>))}
-                        </span>
-                    )}
-                    <textarea
-                        {...input}
-                        rows={rows}
-                        className={className}
-                    ></textarea>
-                </div>
-            </>
-        );
-    };
 
     const RenderRadio = ({
         datafieldname,
diff --git a/components/search/advancedsearch.js b/components/search/advancedsearch.js
index 432f7357..1aa9292e 100644
--- a/components/search/advancedsearch.js
+++ b/components/search/advancedsearch.js
@@ -19,6 +19,55 @@ export const minLength = (errorMsg) => (value) =>
 
 export const leastOneValue = (errorMsg) => {};
 
+const RenderTextfield = ({
+    id,
+    className,
+    rows,
+    datafieldname,
+    name,
+    label,
+    input,
+    hint1,
+    hint2,
+    hint3,
+    meta: { touched, error },
+    ...custom
+}) => {
+    let { t } = useTranslation();
+
+    return (
+        <>
+            <div className="govuk-form-group">
+                <div id="basicSearch-hint" className="govuk-hint ">
+                    <label className="govuk-label" htmlFor="caseRef">
+                        {t("search:casereference-label")}
+                    </label>
+                </div>
+
+                <div>
+                    <input
+                        {...input}
+                        className={className}
+                        name={name}
+                        id={id}
+                    />
+                    {touched && error && (
+                        <span
+                            id={id + "-error"}
+                            className="govuk-error-message govuk-form-group--error"
+                        >
+                            <span className="govuk-visually-hidden">
+                                Error:
+                            </span>{" "}
+                            {error}
+                        </span>
+                    )}
+                </div>
+            </div>
+        </>
+    );
+};
+
 let AdvancedSearch = (props) => {
     let { t } = useTranslation();
 
@@ -56,53 +105,6 @@ let AdvancedSearch = (props) => {
         ? [{}]
         : props.LPAData.LPAData.value;
 
-    const RenderTextfield = ({
-        id,
-        className,
-        rows,
-        datafieldname,
-        name,
-        label,
-        input,
-        hint1,
-        hint2,
-        hint3,
-        meta: { touched, error },
-        ...custom
-    }) => {
-        return (
-            <>
-                <div className="govuk-form-group">
-                    <div id="basicSearch-hint" className="govuk-hint ">
-                        <label className="govuk-label" htmlFor="caseRef">
-                            {t("search:casereference-label")}
-                        </label>
-                    </div>
-
-                    <div>
-                        <input
-                            {...input}
-                            className={className}
-                            name={name}
-                            id={id}
-                        />
-                        {touched && error && (
-                            <span
-                                id={id + "-error"}
-                                className="govuk-error-message govuk-form-group--error"
-                            >
-                                <span className="govuk-visually-hidden">
-                                    Error:
-                                </span>{" "}
-                                {error}
-                            </span>
-                        )}
-                    </div>
-                </div>
-            </>
-        );
-    };
-
     const RenderLPAList = ({
         name,
         id,