diff --git a/.env.local b/.env.local
index dc45427c..035eccf5 100644
--- a/.env.local
+++ b/.env.local
@@ -8,8 +8,8 @@ SASKEYNAME = "devpedwnspolicy"
 
 PORT= "3000"
 DEFAULT_DOMAIN = "localhost"
-//I18N_DOMAIN = "cymru.local"
-I18N_DOMAIN ="dev-gwaithcynllunio.gwasanaeth.llyw.cymru"
+I18N_DOMAIN = "cymru.local"
+//I18N_DOMAIN ="dev-gwaithcynllunio.gwasanaeth.llyw.cymru"
 //I18N_DOMAIN ="stage-gwaithcynllunio.gwasanaeth.llyw.cymru"
 //I18N_DOMAIN ="pp-gwaithcynllunio.gwasanaeth.llyw.cymru"
 //I18N_DOMAIN ="gwaithcynllunio.gwasanaeth.llyw.cymru"
diff --git a/components/account/registerCheck.js b/components/account/registerCheck.js
index 9c63b5b2..b2b11046 100644
--- a/components/account/registerCheck.js
+++ b/components/account/registerCheck.js
@@ -28,11 +28,16 @@ const RegisterFormCheck = (props) => {
 
     return (
         <>
-            <p>Check that the details you entered are correct.</p>
-            <h2 className="govuk-heading-m">About you</h2>
+            <p>{t("account:register-new-account-check-details-paragraph")}</p>
+            <h2 className="govuk-heading-m">
+                {" "}
+                {t("account:register-new-account-sub-heading-1")}
+            </h2>
             <dl className="govuk-summary-list  govuk-!-margin-bottom-9">
                 <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">First name</dt>
+                    <dt className="govuk-summary-list__key">
+                        {t("account:register-new-account-first-name-label")}
+                    </dt>
                     <dd className="govuk-summary-list__value">
                         {
                             props.props.props.form.accountRegisterForm.values
@@ -47,15 +52,19 @@ const RegisterFormCheck = (props) => {
                                 setRegisterFormComplete(false);
                             }}
                         >
-                            Change
+                            {t("common:change-link-label")}
                             <span className="govuk-visually-hidden">
-                                first name
+                                {t(
+                                    "account:register-new-account-first-name-label"
+                                )}
                             </span>
                         </a>
                     </dd>
                 </div>
                 <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Last name</dt>
+                    <dt className="govuk-summary-list__key">
+                        {t("account:register-new-account-last-name-label")}
+                    </dt>
                     <dd className="govuk-summary-list__value">
                         {
                             props.props.props.form.accountRegisterForm.values
@@ -70,15 +79,20 @@ const RegisterFormCheck = (props) => {
                                 setRegisterFormComplete(false);
                             }}
                         >
-                            Change
+                            {t("common:change-link-label")}
+
                             <span className="govuk-visually-hidden">
-                                last name
+                                {t(
+                                    "account:register-new-account-last-name-label"
+                                )}
                             </span>
                         </a>
                     </dd>
                 </div>
                 <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Email address</dt>
+                    <dt className="govuk-summary-list__key">
+                        {t("account:register-new-account-email-address-label")}
+                    </dt>
                     <dd className="govuk-summary-list__value">
                         {
                             props.props.props.form.accountRegisterForm.values
@@ -93,16 +107,21 @@ const RegisterFormCheck = (props) => {
                                 setRegisterFormComplete(false);
                             }}
                         >
-                            Change
+                            {t("common:change-link-label")}
+
                             <span className="govuk-visually-hidden">
                                 {" "}
-                                email address
+                                {t(
+                                    "account:register-new-account-email-address-label"
+                                )}
                             </span>
                         </a>
                     </dd>
                 </div>
                 <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Telephone</dt>
+                    <dt className="govuk-summary-list__key">
+                        {t("account:register-new-account-phone-label")}
+                    </dt>
                     <dd className="govuk-summary-list__value">
                         {
                             props.props.props.form.accountRegisterForm.values
@@ -117,9 +136,10 @@ const RegisterFormCheck = (props) => {
                                 setRegisterFormComplete(false);
                             }}
                         >
-                            Change
+                            {t("common:change-link-label")}
+
                             <span className="govuk-visually-hidden">
-                                telephone
+                                {t("account:register-new-account-phone-label")}
                             </span>
                         </a>
                     </dd>
@@ -150,10 +170,14 @@ const RegisterFormCheck = (props) => {
                 </div> */}
             </dl>
             <dl className="govuk-summary-list  govuk-!-margin-bottom-9">
-                <h2 className="govuk-heading-m">Your address</h2>
+                <h2 className="govuk-heading-m">
+                    {t("account:register-new-account-sub-heading-2")}
+                </h2>
 
                 <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Address Line 1</dt>
+                    <dt className="govuk-summary-list__key">
+                        {t("account:register-new-account-address-line-1-label")}
+                    </dt>
                     <dd className="govuk-summary-list__value">
                         {
                             props.props.props.form.accountRegisterForm.values
@@ -168,16 +192,21 @@ const RegisterFormCheck = (props) => {
                                 setRegisterFormComplete(false);
                             }}
                         >
-                            Change
+                            {t("common:change-link-label")}
+
                             <span className="govuk-visually-hidden">
                                 {" "}
-                                address line 1
+                                {t(
+                                    "account:register-new-account-address-line-1-label"
+                                )}
                             </span>
                         </a>
                     </dd>
                 </div>
                 <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Address line 2</dt>
+                    <dt className="govuk-summary-list__key">
+                        {t("account:register-new-account-address-line-2-label")}
+                    </dt>
                     <dd className="govuk-summary-list__value">
                         {
                             props.props.props.form.accountRegisterForm.values
@@ -192,16 +221,21 @@ const RegisterFormCheck = (props) => {
                                 setRegisterFormComplete(false);
                             }}
                         >
-                            Change
+                            {t("common:change-link-label")}
+
                             <span className="govuk-visually-hidden">
                                 {" "}
-                                address line 2
+                                {t(
+                                    "account:register-new-account-address-line-2-label"
+                                )}
                             </span>
                         </a>
                     </dd>
                 </div>
                 <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Town/City</dt>
+                    <dt className="govuk-summary-list__key">
+                        {t("account:register-new-account-town-label")}
+                    </dt>
                     <dd className="govuk-summary-list__value">
                         {
                             props.props.props.form.accountRegisterForm.values
@@ -216,16 +250,20 @@ const RegisterFormCheck = (props) => {
                                 setRegisterFormComplete(false);
                             }}
                         >
-                            Change
+                            {t("common:change-link-label")}
+
                             <span className="govuk-visually-hidden">
                                 {" "}
-                                town/city
+                                {t("account:register-new-account-town-label")}
                             </span>
                         </a>
                     </dd>
                 </div>
                 <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">County</dt>
+                    <dt className="govuk-summary-list__key">
+                        {" "}
+                        {t("account:register-new-account-county-label")}
+                    </dt>
                     <dd className="govuk-summary-list__value">
                         {
                             props.props.props.form.accountRegisterForm.values
@@ -240,16 +278,20 @@ const RegisterFormCheck = (props) => {
                                 setRegisterFormComplete(false);
                             }}
                         >
-                            Change
+                            {t("common:change-link-label")}
+
                             <span className="govuk-visually-hidden">
                                 {" "}
-                                county
+                                {t("account:register-new-account-county-label")}
                             </span>
                         </a>
                     </dd>
                 </div>
                 <div className="govuk-summary-list__row">
-                    <dt className="govuk-summary-list__key">Postcode</dt>
+                    <dt className="govuk-summary-list__key">
+                        {" "}
+                        {t("account:register-new-account-postcode-label")}
+                    </dt>
                     <dd className="govuk-summary-list__value">
                         {
                             props.props.props.form.accountRegisterForm.values
@@ -264,10 +306,13 @@ const RegisterFormCheck = (props) => {
                                 setRegisterFormComplete(false);
                             }}
                         >
-                            Change
+                            {t("common:change-link-label")}
+
                             <span className="govuk-visually-hidden">
                                 {" "}
-                                postcode
+                                {t(
+                                    "account:register-new-account-postcode-label"
+                                )}
                             </span>
                         </a>
                     </dd>
@@ -283,7 +328,7 @@ const RegisterFormCheck = (props) => {
                         setAccountCreatedComplete(true);
                     }}
                 >
-                    Continue
+                    {t("common:continue-button")}
                 </button>
             </div>
         </>
diff --git a/components/account/registerComplete.js b/components/account/registerComplete.js
index 0e187cac..4c057085 100644
--- a/components/account/registerComplete.js
+++ b/components/account/registerComplete.js
@@ -77,14 +77,16 @@ const RegisterComplete = (props) => {
 
     return props.accountDetails.accCr == "created" ? (
         <>
-            <p className="govuk-body">We have sent you a confirmation email.</p>
+            <p className="govuk-body">
+                {t("account:register-new-account-confirmation-email")}
+            </p>
 
-            <h2 className="govuk-heading-m">What happens next</h2>
+            <h2 className="govuk-heading-m">
+                {t("account:register-new-account-sub-heading-what-next")}
+            </h2>
 
             <p className="govuk-body">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a
-                metus non quam mollis egestas. Integer ac leo cursus, laoreet
-                nulla sed, tempus tellus. Mauris condimentum erat arcu.
+                {t("account:register-new-account-paragraph-what-next")}
             </p>
 
             <p className="govuk-body">
@@ -95,7 +97,7 @@ const RegisterComplete = (props) => {
                             setLogout(), window.localStorage.clear();
                         }}
                     >
-                        Login to My Portal
+                        {t("account:register-new-account-my-portal-link")}
                     </a>
                 </Link>
             </p>
@@ -103,7 +105,7 @@ const RegisterComplete = (props) => {
     ) : (
         <>
             <h2 className="govuk-heading-m">
-                Please try again with a different email address
+                {t("account:register-new-account-account-failed")}
             </h2>
             <p className="govuk-body">
                 <a
diff --git a/components/account/registerform.js b/components/account/registerform.js
index d0cf50a4..2d0fd4fb 100644
--- a/components/account/registerform.js
+++ b/components/account/registerform.js
@@ -28,33 +28,34 @@ const RenderTextfield = ({
 }) => {
     return (
         <>
-            <div
-                className={
-                    touched && error
-                        ? "govuk-form-group govuk-form-group--error"
-                        : "govuk-form-group "
-                }
-            >
+            <div className="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={name}
-                    id={id}
-                    type={type}
-                />
+                <div>
+                    <input
+                        {...input}
+                        className={className}
+                        name={name}
+                        id={id}
+                        type={type}
+                    />
+                    {touched && error && (
+                        <span
+                            id={id + "-error"}
+                            className="govuk-error-message govuk-form-group--error"
+                        >
+                            <span className="govuk-visually-hidden">
+                                Error:
+                            </span>{" "}
+                            {touched &&
+                                ((error && (
+                                    <span>{errorMsg ? errorMsg : error}</span>
+                                )) ||
+                                    (warning && <span>{warning}</span>))}
+                        </span>
+                    )}
+                </div>
             </div>
         </>
     );
@@ -63,6 +64,8 @@ const RenderTextfield = ({
 const RegisterForm = (props) => {
     const {
         handleSubmit,
+        pristine,
+        valid,
         value,
         setRegisterFormComplete,
         setAccountCreatedComplete,
@@ -105,15 +108,33 @@ const RegisterForm = (props) => {
         setRegisterFormComplete(true);
     };
 
+    console.log(pristine);
     return (
         <>
+            {!pristine && !valid && (
+                <div>
+                    <span
+                        id={"summary-error"}
+                        className="govuk-error-message govuk-form-group--error-summary"
+                    >
+                        <span className="govuk-visually-hidden">Error:</span>{" "}
+                        <span className="govuk-error-exclamation">
+                            There are errors on this page. Please correct any
+                            required fields and submit again.
+                        </span>
+                    </span>
+                </div>
+            )}
+
             {props.accountCreatedComplete != true ? (
                 props.registerFormComplete == false ? (
                     <form onSubmit={handleSubmit(onHandleSubmit)}>
                         <fieldset className="govuk-fieldset">
                             <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
                                 <h2 className="govuk-fieldset__heading">
-                                    About you
+                                    {t(
+                                        "account:register-new-account-sub-heading-1"
+                                    )}
                                 </h2>
                             </legend>
                             <Field
@@ -123,8 +144,12 @@ const RegisterForm = (props) => {
                                 type="text"
                                 className="govuk-input govuk-input--width-20"
                                 validate={[required]}
-                                label="First name"
-                                errorMsg="Is required"
+                                label={t(
+                                    "account:register-new-account-first-name-label"
+                                )}
+                                errorMsg={t(
+                                    "account:register-new-account-first-name-label-errormsg"
+                                )}
                             />
                             <Field
                                 name="lastname"
@@ -133,8 +158,12 @@ const RegisterForm = (props) => {
                                 type="text"
                                 className="govuk-input govuk-input--width-20"
                                 validate={[required]}
-                                label="Last name"
-                                errorMsg="Is required"
+                                label={t(
+                                    "account:register-new-account-last-name-label"
+                                )}
+                                errorMsg={t(
+                                    "account:register-new-account-last-name-label-errormsg"
+                                )}
                             />
                             <Field
                                 name="emailaddress1"
@@ -143,7 +172,9 @@ const RegisterForm = (props) => {
                                 type="email"
                                 className="govuk-input govuk-input--width-20"
                                 validate={[required, email]}
-                                label="Email address"
+                                label={t(
+                                    "account:register-new-account-email-address-label"
+                                )}
                             />
                             <Field
                                 name="telephone1"
@@ -152,7 +183,9 @@ const RegisterForm = (props) => {
                                 type="number"
                                 className="govuk-input govuk-input--width-20"
                                 validate={[required, phoneNumber]}
-                                label="Telephone"
+                                label={t(
+                                    "account:register-new-account-phone-label"
+                                )}
                             />
 
                             <Field
@@ -161,9 +194,13 @@ const RegisterForm = (props) => {
                                 component={RenderTextfield}
                                 type="password"
                                 className="govuk-input govuk-input--width-20"
-                                label="Password"
+                                label={t(
+                                    "account:register-new-account-password-label"
+                                )}
                                 validate={[required, minLength5]}
-                                errorMsg="Is required"
+                                errorMsg={t(
+                                    "account:register-new-account-password-label-errormsg"
+                                )}
                             />
                             <Field
                                 name="custom_password_check"
@@ -171,19 +208,25 @@ const RegisterForm = (props) => {
                                 component={RenderTextfield}
                                 type="password"
                                 className="govuk-input govuk-input--width-20"
-                                label="Confirm password"
+                                label={t(
+                                    "account:register-new-account-confirm-password-label"
+                                )}
                                 validate={[
                                     required,
                                     passwordsMatch,
                                     minLength5,
                                 ]}
-                                errorMsg="Passwords do not match"
+                                errorMsg={t(
+                                    "account:register-new-account-confirm-password-label-errormsg"
+                                )}
                             />
                         </fieldset>
                         <fieldset className="govuk-fieldset">
                             <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
                                 <h2 className="govuk-fieldset__heading">
-                                    What is your address?
+                                    {t(
+                                        "account:register-new-account-sub-heading-2"
+                                    )}
                                 </h2>
                             </legend>
 
@@ -193,9 +236,13 @@ const RegisterForm = (props) => {
                                 component={RenderTextfield}
                                 type="text"
                                 className="govuk-input govuk-input--width-20"
-                                label="Address line 1"
+                                label={t(
+                                    "account:register-new-account-address-line-1-label"
+                                )}
                                 validate={[required]}
-                                errorMsg="Is required"
+                                errorMsg={t(
+                                    "account:register-new-account-address-line-1-label-errormsg"
+                                )}
                             />
                             <Field
                                 name="address1_line2"
@@ -203,8 +250,9 @@ const RegisterForm = (props) => {
                                 component={RenderTextfield}
                                 type="text"
                                 className="govuk-input govuk-input--width-20"
-                                label="Address line 2"
-                                errorMsg="Is required"
+                                label={t(
+                                    "account:register-new-account-address-line-2-label"
+                                )}
                             />
                             <Field
                                 name="address1_city"
@@ -212,9 +260,13 @@ const RegisterForm = (props) => {
                                 component={RenderTextfield}
                                 type="text"
                                 className="govuk-input govuk-input--width-10"
-                                label="Town/City"
+                                label={t(
+                                    "account:register-new-account-town-label"
+                                )}
                                 validate={[required]}
-                                errorMsg="Is required"
+                                errorMsg={t(
+                                    "account:register-new-account-town-label-errormsg"
+                                )}
                             />
                             <Field
                                 name="address1_county"
@@ -222,9 +274,13 @@ const RegisterForm = (props) => {
                                 component={RenderTextfield}
                                 type="text"
                                 className="govuk-input govuk-input--width-10"
-                                label="County"
+                                label={t(
+                                    "account:register-new-account-county-label"
+                                )}
                                 validate={[required]}
-                                errorMsg="Is required"
+                                errorMsg={t(
+                                    "account:register-new-account-county-label-errormsg"
+                                )}
                             />
                             <Field
                                 name="address1_postalcode"
@@ -232,9 +288,13 @@ const RegisterForm = (props) => {
                                 component={RenderTextfield}
                                 type="text"
                                 className="govuk-input govuk-input--width-5"
-                                label="Postcode"
+                                label={t(
+                                    "account:register-new-account-postcode-label"
+                                )}
                                 validate={[required]}
-                                errorMsg="Is required"
+                                errorMsg={t(
+                                    "account:register-new-account-postcode-label-errormsg"
+                                )}
                             />
                         </fieldset>
 
@@ -244,7 +304,7 @@ const RegisterForm = (props) => {
                                 className="govuk-button"
                                 data-module="govuk-button"
                             >
-                                Continue
+                                {t("common:continue-button")}
                             </button>
                         </div>
                     </form>
diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js
index a6477415..c1156aac 100644
--- a/components/breadcrumbs.js
+++ b/components/breadcrumbs.js
@@ -386,7 +386,7 @@ const Breadcrumbs = (props) => {
                         {router.pathname == "/account/register" ? (
                             <>
                                 <li className="govuk-breadcrumbs__list-item">
-                                    Register your account
+                                    {t("account:register-new-account-heading")}
                                 </li>
                             </>
                         ) : (
diff --git a/components/case/summary.js b/components/case/summary.js
index c3de0839..22652b39 100644
--- a/components/case/summary.js
+++ b/components/case/summary.js
@@ -170,7 +170,7 @@ const CaseSummary = (props) => {
                         </dl>
                     </div>
                 </div>
-                <div className="govuk-grid-row">
+                {/* <div className="govuk-grid-row">
                     <div className="govuk-grid-column-full">
                         <div className="govuk-button-group">
                             {noRepresentationLink.includes(router.pathname) ==
@@ -197,7 +197,7 @@ const CaseSummary = (props) => {
                             </a>
                         </div>
                     </div>
-                </div>
+                </div> */}
                 <div className="govuk-grid-row">
                     <div className="flex-container grid-row govuk-body case">
                         <div className="card" id="casescomment-card">
diff --git a/components/footer.js b/components/footer.js
index f8296e35..11847158 100644
--- a/components/footer.js
+++ b/components/footer.js
@@ -136,7 +136,7 @@ export default function Footer(props) {
                                 aria-labelledby="footer_links"
                             >
                                 <ul className="govuk-footer__inline-list">
-                                    <li className="govuk-footer__inline-list-item govuk-!-font-weight-bold">
+                                    <li className="govuk-footer__inline-list-item govuk-!-font-weight-bold govuk-!-margin-right-7">
                                         <a
                                             href={t(
                                                 "common:footer-guidance-link"
@@ -148,6 +148,19 @@ export default function Footer(props) {
                                             )}
                                         </a>
                                     </li>
+                                    <li className="govuk-footer__inline-list-item govuk-!-font-weight-bold">
+                                        <a
+                                            href={t(
+                                                "common:footer-contact-us-link"
+                                            )}
+                                            className="govuk-footer__link"
+                                            id="aAccess"
+                                        >
+                                            {t(
+                                                "common:footer-contact-us-link-label"
+                                            )}
+                                        </a>
+                                    </li>
                                 </ul>
                                 <ul
                                     className="govuk-footer__inline-list"
@@ -155,41 +168,26 @@ export default function Footer(props) {
                                 >
                                     <li className="govuk-footer__inline-list-item">
                                         <a
-                                            href="https://gov.wales/contact-us"
+                                            href={t(
+                                                "common:footer-accessibility-link"
+                                            )}
                                             className="govuk-footer__link"
                                             id="aAccess"
-                                            target="_blank"
-                                            rel="noreferrer"
-                                        >
-                                            Contact us
-                                        </a>
-                                    </li>
-                                    <li className="govuk-footer__inline-list-item">
-                                        <a
-                                            href="https://gov.wales/copyright-statement"
-                                            className="govuk-footer__link"
-                                            id="aAccess"
-                                            target="_blank"
-                                            rel="noreferrer"
                                         >
                                             {t(
-                                                "common:footer-accessibility-link"
+                                                "common:footer-accessibility-link-label"
                                             )}
                                         </a>
                                     </li>
+
                                     <li className="govuk-footer__inline-list-item">
-                                        <a
-                                            href="https://gov.wales/copyright-statement"
-                                            className="govuk-footer__link"
-                                            id="aAccess"
-                                            target="_blank"
-                                            rel="noreferrer"
+                                        <Link
+                                            href={
+                                                router.locale == "cy"
+                                                    ? "/help/cwcis"
+                                                    : "/help/cookies"
+                                            }
                                         >
-                                            {t("common:footer-copyright-link")}
-                                        </a>
-                                    </li>
-                                    <li className="govuk-footer__inline-list-item">
-                                        <Link href="/help/cookies">
                                             <a
                                                 id="aCookies"
                                                 className="govuk-footer__link"
@@ -200,45 +198,62 @@ export default function Footer(props) {
                                             </a>
                                         </Link>
                                     </li>
+                                    <li className="govuk-footer__inline-list-item">
+                                        <a
+                                            href={t(
+                                                "common:footer-copyright-link"
+                                            )}
+                                            className="govuk-footer__link"
+                                            id="aAccess"
+                                        >
+                                            {t(
+                                                "common:footer-copyright-link-label"
+                                            )}
+                                        </a>
+                                    </li>
 
                                     <li className="govuk-footer__inline-list-item">
                                         <a
-                                            href="https://gov.wales/website-privacy-policy"
+                                            href={t(
+                                                "common:footer-privacy-link"
+                                            )}
                                             id="aPrivacy"
                                             className="govuk-footer__link"
-                                            target="_blank"
-                                            rel="noreferrer"
                                         >
-                                            {t("common:footer-privacy-link")}
+                                            {t(
+                                                "common:footer-privacy-link-label"
+                                            )}
                                         </a>
                                     </li>
 
                                     <li className="govuk-footer__inline-list-item">
                                         <a
-                                            href="https://gov.wales/terms-and-conditions"
-                                            id="aTermsConds"
-                                            className="govuk-footer__link"
-                                            target="_blank"
-                                            rel="noreferrer"
-                                        >
-                                            {t(
+                                            href={t(
                                                 "common:footer-terms-conditions-link"
                                             )}
+                                            id="aTermsConds"
+                                            className="govuk-footer__link"
+                                        >
+                                            {t(
+                                                "common:footer-terms-conditions-link-label"
+                                            )}
                                         </a>
                                     </li>
-                                    <li className="govuk-footer__inline-list-item">
+                                    {/* <li className="govuk-footer__inline-list-item">
                                         <a
-                                            href="https://gov.wales/alternative-languages"
+                                            href={t(
+                                                "common:footer-alternative-languages-link"
+                                            )}
                                             id="aTermsConds"
                                             className="govuk-footer__link"
                                             target="_blank"
                                             rel="noreferrer"
                                         >
                                             {t(
-                                                "common:footer-alternative-languages-link"
+                                                "common:footer-alternative-languages-link-label"
                                             )}
                                         </a>
-                                    </li>
+                                    </li> */}
                                 </ul>
                             </nav>
                             <div
@@ -246,12 +261,12 @@ export default function Footer(props) {
                                 id="footer_logo"
                             >
                                 <a
-                                    href="https://gov.wales/"
+                                    href={t("common:gov-wales-link")}
                                     className="footer__logo"
                                     id="footerlogo"
                                 >
                                     <span className="visually-hidden">
-                                        Home
+                                        {t("common:gov-wales-label")}
                                     </span>
                                 </a>
                             </div>
diff --git a/components/header.js b/components/header.js
index 07876f2b..042c2761 100644
--- a/components/header.js
+++ b/components/header.js
@@ -38,6 +38,13 @@ const Header = (props) => {
         "/dns/application-view",
     ];
 
+    let domainSwitch;
+
+    if (process.browser) {
+        domainSwitch = window.switchDomain;
+    } else {
+        domainSwitch = process.env.I18N_DOMAIN;
+    }
     return (
         <header
             className="govuk-header "
@@ -74,7 +81,7 @@ const Header = (props) => {
                     </Link>
                 </div> */}
                 <div className="languageSwitch">
-                    <div className="mobileNav">
+                    {/* <div className="mobileNav">
                         <div className="mobileMenu">
                             <input
                                 type="radio"
@@ -140,10 +147,12 @@ const Header = (props) => {
                                                           router.query.q
                                                         : router.pathname
                                                     : router.query.q != null
-                                                    ? router.pathname +
+                                                    ? process.env.I18N_DOMAIN +
+                                                      "/" +
+                                                      router.asPath +
                                                       "?q=" +
                                                       router.query.q
-                                                    : router.pathname
+                                                    : router.asPath
                                             }
                                             locale={
                                                 locale == "en" ? "cy" : "en"
@@ -176,8 +185,8 @@ const Header = (props) => {
                                 </ul>
                             </div>
                         </div>
-                    </div>
-                    <div className="fullNav">
+                    </div> */}
+                    <div className="fullNavs">
                         {hasContactLink.includes(router.pathname) == true ? (
                             <Link href="/dns/contact-us">
                                 <a className="govuk-header__link govuk-!-margin-right-3">
@@ -217,8 +226,8 @@ const Header = (props) => {
                                           router.query.q
                                         : router.pathname
                                     : router.query.q != null
-                                    ? router.pathname + "?q=" + router.query.q
-                                    : router.pathname
+                                    ? router.asPath + "?q=" + router.query.q
+                                    : router.asPath
                             }
                             locale={locale == "en" ? "cy" : "en"}
                         >
diff --git a/components/homepage/casecomment.js b/components/homepage/casecomment.js
index 848829e1..b1ad1da9 100644
--- a/components/homepage/casecomment.js
+++ b/components/homepage/casecomment.js
@@ -15,7 +15,10 @@ export default function CaseComment() {
                 </h3>
                 <p className="govuk-body-s">
                     {t("home:casescomment-card-paragraph-one")}{" "}
-                    <a href={"mailto:" + t("home:login-contact-email")}>
+                    <a
+                        href={"mailto:" + t("home:login-contact-email")}
+                        className="govuk-link--no-underline"
+                    >
                         {t("home:login-contact-email")}
                     </a>
                 </p>
diff --git a/components/homepage/casesearch.js b/components/homepage/casesearch.js
index 7a03ee9a..faa4b5a5 100644
--- a/components/homepage/casesearch.js
+++ b/components/homepage/casesearch.js
@@ -30,13 +30,7 @@ const RenderTextfield = ({
 }) => {
     return (
         <>
-            <div
-                className={
-                    touched && error
-                        ? "govuk-form-group govuk-form-group--error"
-                        : "govuk-form-group "
-                }
-            >
+            <div className="govuk-form-group">
                 <div id="basicSearch-hint" className="govuk-hint ">
                     <span className="govuk-body-s">{hint1}</span>
 
@@ -48,13 +42,25 @@ const RenderTextfield = ({
                 <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>{" "}
-                        {error}
-                    </span>
-                )}
-                <input {...input} className={className} name={name} id={id} />
+                <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>
         </>
     );
@@ -136,7 +142,9 @@ let CaseSearch = (props) => {
                                     : "/advancedsearch"
                             }
                         >
-                            <a>{t("home:casesearch-card-advanced-link")}</a>
+                            <a className="govuk-link--no-underline">
+                                {t("home:casesearch-card-advanced-link")}
+                            </a>
                         </Link>
                     </div>
                 </form>
diff --git a/components/homepage/dns.js b/components/homepage/dns.js
index f6a5130e..cd8fd796 100644
--- a/components/homepage/dns.js
+++ b/components/homepage/dns.js
@@ -36,7 +36,7 @@ export default function Dns() {
                         }
                     >
                         <a
-                            className="govuk-button"
+                            className="govuk-button withChevron govuk-button-cta"
                             onClick={() => {
                                 spinnerState();
                             }}
diff --git a/components/homepage/login.js b/components/homepage/login.js
index 5f08265e..3daef51a 100644
--- a/components/homepage/login.js
+++ b/components/homepage/login.js
@@ -205,12 +205,16 @@ let Login = (props) => {
                                         : "/account/register"
                                 }
                             >
-                                <a>{t("home:login-card-register-link")}</a>
+                                <a className="govuk-link--no-underline">
+                                    {t("home:login-card-register-link")}
+                                </a>
                             </Link>
                         </p>
                         <p className="govuk-body-s">
                             <Link href="/">
-                                <a>{t("home:login-card-forgotten-label")} </a>
+                                <a className="govuk-link--no-underline">
+                                    {t("home:login-card-forgotten-label")}{" "}
+                                </a>
                             </Link>
                         </p>
                     </div>
diff --git a/components/homepage/loginSoon.js b/components/homepage/loginSoon.js
index dae15dbf..fc3c83fc 100644
--- a/components/homepage/loginSoon.js
+++ b/components/homepage/loginSoon.js
@@ -24,6 +24,7 @@ export default function LoginSoon() {
                     <ul>
                         <li>
                             <a
+                                className="govuk-link--no-underline"
                                 target="_blank"
                                 href={t("home:login-comingsoon-forms-link-1")}
                                 rel="noreferrer"
@@ -34,6 +35,7 @@ export default function LoginSoon() {
                         <li>
                             {" "}
                             <a
+                                className="govuk-link--no-underline"
                                 target="_blank"
                                 href={t("home:login-comingsoon-forms-link-2")}
                                 rel="noreferrer"
@@ -44,6 +46,7 @@ export default function LoginSoon() {
                         <li>
                             {" "}
                             <a
+                                className="govuk-link--no-underline"
                                 target="_blank"
                                 href={t("home:login-comingsoon-forms-link-3")}
                                 rel="noreferrer"
@@ -54,6 +57,7 @@ export default function LoginSoon() {
                         <li>
                             {" "}
                             <a
+                                className="govuk-link--no-underline"
                                 target="_blank"
                                 href={t("home:login-comingsoon-forms-link-4")}
                                 rel="noreferrer"
@@ -66,7 +70,10 @@ export default function LoginSoon() {
 
                     <p className="govuk-body-s">
                         {t("home:login-comingsoon-email-link-label")}{" "}
-                        <a href={"mailto:" + t("home:login-contact-email")}>
+                        <a
+                            href={"mailto:" + t("home:login-contact-email")}
+                            className="govuk-link--no-underline"
+                        >
                             {t("home:login-contact-email")}
                         </a>
                     </p>
diff --git a/components/main.js b/components/main.js
index 0e6f53dd..50a6c56f 100644
--- a/components/main.js
+++ b/components/main.js
@@ -28,8 +28,8 @@ export default function Home({ children, pages }) {
                         <CaseSearch />
                         <CaseComment />
                         <Dns />
-                        <Login />
-                        {/*} <Inspectorate /> */}
+                        {/*   <Login />
+                        <Inspectorate /> */}
                     </div>
                 </div>
             </div>
diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js
index 3d330650..fcf5a6d6 100644
--- a/components/search/dnssearchresults.js
+++ b/components/search/dnssearchresults.js
@@ -273,7 +273,6 @@ const DNSSearchResults = (props) => {
             <div className="govuk-grid-row">
                 <div className="govuk-grid-column-two-thirds">
                     <h1 className="govuk-heading-l">
-                        {t("dnsCommon:service-name")}{" "}
                         {t("dnsApplications:page-title")}
                     </h1>
                     <p className="govuk-body">
diff --git a/data/crmfieldlookuptranslations.json b/data/crmfieldlookuptranslations.json
index 2a1f558e..5b7d6393 100644
--- a/data/crmfieldlookuptranslations.json
+++ b/data/crmfieldlookuptranslations.json
@@ -62,7 +62,7 @@
         },
         {
             "value": "DNS",
-            "value_cy": "Datblygiadau o Arwyddocâd Cenedlaethol",
+            "value_cy": "Datblygiad o Arwyddocâd Cenedlaethol",
             "stringmapid": "bc56f05c-7f90-eb11-aac2-00224800be9c",
             "attributevalue": 846040011
         },
diff --git a/data/lookuptranslations.json b/data/lookuptranslations.json
index b6d89830..ae4c01a0 100644
--- a/data/lookuptranslations.json
+++ b/data/lookuptranslations.json
@@ -62,7 +62,7 @@
         },
         {
             "value": "DNS",
-            "value_cy": "Datblygiadau o Arwyddocâd Cenedlaethol",
+            "value_cy": "Datblygiad o Arwyddocâd Cenedlaethol",
             "stringmapid": "bc56f05c-7f90-eb11-aac2-00224800be9c",
             "attributevalue": 846040011
         },
@@ -343,7 +343,7 @@
         },
         {
             "value": "Developments of National Significance",
-            "value_cy": "Datblygiadau o Arwyddocâd Cenedlaethol",
+            "value_cy": "Datblygiad o Arwyddocâd Cenedlaethol",
             "pinswg_lpa": 0
         }
     ],
@@ -355,7 +355,7 @@
         },
         {
             "value": "Hearing",
-            "value_cy": "Clyw",
+            "value_cy": "Gwrandawiad",
             "pinswg_procedure": 0
         },
         {
@@ -367,37 +367,37 @@
     "pinswg_isharedocumentlocations": [
         {
             "value": "Main Party - Pre-Submission Docs",
-            "value_cy": "Prif Blaid - Dociau Cyn Cyflwyno",
+            "value_cy": "Prif Barti - Dogfennau Cyn Cyflwyno",
             "pinswg_isharedocumentlocations": 0
         },
         {
             "value": "Main Party - Submission Document",
-            "value_cy": "Prif Blaid - Dogfen Gyflwyno",
+            "value_cy": "Prif Barti - Dogfen Gyflwyno",
             "pinswg_isharedocumentlocations": 0
         },
         {
             "value": "Main Party - Questionnaire",
-            "value_cy": "Prif Blaid - Holiadur",
+            "value_cy": "Prif Barti - Holiadur",
             "pinswg_isharedocumentlocations": 0
         },
         {
             "value": "Main Party - Statements",
-            "value_cy": "Prif Blaid - Datganiadau",
+            "value_cy": "Prif Barti - Datganiadau",
             "pinswg_isharedocumentlocations": 0
         },
         {
             "value": "Main Party - Comments",
-            "value_cy": "Prif Blaid - Sylwadau",
+            "value_cy": "Prif Barti - Sylwadau",
             "pinswg_isharedocumentlocations": 0
         },
         {
             "value": "Main Party - Written Statements of Evidence",
-            "value_cy": "Prif Blaid - Datganiadau Tystiolaeth Ysgrifenedig",
+            "value_cy": "Prif Barti - Datganiadau Tystiolaeth Ysgrifenedig",
             "pinswg_isharedocumentlocations": 0
         },
         {
             "value": "Main Party - Environmental Statements",
-            "value_cy": "Prif Blaid - Datganiadau Amgylcheddol",
+            "value_cy": "Prif Barti - Datganiadau Amgylcheddol",
             "pinswg_isharedocumentlocations": 0
         },
         {
diff --git a/i18n.js b/i18n.js
new file mode 100644
index 00000000..26082685
--- /dev/null
+++ b/i18n.js
@@ -0,0 +1,37 @@
+module.exports = {
+    "locales": ["en", "cy"],
+    "defaultLocale": "en",
+    "domains": [
+        {
+            "domain": process.env.I18N_DOMAIN,
+            "defaultLocale": "cy",
+            "locales": ["cy"],
+        },
+    ],
+    "pages": {
+        "*": ["common", "newappeal"],
+        "/": ["common", "home"],
+        "/myportal": ["myportal"],
+        "/myportal/viewall": ["search"],
+        "/myportal/advancedsearch": ["search"],
+        "/myportal/searchresults": ["search"],
+        "/myportal/case": ["case"],
+        "/advancedsearch": ["search"],
+        "/advancedsearchresults": ["search"],
+        "/searchresults": ["search"],
+        "/viewall": ["search"],
+        "/case": ["case"],
+        "/representation": ["case"],
+        "/newappeal": ["newappeal"],
+        "/newappeal/*": ["newappeal"],
+        "/newappeal/selectappeal": ["newappeal"],
+        "/dns/*": ["dnsCommon"],
+        "/dns": ["dnsCommon", "dnsHome"],
+        "/dns/applications": ["dnsCommon", "dnsApplications"],
+        "/dns/application-view": ["dnsCommon", "dnsApplicationView"],
+        "/dnsapplications": ["search", "dnsCommon", "dnsApplications"],
+        "/dnsdetails": ["case", "search", "dnsCommon", "dnsApplications"],
+        "/help/cookies": ["common", "cookies"],
+        "/account/register": ["common", "account"],
+    },
+};
diff --git a/i18n.json b/i18n.json
deleted file mode 100644
index 338ed833..00000000
--- a/i18n.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-   "locales": [
-      "en",
-      "cy"
-   ],
-   "defaultLocale": "en",
-   "domains": [
-      {
-         "domain": "dev-gwaithcynllunio.gwasanaeth.llyw.cymru",
-         "defaultLocale": "cy"
-      }
-   ],
-   "pages": {
-      "*": [
-         "common",
-         "newappeal"
-      ],
-      "/": [
-         "common",
-         "home"
-      ],
-      "/myportal": [
-         "myportal"
-      ],
-      "/myportal/viewall": [
-         "search"
-      ],
-      "/myportal/advancedsearch": [
-         "search"
-      ],
-      "/myportal/searchresults": [
-         "search"
-      ],
-      "/myportal/case": [
-         "case"
-      ],
-      "/advancedsearch": [
-         "search"
-      ],
-      "/advancedsearchresults": [
-         "search"
-      ],
-      "/searchresults": [
-         "search"
-      ],
-      "/viewall": [
-         "search"
-      ],
-      "/case": [
-         "case"
-      ],
-      "/representation": [
-         "case"
-      ],
-      "/newappeal": [
-         "newappeal"
-      ],
-      "/newappeal/*": [
-         "newappeal"
-      ],
-      "/newappeal/selectappeal": [
-         "newappeal"
-      ],
-      "/dns/*": [
-         "dnsCommon"
-      ],
-      "/dns": [
-         "dnsCommon",
-         "dnsHome"
-      ],
-      "/dns/applications": [
-         "dnsCommon",
-         "dnsApplications"
-      ],
-      "/dns/application-view": [
-         "dnsCommon",
-         "dnsApplicationView"
-      ],
-      "/dnsapplications": [
-         "search",
-         "dnsCommon",
-         "dnsApplications"
-      ],
-      "/dnsdetails": [
-         "case",
-         "search",
-         "dnsCommon",
-         "dnsApplications"
-      ],
-      "/help/cookies": [
-         "common",
-         "cookies"
-      ]
-   }
-}
\ No newline at end of file
diff --git a/locales/cy/account.json b/locales/cy/account.json
new file mode 100644
index 00000000..ca0bd367
--- /dev/null
+++ b/locales/cy/account.json
@@ -0,0 +1,41 @@
+{
+    "register-new-account-heading": "Creu cyfrif newydd",
+    "register-new-account-status-created-label": "Nid yw'ch cyfrif wedi creu",
+    "register-new-account-status-not-created-label": "Mae eich cyfrif wedi'i greu",
+    "register-new-account-checking-label": "Gwirio am gyfrif...",
+    "help-heading": "Help",
+    "help-sub-heading-1": "Cwmnïau neu gyflwyniadau gan fwy nag un unigolyn (grwpiau)",
+    "help-paragraph-1": "Os ydych chi'n cyflwyno apêl neu gynrychiolaeth gan gwmni e.e. \"Acme Inc\" neu agroup o bobl e.e. \"Trigolion 1-10 Stryd Fawr\", dylech nodi enw'r cwmni neu'r grŵp ym maes y Cwmni / Grŵp. Fe'ch ystyrir yn gweithredu fel eu cynrychiolydd.",
+    "help-sub-heading-2": "Apeliadau gorfodi gan gyplau priod / partneriaeth sifil",
+    "help-paragraph-2": "Ni ddylech nodi enw grŵp. Dim ond fel apelydd ychwanegol y mae angen i chi nodi enw'ch partner ar y ffurflen apelio ei hun.",
+    "help-sub-heading-3": "Apeliadau eraill gan gyplau priod / partneriaeth sifil",
+    "help-paragraph-3": "Ar gyfer unrhyw fath arall o apêl, er enghraifft apêl gynllunio, dylech nodi enw grŵp wrth greu eich cyfrif e.e. \"Mr a Mrs Smith \", os dyna'r enw ar y cais.",
+    "register-new-account-sub-heading-1": "Amdanat ti",
+    "register-new-account-first-name-label": "Enw cyntaf",
+    "register-new-account-first-name-label-errormsg": "Yn ofynnol",
+    "register-new-account-last-name-label": "Enw olaf",
+    "register-new-account-last-name-label-errormsg": "Yn ofynnol",
+    "register-new-account-email-address-label": "Cyfeiriad ebost",
+    "register-new-account-email-address-label-errormsg": "Rhowch gyfeiriad e-bost dilys",
+    "register-new-account-phone-label": "Ffôn",
+    "register-new-account-password-label": "Cyfrinair",
+    "register-new-account-password-label-errormsg": "Yn ofynnol",
+    "register-new-account-confirm-password-label": "Cadarnhau cyfrinair",
+    "register-new-account-confirm-password-label-errormsg": "Rhaid i gyfrineiriau gyfateb",
+    "register-new-account-sub-heading-2": "Beth yw eich cyfeiriad?",
+    "register-new-account-address-line-1-label": "Llinell Cyfeiriad 1",
+    "register-new-account-address-line-1-label-errormsg": "Yn ofynnol",
+    "register-new-account-address-line-2-label": "Llinell Cyfeiriad 2",
+    "register-new-account-town-label": "Tref/Dinas",
+    "register-new-account-town-label-errormsg": "Yn ofynnol",
+    "register-new-account-county-label": "Sir",
+    "register-new-account-county-label-errormsg": "Yn ofynnol",
+    "register-new-account-postcode-label": "Cod post",
+    "register-new-account-postcode-label-errormsg": "Yn ofynnol",
+    "register-new-account-check-details-paragraph": "Gwiriwch fod y manylion a nodoch yn gywir.",
+    "register-new-account-confirmation-email": "Rydym wedi anfon e-bost cadarnhau atoch.",
+    "register-new-account-sub-heading-what-next": "Beth sy'n digwydd nesaf",
+    "register-new-account-paragraph-what-next": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a metus non quam mollis egestas. Integer ac leo cursus, laoreet nulla sed, tempus tellus. Mauris condimentum erat arcu.",
+    "register-new-account-my-portal-link": "Mewngofnodi i'm Porth",
+    "register-new-account-account-failed": "Rhowch gynnig arall arni gyda chyfeiriad e-bost gwahanol"
+}
\ No newline at end of file
diff --git a/locales/cy/case.json b/locales/cy/case.json
index 4d0e8417..a5d6e3a7 100644
--- a/locales/cy/case.json
+++ b/locales/cy/case.json
@@ -23,7 +23,7 @@
     "summary-no-date-entered-label": "dim dyddiad wedi'i nodi",
     "summary-start-date-label": "Dyddiad Dechrau",
     "summary-questionnaire-due-date-label": "Holiadur i ddod",
-    "summary-statement-due-date-label": "Datganiad (au) i ddod",
+    "summary-statement-due-date-label": "Datganiad(au) i ddod",
     "summary-interested-party-date-label": "Sylwadau Parti â Buddiant i ddod",
     "summary-applicant-final-comments-date-label": "Sylwadau Terfynol yr Apelydd/ACLl i ddod",
     "summary-inquiry-evidence-date-label": "Tystiolaeth yr Ymchwiliad i ddod",
@@ -31,8 +31,8 @@
     "summary-decision-date-label": "Dyddiad y Penderfyniad",
     "summary-documents-button-label": "Dogfennau",
     "documents-document-count-label": "Dogfennau",
-    "documents-name-label": "Math y Ddogfen",
-    "documents-doc-type-label": "Math y Ddogfen",
+    "documents-name-label": "Enw",
+    "documents-doc-type-label": "Math o Ddogfen",
     "documents-date-published-label": "Dyddiad cyhoeddi",
     "documents-size-label": "Maint y ffeil (kb)",
     "documents-non-available-label": "Nid oes unrhyw ddogfennau ar gyfer yr apêl hon",
diff --git a/locales/cy/common.json b/locales/cy/common.json
index 300b7b74..6f0eadbf 100644
--- a/locales/cy/common.json
+++ b/locales/cy/common.json
@@ -4,7 +4,7 @@
   "gov-wales-link": "https://llyw.cymru",
   "gov-wales-label": "LLYW.CYMRU",
   "service-description": "Mae'r gwasanaeth hwn yn cael ei ddatblygu i gefnogi apeliadau a cheisiadau ar-lein.",
-  "service-name": "Cynllunio gwaith achos",
+  "service-name": "Gwaith achos cynllunio",
   "service-name-breadcrumb": "Hafan",
   "new-service-beta": "Mae hwn yn wasanaeth newydd",
   "breadcrumb-back-link": "Yn ôl",
@@ -15,17 +15,24 @@
   "continue-button": "Parhewch",
   "search-button": "Chwilio",
   "submit-and-start": "Cyflwyno a dechrau'r cwrs",
-  "footer-terms-conditions-link": "Telerau ac amodau",
-  "footer-privacy-link": "Rhybudd Preifatrwydd",
-  "footer-cookies-link": "Chwcis",
-  "footer-accessibility-link": "Hygyrchedd",
+  "footer-terms-conditions-link-label": "Telerau ac amodau",
+  "footer-terms-conditions-link": "https://llyw.cymru/telerau-ac-amodau",
+  "footer-privacy-link-label": "Preifatrwydd",
+  "footer-privacy-link": "https://llyw.cymru/help/polisi-preifatrwydd-wefan",
+  "footer-cookies-link": "Cwcis",
+  "footer-accessibility-link-label": "Hygyrchedd",
+  "footer-accessibility-link": "https://llyw.cymru/datganiad-hygyrchedd-llywcymru",
   "footer-feedback-link": "Adborth",
-  "footer-copyright-link": "Datganiad hawlfraint",
-  "footer-alternative-languages-link": "Ieithoedd amgen",
-  "footer-guidance-link-label": "Canllawiau a gwasanaethau Cynllunio ac Amgylchedd Cymru",
+  "footer-contact-us-link-label": "Cysylltu â ni",
+  "footer-contact-us-link": "https://llyw.cymru/cysylltu-ni",
+  "footer-copyright-link-label": "Datganiad hawlfraint",
+  "footer-copyright-link": "https://llyw.cymru/datganiad-hawlfraint",
+  "footer-alternative-languages-link-label": "Ieithoedd amgen",
+  "footer-alternative-languages-link": "https://llyw.cymru/ieithoedd-amgen",
+  "footer-guidance-link-label": "Canllawiau a gwasanaethau Penderfyniadau Cynllunio ac Amgylchedd Cymru",
   "footer-guidance-link": "https://gov.wales/planning-and-environment-decisions-wales/guidance-services",
   "mobile-nav-label": "Dewislen",
-  "signout-label": "Cofrestrwch allan",
+  "signout-label": "Allgofnodwch",
   "back-to-top-link": "Nôl i dop y dudalen",
   "social-bar-share-link": "Rhannu’r dudalen hon",
   "social-bar-share-via-link": "Rhannu’r dudalen hon ar",
@@ -56,5 +63,6 @@
   "previous-link-button": "Blaenorol",
   "next-link-button": "Nesaf",
   "pages-label": "Tudalen",
-  "of-label": "o"
+  "of-label": "o",
+  "change-link-label": "Newid"
 }
\ No newline at end of file
diff --git a/locales/cy/cookies.json b/locales/cy/cookies.json
index b97a611f..4b660a4e 100644
--- a/locales/cy/cookies.json
+++ b/locales/cy/cookies.json
@@ -7,22 +7,22 @@
   "cookie-intro-paragraph-2": "Rydym yn defnyddio cwcis i storio gwybodaeth ynghylch sut yr ydych yn defnyddio gwefan LLYW.CYMRU, megis y tudalennau yr ydych yn ymweld â nhw. Nid yw'r cwcis hyn yn cael eu defnyddio i'ch adnabod chi'n bersonol.",
   "cookie-intro-paragraph-3": "Rydym yn defnyddio 4 cwci gwahanol. Gallwch ddewis pa fath o gwcis rydych yn hapus i ni eu defnyddio.",
   "cookie-settings-heading": "Gosodiadau cwcis",
-  "cookie-settings-usage-heading": "Cwcis sy'n mesur defnydd y wefan",
-  "cookie-settings-usage-paragraph-1": "Rydym yn defnyddio Google Analytics i fesur sut ydych yn defnyddio'r wefan er mwyn i ni ei wella yn seiliedig ar angen defnyddwyr. Mae Google Analytics yn gosod cwcis sy'n storio gwybodaeth wedi anonymeiddio ynghylch:",
-  "cookie-settings-usage-list-item-1": "sut ddaethoch chi i'r safle",
+  "cookie-settings-usage-heading": "Cwcis sy'n mesur defnydd o'r wefan",
+  "cookie-settings-usage-paragraph-1": "Rydym yn defnyddio Google Analytics i fesur sut rydych yn defnyddio’r wefan er mwyn i ni ei gwella yn seiliedig ar anghenion defnyddwyr. Mae Google Analytics yn gosod cwcis sy’n storio gwybodaeth wedi’i hanonymeiddio ynghylch:",
+  "cookie-settings-usage-list-item-1": "sut daethoch chi i’r safle",
   "cookie-settings-usage-list-item-2": "y tudalennau yr ydych yn ymweld â nhw ar LLYW.CYMRU a gwasanaethau digidol y llywodraeth, a pha mor hir yr ydych chi'n treulio ar bob tudalen",
   "cookie-settings-usage-list-item-3": "beth ydych chi'n clicio arno wrth ymweld â'r safle",
   "cookie-settings-usage-list-item-4": "Nid ydym yn caniatâu i Google ddefnyddio na rhannu'r data ynghylch sut yr ydych yn defnyddio'r safle.",
   "cookie-settings-usage-radio-1-label": "Peidiwch â defnyddio cwcis sy'n mesur fy nefnydd o'r wefan",
-  "cookie-settings-usage-radio-2-label": "Defnyddiwch cwcis sy'n mesur fy nefnydd o'r wefan",
+  "cookie-settings-usage-radio-2-label": "Defnyddiwch gwcis sy’n mesur fy nefnydd o’r wefan",
   "cookie-settings-communications-heading": "Cwcis sy'n helpu gyda chyfathrebu a marchnata",
   "cookie-settings-communications-paragraph-1": "Gall y cwcis hyn gael eu gosod gan wefannau trydydd parti a gwneud pethau fel mesur sut rydych yn gwylio fideos YouTube ar LLYW.CYMRU.",
   "cookie-settings-communications-radio-1-label": "Peidiwch â defnyddio cwcis sy'n helpu gyda chyfathrebu a marchnata",
-  "cookie-settings-communications-radio-2-label": "Defnyddiwch cwcis sy'n cofio fy ngosodiadau ar y safle",
+  "cookie-settings-communications-radio-2-label": "Defnyddiwch gwcis sy’n helpu gyda chyfathrebu a marchnata",
   "cookie-settings-settings-heading": "Cwcis sy'n cofio'ch gosodiadau",
-  "cookie-settings-settings-paragraph-1": "Mae'r cwcis hyn yn gwneud pethau fel cofio eich dewisiadau, i bersonol eich profiad o ddefnyddio'r safle.",
+  "cookie-settings-settings-paragraph-1": "Mae’r cwcis hyn yn gwneud pethau fel cofio eich dewisiadau, i bersonoli eich profiad o ddefnyddio’r safle.",
   "cookie-settings-settings-radio-1-label": "Peidiwch â defnyddio cwcis sy'n cofio fy ngosodiadau ar y safle",
-  "cookie-settings-settings-radio-2-label": "Defnyddiwch cwcis sy'n cofio fy ngosodiadau ar y safle",
+  "cookie-settings-settings-radio-2-label": "Defnyddiwch gwcis sy'n cofio fy ngosodiadau ar y safle",
   "cookie-settings-essential-heading": "Cwcis sy'n angenrheidiol",
   "cookie-settings-essential-paragraph-1": "Mae'r cwcis hyn yn hanfodol ar gyfer pethau fel:",
   "cookie-settings-essential-list-item-1": "cofio'r hysbysiadau yr ydych wedi eu gweld fel ein bod ni ddim yn eu dangos i chi eto",
diff --git a/locales/cy/dnsApplications.json b/locales/cy/dnsApplications.json
index 519ff63b..95906cd1 100644
--- a/locales/cy/dnsApplications.json
+++ b/locales/cy/dnsApplications.json
@@ -1,7 +1,7 @@
 {
-    "page-title": "Tudalen Ceisiadau",
+    "page-title": "Ceisiadau Datblygiadau o Arwyddocâd Cenedlaethol",
     "page-intro-paragraph-1": "Y ceisiadau a restrir yw’r rhai:",
-    "page-intro-list-item-1": "Lle mae’r datblygwr wedi hysbysu’r Arolygiaeth Gynllunio yn ysgrifenedig eu bod yn bwriadu cyflwyno cais i ni yn y dyfodol",
+    "page-intro-list-item-1": "Lle mae’r datblygwr wedi hysbysu’r Arolygiaeth Gynllunio yn ysgrifenedig ei fod yn bwriadu cyflwyno cais i ni yn y dyfodol",
     "page-intro-list-item-2": "Lle cafodd cais ei wneud eisoes i’r Arolygiaeth Gynllunio ac mae’n mynd drwy’r broses archwilio",
     "page-intro-list-item-3": "Lle penderfynwyd ar y cynnig.",
     "page-intro-paragraph-2": "Defnyddiwch y tabl isod i ddod o hyd i geisiadau fesul cam neu fath. Fel arall, defnyddiwch y map trwy glicio ar y marcwyr i fynd i’r dudalen geisiadau. Mae rhestr o ddigwyddiadau a therfynau amser allweddol ar gyfer pob cais ar gael ar ein ",
diff --git a/locales/cy/home.json b/locales/cy/home.json
index a4123a6c..a73c668c 100644
--- a/locales/cy/home.json
+++ b/locales/cy/home.json
@@ -1,15 +1,15 @@
 {
     "login-card-title-temp": "Apeliadau neu geisiadau newydd",
     "login-comingsoon-temp-1": "Mae'r gwasanaeth hwn yn cael ei ddatblygu i gefnogi apeliadau a cheisiadau ar-lein.",
-    "login-comingsoon-temp-2": "Wrth i ni ddatblygu darganfyddiad y gwasanaeth ar-lein:",
+    "login-comingsoon-temp-2": "Wrth i ni ddatblygu’r gwasanaeth ar-lein, dewch o hyd i:",
     "login-comingsoon-forms-link-1": "https://llyw.cymru/ffurflenni-apelio",
-    "login-comingsoon-forms-label-1": "apêl cynllunio a ffurflenni cais",
+    "login-comingsoon-forms-label-1": "ffurflenni apêl cynllunio a ffurflenni cais cynllunio",
     "login-comingsoon-forms-link-2": "https://llyw.cymru/trwyddedau-amgylcheddol",
     "login-comingsoon-forms-label-2": "ffurflenni apêl trwydded amgylcheddol",
     "login-comingsoon-forms-link-3": "https://llyw.cymru/tir-comin",
     "login-comingsoon-forms-label-3": "cyflawni gwaith ar dir comin",
     "login-comingsoon-forms-link-4": "https://llyw.cymru/datblygiadau-o-arwyddocad-cenedlaethol-dns-ffurflenni",
-    "login-comingsoon-forms-label-4": "Datblygiadau ffurflenni Arwyddocâd Cenedlaethol",
+    "login-comingsoon-forms-label-4": "Ffurflenni Datblygiadau o Arwyddocâd Cenedlaethol ",
     "login-comingsoon-email-link-label": "Gallwch hefyd ofyn am ffurflenni trwy e-bost",
     "login-contact-email": "pedw.gwaithachos@llyw.cymru",
     "login-card-title": "Mewngofnodi i apelio yn erbyn penderfyniad cynllunio",
@@ -26,12 +26,12 @@
     "casesearch-card-search-example-label-1": "APP-A12345-A-21-1234567",
     "casesearch-card-search-example-label-2": "CAS-12345-A1B2C3",
     "casesearch-card-button": "Cyflwyno chwiliad",
-    "casesearch-card-advanced-link": "Fel arall, gallwch chwilio gan ddefnyddio ein meini prawf eraill gyda'n chwiliad uwch",
+    "casesearch-card-advanced-link": "Chwiliad uwch",
     "casesearch-search-validation-required": "Angenrheidiol",
     "casesearch-search-validation-minlength": "Rhaid bod yn 4 nod neu fwy",
     "casescomment-card-title": "Rhowch sylwadau ar apêl",
     "casescomment-card-paragraph-one": "Rhowch sylwadau ar apêl trwy e-bostio ",
-    "casescomment-card-paragraph-two": "Ar gyfer apeliadau deiliaid tai a masnachol, ni all partïon â diddordeb wneud sylwadau yn y cam apelio. Bydd unrhyw sylwadau a wneir yn ystod y cam ymgeisio yn cael eu darparu gan yr awdurdod cynllunio lleol a'u hystyried gan yr arolygydd.",
+    "casescomment-card-paragraph-two": "Ar gyfer apeliadau deiliaid tai a masnachol, ni all partïon â buddiant wneud sylwadau yn ystod y cam apelio. Bydd unrhyw sylwadau a wneir yn ystod y cam ymgeisio yn cael eu darparu gan yr awdurdod cynllunio lleol a'u hystyried gan yr arolygydd.",
     "inspectorate-card-visit-label": "Ymweld Yr Arolygiaeth Gynllunio",
     "inspectorate-card-visit-link": "Hafan",
     "inspectorate-card-alt-text": "Yr Arolygiaeth Gynllunio",
diff --git a/locales/cy/myportal.json b/locales/cy/myportal.json
index ca6f62e1..82a52085 100644
--- a/locales/cy/myportal.json
+++ b/locales/cy/myportal.json
@@ -11,7 +11,7 @@
     "searchcases-card-search-hint": "Chwiliwch drwy roi cyfeirnod 7 digid yr achos",
     "searchcases-card-search-example-label": "Enghraifft:",
     "searchcases-card-button": "Cyflwyno Chwiliad",
-    "searchcases-card-advanced-link": "Fel arall, gallwch chwilio gan ddefnyddio ein meini prawf eraill gyda'n chwiliad uwch",
+    "searchcases-card-advanced-link": "Chwiliad uwch",
     "searchcases-validation-required": "Angenrheidiol",
     "searchcases-validation-minlength": "Rhaid bod yn 4 nod neu fwy",
     "awatitingsubmission-card-title": "Eto i’w gyflwyno",
diff --git a/locales/cy/search.json b/locales/cy/search.json
index 67dd43c1..1f10fefb 100644
--- a/locales/cy/search.json
+++ b/locales/cy/search.json
@@ -1,7 +1,7 @@
 {
-    "page-title": "Crynodeb o’r Achos ar gyfer",
-    "search-title-label": "Crynodeb o’r Achos ar gyfer",
-    "casereference-label": "Cyfeirnod yr Achos (7 digid olaf)",
+    "page-title": "Chwilio am achos",
+    "search-title-label": "Chwilio am achos",
+    "casereference-label": "Cyfeirnod yr achos",
     "sitelocation-legend": "Lleoliad y Safle",
     "address-line-one-label": "Llinell gyntaf y cyfeiriad",
     "town-label": "Tref/Dinas (agosaf)",
@@ -46,7 +46,7 @@
     "search-button-label": "Chwilio",
     "clear-button-label": "Cliriwch",
     "clear-all-button-label": "Clirio Pob Un",
-    "searchresults-title-label": "Crynodeb o’r Achos ar gyfer",
+    "searchresults-title-label": "Chwilio am achos",
     "searchresults-count-label": "Cafodd eich chwiliad {{count}} o ganlyniadau",
     "searchresults-max-count-label": "Dychwelodd eich chwiliad fwy na 200 o ganlyniadau. Mireiniwch eich chwiliad. Mae'r 200 achos diweddaraf yn cael eu harddangos",
     "searchresults-case-reference-label": "Cyfeirnod yr Achos",
diff --git a/locales/en/account.json b/locales/en/account.json
new file mode 100644
index 00000000..d5b11a32
--- /dev/null
+++ b/locales/en/account.json
@@ -0,0 +1,41 @@
+{
+    "register-new-account-heading": "Create a new account",
+    "register-new-account-status-created-label": "Your account has not created",
+    "register-new-account-status-not-created-label": "Your account has been created",
+    "register-new-account-checking-label": "Checking for account...",
+    "help-heading": "Help",
+    "help-sub-heading-1": "Companies or submissions by more than one individual (groups)",
+    "help-paragraph-1": "If you are submitting an appeal or representation from a company e.g. \"Acme Inc\" or agroup of people e.g. \"Residents of 1-10 High street\", you should enter the name of the company or group in the Company/Group field. You will be deemed as acting as their representative.",
+    "help-sub-heading-2": "Enforcement appeals by married/civil partnership couples",
+    "help-paragraph-2": "You should not enter a group name. You need only enter your partner's name on the appeal form itself as an additional appellant.",
+    "help-sub-heading-3": "Other appeals by married/civil partnership couples",
+    "help-paragraph-3": "For any other type of appeal, for example a planning appeal, you should enter a group name when creating your account e.g. \"Mr and Mrs Smith\", if that is the name on the application.",
+    "register-new-account-sub-heading-1": "About you",
+    "register-new-account-first-name-label": "First name",
+    "register-new-account-first-name-label-errormsg": "Is required",
+    "register-new-account-last-name-label": "Last name",
+    "register-new-account-last-name-label-errormsg": "Is required",
+    "register-new-account-email-address-label": "Email address",
+    "register-new-account-email-address-label-errormsg": "Enter a valid email address",
+    "register-new-account-phone-label": "Telephone",
+    "register-new-account-password-label": "Password",
+    "register-new-account-password-label-errormsg": "Password",
+    "register-new-account-confirm-password-label": "Confirm password",
+    "register-new-account-confirm-password-label-errormsg": "Passwords must match",
+    "register-new-account-sub-heading-2": "What is your address?",
+    "register-new-account-address-line-1-label": "Address line 1",
+    "register-new-account-address-line-1-label-errormsg": "Is required",
+    "register-new-account-address-line-2-label": "Address line 2",
+    "register-new-account-town-label": "Town/City",
+    "register-new-account-town-label-errormsg": "Is required",
+    "register-new-account-county-label": "County",
+    "register-new-account-county-label-errormsg": "Is required",
+    "register-new-account-postcode-label": "Postcode",
+    "register-new-account-postcode-label-errormsg": "Is required",
+    "register-new-account-check-details-paragraph": "Check that the details you entered are correct.",
+    "register-new-account-confirmation-email": "We have sent you a confirmation email.",
+    "register-new-account-sub-heading-what-next": "What happens next",
+    "register-new-account-paragraph-what-next": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a metus non quam mollis egestas. Integer ac leo cursus, laoreet nulla sed, tempus tellus. Mauris condimentum erat arcu.",
+    "register-new-account-my-portal-link": "Login to My Portal",
+    "register-new-account-account-failed": "Please try again with a different email address"
+}
\ No newline at end of file
diff --git a/locales/en/common.json b/locales/en/common.json
index f5abfe1c..bdb8add6 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -15,13 +15,20 @@
   "continue-button": "Continue",
   "search-button": "Search",
   "submit-and-start": "Submit and start course",
-  "footer-terms-conditions-link": "Terms and conditions",
-  "footer-privacy-link": "Privacy",
+  "footer-terms-conditions-link-label": "Terms and conditions",
+  "footer-terms-conditions-link": "https://gov.wales/terms-and-conditions",
+  "footer-privacy-link-label": "Privacy",
+  "footer-privacy-link": "https://gov.wales/website-privacy-policy",
   "footer-cookies-link": "Cookies",
-  "footer-accessibility-link": "Accessibility",
+  "footer-accessibility-link-label": "Accessibility",
+  "footer-accessibility-link": "https://gov.wales/accessibility-statement-govwales",
   "footer-feedback-link": "Give feedback about this page",
-  "footer-copyright-link": "Copyright statement",
-  "footer-alternative-languages-link": "Alternative languages",
+  "footer-contact-us-link-label": "Contact us",
+  "footer-contact-us-link": "https://gov.wales/contact-us",
+  "footer-copyright-link-label": "Copyright statement",
+  "footer-copyright-link": "https://gov.wales/copyright-statement",
+  "footer-alternative-languages-link-label": "Alternative languages",
+  "footer-alternative-languages-link": "https://gov.wales/alternative-languages",
   "footer-guidance-link-label": "Planning and Environment Decisions Wales’ guidance and services",
   "footer-guidance-link": "https://gov.wales/planning-and-environment-decisions-wales/guidance-services",
   "mobile-nav-label": "Menu",
@@ -56,5 +63,6 @@
   "previous-link-button": "Previous",
   "next-link-button": "Next",
   "pages-label": "Page",
-  "of-label": "of"
+  "of-label": "of",
+  "change-link-label": "Change"
 }
\ No newline at end of file
diff --git a/locales/en/dnsApplications.json b/locales/en/dnsApplications.json
index 57527e82..94e7182b 100644
--- a/locales/en/dnsApplications.json
+++ b/locales/en/dnsApplications.json
@@ -1,5 +1,5 @@
 {
-    "page-title": "Applications",
+    "page-title": "Developments of National Significance Applications",
     "page-intro-paragraph-1": "The applications listed are those:",
     "page-intro-list-item-1": "Where the developer has advised the Planning Inspectorate in writing that they intend to submit an application to us in the future",
     "page-intro-list-item-2": "Where an application has already been made to the Planning Inspectorate and is undergoing the examination process",
diff --git a/locales/en/search.json b/locales/en/search.json
index 8f2ecaa5..9187ae51 100644
--- a/locales/en/search.json
+++ b/locales/en/search.json
@@ -1,7 +1,7 @@
 {
     "page-title": "Search for a case",
     "search-title-label": "Search for a case",
-    "casereference-label": "Case reference (last 7 digits)",
+    "casereference-label": "Case reference",
     "sitelocation-legend": "Site location",
     "address-line-one-label": "First line of address",
     "town-label": "Town/City (nearest)",
diff --git a/next.config.js b/next.config.js
index 2b37f394..687dbf46 100644
--- a/next.config.js
+++ b/next.config.js
@@ -77,6 +77,10 @@ module.exports = {
                 source: "/cyfrif/cofrestr",
                 destination: "/account/register",
             },
+            {
+                source: "/help/cwcis",
+                destination: "/help/cookies",
+            },
 
             // {
             //     source: "/cy:path*",
diff --git a/pages/_document.js b/pages/_document.js
index 737cc980..1415e727 100644
--- a/pages/_document.js
+++ b/pages/_document.js
@@ -29,9 +29,10 @@ class MyDocument extends Document {
                 </Head>
                 <body className="js-enabled">
                     <TrackingNoScript googleTagManagerID={googleTagManagerID} />
+
                     {!process.browser && (
                         <script>
-                            window.apiRoot = `{process.env.API_ROOT}`
+                            window.switchDomain = `{process.env.I18N_DOMAIN}`
                         </script>
                     )}
                     <SkipLink />
diff --git a/pages/account/register.js b/pages/account/register.js
index 5b9bd95b..d77a917d 100644
--- a/pages/account/register.js
+++ b/pages/account/register.js
@@ -33,7 +33,8 @@ const Home = (props) => {
         <div>
             <Head>
                 <title>
-                    {t("search:page-title")} - {t("common:service-name")}
+                    {t("account:register-new-account-heading")} -{" "}
+                    {t("common:service-name")}
                 </title>
             </Head>
             <div id="page_wrapper">
@@ -53,16 +54,26 @@ const Home = (props) => {
                                     <div className="govuk-grid-column-two-thirds">
                                         {registerFormComplete != true ||
                                         accountCreatedComplete != true ? (
-                                            <h1>Create a new account</h1>
+                                            <h1>
+                                                {t(
+                                                    "account:register-new-account-heading"
+                                                )}
+                                            </h1>
                                         ) : (
                                             <h1>
                                                 {props.accountDetails.accCr !=
                                                 "false"
                                                     ? props.accountDetails
                                                           .accCr == "exists"
-                                                        ? "Your account has not created"
-                                                        : "Your account has been created"
-                                                    : "Checking for account.."}
+                                                        ? t(
+                                                              "account:register-new-account-status-not-created-label"
+                                                          )
+                                                        : t(
+                                                              "account:register-new-account-status-created-label"
+                                                          )
+                                                    : t(
+                                                          "account:register-new-account-checking-label"
+                                                      )}
                                             </h1>
                                         )}
                                         <RegisterForm
@@ -85,54 +96,37 @@ const Home = (props) => {
                                     accountCreatedComplete != true ? (
                                         <div className="govuk-grid-column-one-third">
                                             <h2 className="govuk-heading-m">
-                                                Help
+                                                {t("account:help-heading")}
                                             </h2>
 
                                             <h3>
-                                                Companies or submissions by more
-                                                than one individual (groups)
+                                                {t(
+                                                    "account:help-sub-heading-1"
+                                                )}
                                             </h3>
 
                                             <p className="govuk-body">
-                                                If you are submitting an appeal
-                                                or representation from a company
-                                                e.g. &quot;Acme Inc&quot; or a
-                                                group of people e.g.
-                                                &quot;Residents of 1-10 High
-                                                street&quot;, you should enter
-                                                the name of the company or group
-                                                in the Company/Group field. You
-                                                will be deemed as acting as
-                                                their representative.
+                                                {t("account:help-paragraph-1")}
                                             </p>
 
                                             <h3>
-                                                Enforcement appeals by
-                                                married/civil partnership
-                                                couples
+                                                {t(
+                                                    "account:help-sub-heading-2"
+                                                )}
                                             </h3>
 
                                             <p className="govuk-body">
-                                                You should not enter a group
-                                                name. You need only enter your
-                                                partner&apos;s name on the
-                                                appeal form itself as an
-                                                additional appellant.
+                                                {t("account:help-paragraph-2")}
                                             </p>
 
                                             <h3>
-                                                Other appeals by married/civil
-                                                partnership couples
+                                                {t(
+                                                    "account:help-sub-heading-3"
+                                                )}
                                             </h3>
 
                                             <p className="govuk-body">
-                                                For any other type of appeal,
-                                                for example a planning appeal,
-                                                you should enter a group name
-                                                when creating your account e.g.
-                                                &quot;Mr and Mrs Smith&quot;, if
-                                                that is the name on the
-                                                application.
+                                                {t("account:help-paragraph-3")}
                                             </p>
                                         </div>
                                     ) : (
diff --git a/pages/index.js b/pages/index.js
index 226f6ad6..f660c2d4 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -20,12 +20,10 @@ const Home = (props) => {
 
     const router = useRouter();
     const { locale } = router;
-    console.log(router);
     return (
         <div>
             <Head>
                 <title>{t("common:service-name")}</title>
-                {console.log(router.pathname)}
                 {/* Language by default is EN, if multilingual site this will need updated */}
                 <meta
                     key="og:locale"
diff --git a/public/assets/images/exclamation.svg b/public/assets/images/exclamation.svg
new file mode 100644
index 00000000..48ea751d
--- /dev/null
+++ b/public/assets/images/exclamation.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="25px" height="25px" viewBox="0 0 25 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>global/icon/exclamation</title>
+    <defs>
+        <path d="M0.469009742,25 L24.5303263,25 C24.892291,25 25.1164757,24.5497372 24.9366609,24.189527 L12.9054188,0.269149608 C12.7256041,-0.0897165361 12.2748996,-0.0897165361 12.0939172,0.269149608 L0.0638427198,24.189527 C-0.117139668,24.5497372 0.108212596,25 0.469009742,25 M13.5,21 L11,21 L11,18 L13.5,18 M13.5,16 L11,16 L11,9 L13.5,9" id="path-1"></path>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group">
+            <mask id="mask-2" fill="white">
+                <use xlink:href="#path-1"></use>
+            </mask>
+            <use id="Fill-1" fill="#AA1111" xlink:href="#path-1"></use>
+            <g mask="url(#mask-2)" fill="#AA1111" id="colour/red/$red-#aa1111">
+                <g>
+                    <polygon id="#aa1111" points="-7.27163618e-14 -3.66549824e-14 25 -3.66549824e-14 25 25 -7.27163618e-14 25"></polygon>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/public/assets/images/select-down-arrow.svg b/public/assets/images/select-down-arrow.svg
new file mode 100644
index 00000000..b86d61e2
--- /dev/null
+++ b/public/assets/images/select-down-arrow.svg
@@ -0,0 +1 @@
+<svg width='15' height='12' xmlns='http://www.w3.org/2000/svg'><path d='M7.5 12L0 0h15z' fill='#4A4A4A' fill-rule='evenodd'/></svg>
\ No newline at end of file
diff --git a/styles/sass/patterns/_card.scss b/styles/sass/patterns/_card.scss
index 468f1b35..403b30d2 100644
--- a/styles/sass/patterns/_card.scss
+++ b/styles/sass/patterns/_card.scss
@@ -82,7 +82,7 @@ html[data-useragent*="MSIE 10.0"] .flex-container {
 
     .card-body {
         //border-bottom: 1px solid $govuk-border-colour; //$panel-colour;
-        padding: 12px;
+        padding: 40px 20px;
 
         *:last-child {
             margin-bottom: 0;
@@ -231,9 +231,9 @@ html[data-useragent*="MSIE 10.0"] .flex-container {
     }
 }
 
-.card-body {
-    width: 93%;
-}
+// .card-body {
+//     width: 93%;
+// }
 
 div.cardModuleItem:last-of-type {
     margin-bottom: 20px !important;
diff --git a/styles/sass/styles.scss b/styles/sass/styles.scss
index 2ab5a365..2c758d12 100644
--- a/styles/sass/styles.scss
+++ b/styles/sass/styles.scss
@@ -3,6 +3,7 @@
 // Add extra styles here, or re-organise the Sass files in whichever way makes most sense to you
 @import "welshgov/_variables";
 @import "welshgov/_application";
+@import "welshgov/_application_errors";
 // @import "welshgov/application_old";
 
 // global styles for <a> and <p> tags
diff --git a/styles/sass/welshgov/_application.scss b/styles/sass/welshgov/_application.scss
index 57751d9b..a03b73d0 100644
--- a/styles/sass/welshgov/_application.scss
+++ b/styles/sass/welshgov/_application.scss
@@ -26,6 +26,7 @@ html {
 .govuk-panel__title,
 .govuk-warning-text__text,
 .app-cookie-banner,
+.govuk-error-message.govuk-form-group--error,
 h1,
 h2,
 h3,
@@ -144,6 +145,9 @@ a.longLinkBreak {
 .govuk-header {
     background-color: $charcoal;
 
+    @media screen and (max-width: 900px) {
+        border-bottom: none;
+    }
     .govuk-header__container {
         border-bottom: none;
         margin-bottom: initial;
@@ -214,12 +218,30 @@ textarea,
     background-color: $red;
     color: $white;
     font-size: 20px;
-    background-image: url(/assets/images/arrow-right--white.svg);
     font-weight: bold;
     background-repeat: no-repeat;
     background-position: right center;
-    padding: 15px 45px 15px 20px !important;
-    transition: all 0.2s ease-in;
+    padding: 15px 20px 15px 20px !important;
+    box-shadow: none;
+
+    &.govuk-button-cta {
+        border-radius: 30px;
+        background-color: $blue;
+
+        &:hover {
+            background-color: $lightblue;
+        }
+    }
+
+    &.withChevron {
+        background-image: url(/assets/images/arrow-right--white.svg);
+        padding: 15px 45px 15px 20px !important;
+
+        &:focus {
+            color: $black;
+            background-image: url(https://gov.wales/themes/custom/govwales/storage/smartsurvey/arrow-right--black.svg);
+        }
+    }
 
     &.govuk-button--secondary {
         background-color: $white;
@@ -233,14 +255,36 @@ textarea,
             color: $white;
         }
     }
+
+    &:hover {
+        background-color: $brightred;
+    }
+
+    &:active {
+        top: 0px;
+    }
     &:focus {
-        color: $black;
-        background-image: url(https://gov.wales/themes/custom/govwales/storage/smartsurvey/arrow-right--black.svg);
+        background-color: #ffd530 !important;
+        border-color: transparent !important;
+        color: #1f1f1f !important;
+        outline: 2px solid #1f1f1f;
+        text-decoration: none !important;
+        -webkit-box-shadow: 0 0 0 2px #ffd530;
+        box-shadow: 0 0 0 2px #ffd530;
     }
 }
 
-.govuk-button:hover {
-    background-color: $brightred;
+.govuk-select {
+    appearance: none;
+    width: 100%;
+    margin-bottom: 20px;
+    background-image: url(/assets/images/select-down-arrow.svg);
+    background-size: 19px 12px;
+    background-repeat: no-repeat;
+    background-position: 98% 15px;
+    background-color: #fff;
+    padding: 10px 15px;
+    border: 1px solid #666666;
 }
 
 .sharebar {
@@ -305,7 +349,7 @@ textarea,
 
     @media screen and (max-width: 900px) {
         position: absolute;
-        top: 10px;
+        top: 20px;
         right: -10px;
     }
     a.govuk-header__link {
@@ -424,9 +468,10 @@ textarea,
     }
     .fullNav {
         display: block;
-        @media screen and (max-width: 900px) {
-            display: none;
-        }
+        //add back in when signout link is used
+        // @media screen and (max-width: 900px) {
+        //     display: none;
+        // }
     }
 }
 
diff --git a/styles/sass/welshgov/_application_errors.scss b/styles/sass/welshgov/_application_errors.scss
new file mode 100644
index 00000000..642ba113
--- /dev/null
+++ b/styles/sass/welshgov/_application_errors.scss
@@ -0,0 +1,28 @@
+.govuk-error-message.govuk-form-group--error-summary {
+    background: $whitered;
+    border-left: 10px solid $red;
+    font-size: 18px;
+    color: $black;
+    font-weight: normal;
+    padding: 20px;
+
+    .govuk-error-exclamation {
+        background-image: url(/assets/images/exclamation.svg);
+        background-repeat: no-repeat;
+        padding-left: 46px;
+        display: block;
+        padding-top: 2px;
+        background-position: left center;
+    }
+}
+
+.govuk-error-message.govuk-form-group--error {
+    background: $whitered;
+    border-left: 3px solid $red;
+    font-size: 18px;
+    color: $black;
+    font-weight: normal;
+    padding: 20px;
+    margin-top: 20px;
+    max-width: 41ex;
+}