From 7dbc978f009ebb1a55e3b0b63122216a278ea1ea Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Tue, 20 Feb 2024 13:26:07 +0000
Subject: [PATCH] accessibility amends for lpa reps

---
 components/case/documents.js                  |   8 +-
 components/case/representation/index.js       |   4 +-
 .../representation/representationAgent.js     |  42 +-
 .../representation/representationAppellant.js |  41 +-
 .../representation/representationElements.js  |  22 +-
 .../case/representation/representationLPA.js  |  97 +-
 .../representationProgress_s78.js             |   4 +-
 .../representationLPAQuestionnaire_s78.js     |  30 +-
 components/case/summary.js                    |  25 +-
 .../applications/applicationTabsDocuments.js  |   2 +-
 .../dns/applications/applicationsList.js      | 888 +++++++++---------
 .../myportal/awaitingsubmissionfromblob.js    |   1 +
 components/myportal/topthree.js               |   2 +
 components/myportal/topthree_reps.js          |   1 -
 components/search/dnssearchresults.js         |   5 +-
 components/search/searchresults.js            |   2 +-
 styles/sass/welshgov/_application.scss        |  15 +
 17 files changed, 609 insertions(+), 580 deletions(-)

diff --git a/components/case/documents.js b/components/case/documents.js
index 0fe3cb5c..78c238eb 100644
--- a/components/case/documents.js
+++ b/components/case/documents.js
@@ -59,7 +59,10 @@ const DocumentDetails = (props) => {
                         className="govuk-grid-row govuk-!-margin-left-0"
                     >
                         <div className="govuk-form-group">
-                            <label className="govuk-label-s " htmlFor="sort">
+                            <label
+                                className="govuk-label-s "
+                                htmlFor="showDocumentType"
+                            >
                                 {t("case:documents-show-label")}
                                 <select
                                     onChange={(e) => {
@@ -70,6 +73,7 @@ const DocumentDetails = (props) => {
                                     className="govuk-select"
                                     id="showDocumentType"
                                     name="showDocumentType"
+                                    datafield="showDocumentType"
                                 >
                                     <option value="all">
                                         {router.locale == "cy"
@@ -114,7 +118,7 @@ const DocumentDetails = (props) => {
                             <div className="govuk-form-group">
                                 <label
                                     className="govuk-label-s "
-                                    htmlFor="sort"
+                                    htmlFor="showNumberOfRecords"
                                 >
                                     {t(
                                         "search:searchresults-show-records-label-a"
diff --git a/components/case/representation/index.js b/components/case/representation/index.js
index 36f58fda..a81ad932 100644
--- a/components/case/representation/index.js
+++ b/components/case/representation/index.js
@@ -708,11 +708,11 @@ let MakeRepresentation = (props) => {
                                         {" "}
                                         <div className="card">
                                             <div className="card-body">
-                                                <h4 className="govuk-heading-s">
+                                                <h2 className="govuk-heading-s">
                                                     {t(
                                                         "myrepresentations:timetable-title"
                                                     )}
-                                                </h4>
+                                                </h2>
                                                 <div className="govuk-summary-list">
                                                     <div className="govuk-body-s">
                                                         {t(
diff --git a/components/case/representation/representationAgent.js b/components/case/representation/representationAgent.js
index 8505ba82..cedd919f 100644
--- a/components/case/representation/representationAgent.js
+++ b/components/case/representation/representationAgent.js
@@ -43,28 +43,30 @@ const RepAgent = (props) => {
     return (
         <>
             <div className="govuk-grid-row">
-                <h2 className="govuk-heading-m ">
-                    {t(
-                        "myrepresentations:representation-from-an-agent-heading"
-                    )}
-                </h2>
-
                 <div className="govuk-form-group">
-                    <label
-                        className="govuk-label govuk-body-m"
-                        htmlFor="representationType"
-                    >
-                        {t("myrepresentations:kind-of-rep-label")}
-                    </label>
-                    {typeof props.representationType == "undefined" ||
-                    typeof formObj.representationForm.values
+                    {typeof formObj.representationForm.values
                         .representationType == "undefined" ? (
-                        <Field
-                            name="representationType"
-                            component={RenderPickList}
-                            datafieldname="representationType"
-                            optionsArr={appellantApplicantRepresentationArr}
-                        />
+                        <>
+                            <h2 className="govuk-heading-m ">
+                                {t(
+                                    "myrepresentations:representation-from-an-agent-heading"
+                                )}
+                            </h2>
+
+                            <label
+                                className="govuk-label govuk-body-m"
+                                htmlFor="representationType"
+                            >
+                                {t("myrepresentations:kind-of-rep-label")}
+                            </label>
+
+                            <Field
+                                name="representationType"
+                                component={RenderPickList}
+                                datafieldname="representationType"
+                                optionsArr={appellantApplicantRepresentationArr}
+                            />
+                        </>
                     ) : (
                         <label className="govuk-label govuk-body-m">
                             Representation Type:{" "}
diff --git a/components/case/representation/representationAppellant.js b/components/case/representation/representationAppellant.js
index c303ee8c..baf896a0 100644
--- a/components/case/representation/representationAppellant.js
+++ b/components/case/representation/representationAppellant.js
@@ -45,27 +45,28 @@ const RepAppellant = (props) => {
         <>
             <div className="govuk-grid-row">
                 <div className="govuk-form-group">
-                    <h2 className="govuk-heading-m ">
-                        {t(
-                            "myrepresentations:representation-from-an-appellant-heading"
-                        )}
-                    </h2>
-                    <label
-                        className="govuk-label govuk-body-m"
-                        htmlFor="representationType"
-                    >
-                        {t("myrepresentations:kind-of-rep-label")}
-                    </label>
-
-                    {typeof props.representationType == "undefined" ||
-                    typeof formObj.representationForm.values
+                    {typeof formObj.representationForm.values
                         .representationType == "undefined" ? (
-                        <Field
-                            name="representationType"
-                            component={RenderPickList}
-                            datafieldname="representationType"
-                            optionsArr={appellantApplicantRepresentationArr}
-                        />
+                        <>
+                            <h2 className="govuk-heading-m ">
+                                {t(
+                                    "myrepresentations:representation-from-an-appellant-heading"
+                                )}
+                            </h2>
+                            <label
+                                className="govuk-label govuk-body-m"
+                                htmlFor="representationType"
+                            >
+                                {t("myrepresentations:kind-of-rep-label")}
+                            </label>
+
+                            <Field
+                                name="representationType"
+                                component={RenderPickList}
+                                datafieldname="representationType"
+                                optionsArr={appellantApplicantRepresentationArr}
+                            />
+                        </>
                     ) : (
                         <label className="govuk-label govuk-body-m">
                             Representation Type:{" "}
diff --git a/components/case/representation/representationElements.js b/components/case/representation/representationElements.js
index 49e801e6..c619aaeb 100644
--- a/components/case/representation/representationElements.js
+++ b/components/case/representation/representationElements.js
@@ -281,7 +281,7 @@ export const RenderCondtionalRadioList = ({
                     <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
                         <label
                             className="govuk-fieldset__heading govuk-body-m"
-                            id="representationCapacity_label"
+                            id={id + "_label"}
                         >
                             {legend}
                         </label>
@@ -385,14 +385,6 @@ export const RenderLPACondtionalRadioList = ({
                     className="govuk-fieldset"
                     aria-describedby={id + "-hint"}
                 >
-                    <legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
-                        <label
-                            className="govuk-fieldset__heading govuk-body-m"
-                            id={id + "_label"}
-                        >
-                            {label}
-                        </label>
-                    </legend>
                     {touched && error && (
                         <span
                             id={id + "-error"}
@@ -406,10 +398,7 @@ export const RenderLPACondtionalRadioList = ({
                     )}
 
                     <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
-                        <label
-                            className=" govuk-body-m"
-                            id="representationCapacity_label"
-                        >
+                        <label className=" govuk-body-m" id={id + "_label"}>
                             {legend}
                         </label>
                     </legend>
@@ -481,7 +470,9 @@ export const RenderPickList = ({
     optionsArr,
     meta: { touched, error },
     errorMsg,
+    ...custom
 }) => {
+    console.log(custom.disabled);
     return (
         <>
             <div
@@ -507,6 +498,7 @@ export const RenderPickList = ({
                         className="govuk-select "
                         id={datafieldname}
                         name={datafieldname}
+                        disabled={custom.disabled}
                     >
                         <option>Select...</option>
                         {Object.keys(optionsArr).map((key, index) => {
@@ -699,14 +691,14 @@ export const RenderMultiline = ({
     return (
         <>
             <div className="govuk-form-group ">
-                <label className="govuk-label" htmlFor={name}>
+                <label className="govuk-label" htmlFor={datafieldname}>
                     {label}
                 </label>
                 {"hint" in custom}
 
                 {"hint" in custom && (
                     <div
-                        id={name + "-hint"}
+                        id={datafieldname + "-hint"}
                         className="govuk-hint govuk-!-font-size-14"
                     >
                         {custom.hint}
diff --git a/components/case/representation/representationLPA.js b/components/case/representation/representationLPA.js
index 2589851a..76b91eb7 100644
--- a/components/case/representation/representationLPA.js
+++ b/components/case/representation/representationLPA.js
@@ -227,49 +227,64 @@ let RepLPA = (props) => {
     return (
         <>
             <div className="govuk-grid-row">
-                <h2 className="govuk-heading-m ">
-                    {typeof props.representationType != "undefined"
-                        ? props.representationType == "Questionnaire"
-                            ? locale == "cy"
-                                ? "Holiadur"
-                                : props.representationType
-                            : props.representationType
-                        : locale == "cy"
-                        ? "Cynrychioliadau"
-                        : "Representation"}{" "}
-                    {locale == "cy" ? "o ACLI am a" : "from an LPA for a"}{" "}
-                    {locale == "cy"
-                        ? jsonpath(
-                              '$..[?(@.attributevalue=="' +
-                                  currentView.caseReference.appealType +
-                                  '")].value_cy',
-                              transLookup
-                          )
-                        : getFormCollectionByID(
-                              currentView.caseReference.appealType
-                          ).value}
-                </h2>
+                <div className="govuk-form-group">
+                    {typeof formObj.representationForm.values
+                        .representationType == "undefined" ? (
+                        <>
+                            <h2 className="govuk-heading-m ">
+                                {typeof props.representationType != "undefined"
+                                    ? props.representationType ==
+                                      "Questionnaire"
+                                        ? locale == "cy"
+                                            ? "Holiadur"
+                                            : props.representationType
+                                        : props.representationType
+                                    : locale == "cy"
+                                    ? "Cynrychioliadau"
+                                    : "Representation"}{" "}
+                                {locale == "cy"
+                                    ? "o ACLI am a"
+                                    : "from an LPA for a"}{" "}
+                                {locale == "cy"
+                                    ? jsonpath(
+                                          '$..[?(@.attributevalue=="' +
+                                              currentView.caseReference
+                                                  .appealType +
+                                              '")].value_cy',
+                                          transLookup
+                                      )
+                                    : getFormCollectionByID(
+                                          currentView.caseReference.appealType
+                                      ).value}
+                            </h2>
 
-                {typeof props.representationType == "undefined" && (
-                    <div className="govuk-form-group">
-                        <label
-                            className="govuk-label govuk-body-m"
-                            htmlFor="representationType"
-                        >
-                            {t(
-                                "myrepresentations:representation-from-an-agent-heading"
-                            )}
-                            ?
+                            <label
+                                className="govuk-label govuk-body-m"
+                                htmlFor="representationType"
+                            >
+                                {t(
+                                    "myrepresentations:representation-from-an-agent-heading"
+                                )}
+                                ?
+                            </label>
+                            <Field
+                                id="representationType"
+                                name="representationType"
+                                component={RenderPickList}
+                                datafieldname="representationType"
+                                optionsArr={appellantApplicantRepresentationArr}
+                            />
+                        </>
+                    ) : (
+                        <label className="govuk-label govuk-body-m">
+                            Representation Type:{" "}
+                            {
+                                formObj.representationForm.values
+                                    .representationType
+                            }{" "}
                         </label>
-                        <Field
-                            id="representationType"
-                            name="representationType"
-                            component={RenderPickList}
-                            datafieldname="representationType"
-                            optionsArr={appellantApplicantRepresentationArr}
-                        />
-                    </div>
-                )}
+                    )}
+                </div>
             </div>
             <div className="govuk-grid-row">
                 <div className="govuk-form-group">
diff --git a/components/case/representation/representationProgress/representationProgress_s78.js b/components/case/representation/representationProgress/representationProgress_s78.js
index 7989a345..7e3a460e 100644
--- a/components/case/representation/representationProgress/representationProgress_s78.js
+++ b/components/case/representation/representationProgress/representationProgress_s78.js
@@ -407,7 +407,7 @@ const RepresentationProgress_s78 = (props) => {
                                         aria-controls={
                                             "step-panel-" +
                                             t(
-                                                "myrepresentations:s78-section-heading-six"
+                                                "myrepresentations:add-files-label"
                                             )
                                                 .replace(/\s+/g, "-")
                                                 .toLowerCase()
@@ -415,7 +415,7 @@ const RepresentationProgress_s78 = (props) => {
                                     >
                                         <span className="js-step-title-text govuk-!-font-size-16">
                                             {t(
-                                                "myrepresentations:s78-section-heading-six"
+                                                "myrepresentations:add-files-label"
                                             )}
                                         </span>
                                     </a>
diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js
index a4c8fdd6..693c29d6 100644
--- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js
+++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js
@@ -110,9 +110,9 @@ let S78_Questionnaire = (props) => {
                     className="govuk-fieldset"
                     aria-describedby="commentBox-hint"
                 >
-                    <h3 className="govuk-heading-s ">
+                    <h2 className="govuk-heading-s ">
                         {t("myrepresentations:s78-section-heading-one")}{" "}
-                    </h3>
+                    </h2>
                     <div className="govuk-form-group">
                         <div className="govuk-label">
                             1. {t("myrepresentations:s78-section-question-1")}{" "}
@@ -150,6 +150,7 @@ let S78_Questionnaire = (props) => {
 
                     <div className="govuk-form-group">
                         <Field
+                            datafieldname="procedureType"
                             label={
                                 "5. " +
                                 t("myrepresentations:s78-section-question-5")
@@ -308,19 +309,20 @@ let S78_Questionnaire = (props) => {
                     className="govuk-fieldset govuk-!-margin-top-9"
                     aria-describedby="commentBox-hint"
                 >
-                    <h3 className="govuk-heading-s ">
+                    <h2 className="govuk-heading-s ">
                         {" "}
                         {t("myrepresentations:s78-section-heading-two")}{" "}
-                    </h3>
+                    </h2>
                     <div className="govuk-form-group">
                         <Field
                             label={
                                 "11. " +
                                 t("myrepresentations:s78-section-question-11")
                             }
-                            name="LPAcaseFileAndReps"
-                            id="LPAcaseFileAndReps"
+                            name={"LPAcaseFileAndReps"}
+                            id={"LPAcaseFileAndReps"}
                             component={RenderMultiline}
+                            datafieldname={"LPAcaseFileAndReps"}
                             type="text"
                             rows="5"
                             className="govuk-textarea govuk-input--width-30"
@@ -339,6 +341,7 @@ let S78_Questionnaire = (props) => {
                             }
                             name="LPAldpAndMap"
                             id="LPAldpAndMap"
+                            datafieldname="LPAldpAndMap"
                             component={RenderMultiline}
                             type="text"
                             rows="5"
@@ -358,6 +361,7 @@ let S78_Questionnaire = (props) => {
                             }
                             name="LPAlocalGuidance"
                             id="LPAlocalGuidance"
+                            datafieldname="LPAlocalGuidance"
                             component={RenderMultiline}
                             type="text"
                             rows="5"
@@ -394,9 +398,9 @@ let S78_Questionnaire = (props) => {
                     className="govuk-fieldset govuk-!-margin-top-9"
                     aria-describedby="commentBox-hint"
                 >
-                    <h3 className="govuk-heading-s ">
+                    <h2 className="govuk-heading-s ">
                         {t("myrepresentations:s78-section-heading-three")}
-                    </h3>
+                    </h2>
                     <Field
                         label={
                             "15. " +
@@ -615,9 +619,9 @@ let S78_Questionnaire = (props) => {
                     className="govuk-fieldset govuk-!-margin-top-9"
                     aria-describedby="commentBox-hint"
                 >
-                    <h3 className="govuk-heading-s ">
+                    <h2 className="govuk-heading-s ">
                         {t("myrepresentations:s78-section-heading-four")}
-                    </h3>
+                    </h2>
                     <div className="govuk-form-group  govuk-body-m">
                         {"24. " +
                             t("myrepresentations:s78-section-question-24")}
@@ -736,9 +740,9 @@ let S78_Questionnaire = (props) => {
                     className="govuk-fieldset govuk-!-margin-top-9"
                     aria-describedby="commentBox-hint"
                 >
-                    <h3 className="govuk-heading-s ">
+                    <h2 className="govuk-heading-s ">
                         {t("myrepresentations:s78-section-heading-five")}
-                    </h3>
+                    </h2>
 
                     <div className="govuk-form-group">
                         <Field
@@ -958,7 +962,7 @@ let S78_Questionnaire = (props) => {
                     className="govuk-fieldset govuk-!-margin-top-9"
                     aria-describedby="commentBox-hint"
                 >
-                    <h3 className="govuk-heading-s ">Declaration</h3>
+                    <h2 className="govuk-heading-s ">Declaration</h2>
                     <div className="govuk-form-group">
                         <Field
                             className="govuk-input govuk-!-width-one-half"
diff --git a/components/case/summary.js b/components/case/summary.js
index 324f71cf..9e88aa92 100644
--- a/components/case/summary.js
+++ b/components/case/summary.js
@@ -442,7 +442,7 @@ const CaseSummary = (props) => {
                                                 0 ==
                                             true ? (
                                                 <button
-                                                    className="govuk-link"
+                                                    className="govuk-link watchCase"
                                                     onClick={() => {
                                                         confirm(
                                                             t(
@@ -475,8 +475,8 @@ const CaseSummary = (props) => {
                                                     )}{" "}
                                                 </button>
                                             ) : (
-                                                <span
-                                                    className=" govuk-link"
+                                                <button
+                                                    className="govuk-link watchCase"
                                                     onClick={() => {
                                                         confirm(
                                                             t(
@@ -507,24 +507,13 @@ const CaseSummary = (props) => {
                                                     {t(
                                                         "case:watch-this-case-link"
                                                     )}
-                                                </span>
+                                                </button>
                                             ))}
 
                                         {!session && (
-                                            <span
-                                                className="govuk-link"
+                                            <button
+                                                className="govuk-link watchCase"
                                                 onClick={() => {
-                                                    // signIn("email");
-                                                    // signIn();
-                                                    // selectWatchedCase(
-                                                    //     cookies.pinsUser,
-                                                    //     item.incidentid,
-                                                    //     item.pinswg_appealcasetype
-                                                    // );
-                                                    // alert(
-                                                    //     "Trying to watch case " +
-                                                    //         item.title
-                                                    // );
                                                     confirm(
                                                         "Trying to watch case " +
                                                             props.currentView
@@ -546,7 +535,7 @@ const CaseSummary = (props) => {
                                                 )}
                                             >
                                                 {t("case:watch-this-case-link")}
-                                            </span>
+                                            </button>
                                         )}
                                     </div>
                                 </div>
diff --git a/components/dns/applications/applicationTabsDocuments.js b/components/dns/applications/applicationTabsDocuments.js
index 98a9675c..58031f95 100644
--- a/components/dns/applications/applicationTabsDocuments.js
+++ b/components/dns/applications/applicationTabsDocuments.js
@@ -133,7 +133,7 @@ const ApplicationTabsDocuments = (props) => {
                         </div>
 
                         <div className=" govuk-grid-column-two-thirds govuk-form-group">
-                            <label className="govuk-label-xs " htmlFor="sort">
+                            <label className="govuk-label-xs " htmlFor="showNo">
                                 Show{" "}
                                 <select
                                     className="govuk-select govuk-select-s"
diff --git a/components/dns/applications/applicationsList.js b/components/dns/applications/applicationsList.js
index 22fe73f5..cd2dede2 100644
--- a/components/dns/applications/applicationsList.js
+++ b/components/dns/applications/applicationsList.js
@@ -9,487 +9,489 @@ const ApplicationList = (props) => {
     const router = useRouter();
     const { locale } = router;
 
-    return <>
-        <div className="govuk-grid-row govuk-!-margin-top-9">
-            <div className="govuk-grid-column-full">
-                <div className="govuk-form-group">
-                    <label className="govuk-label-s " htmlFor="sort">
-                        {t("dnsCommon:result-list-show-label")}{" "}
-                        <select
-                            className="govuk-select"
-                            id="showNo"
-                            name="showNo"
-                        >
-                            <option value="1">10</option>
-                            <option value="1">25</option>
-                            <option value="1">50</option>
-                            <option value="1">100</option>
-                        </select>{" "}
-                        {t("dnsCommon:result-list-entries-label")}
-                    </label>
+    return (
+        <>
+            <div className="govuk-grid-row govuk-!-margin-top-9">
+                <div className="govuk-grid-column-full">
+                    <div className="govuk-form-group">
+                        <label className="govuk-label-s " htmlFor="showNo">
+                            {t("dnsCommon:result-list-show-label")}{" "}
+                            <select
+                                className="govuk-select"
+                                id="showNo"
+                                name="showNo"
+                            >
+                                <option value="1">10</option>
+                                <option value="1">25</option>
+                                <option value="1">50</option>
+                                <option value="1">100</option>
+                            </select>{" "}
+                            {t("dnsCommon:result-list-entries-label")}
+                        </label>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div className="govuk-grid-row">
-            <div className="govuk-grid-column-full">
-                <p className="govuk-body-s">
-                    {t("dnsCommon:result-list-showing-label", {
-                        recordIndex: "1",
-                        pagingIndex: "10",
-                        totalRecords: "55",
-                    })}
-                </p>
+            <div className="govuk-grid-row">
+                <div className="govuk-grid-column-full">
+                    <p className="govuk-body-s">
+                        {t("dnsCommon:result-list-showing-label", {
+                            recordIndex: "1",
+                            pagingIndex: "10",
+                            totalRecords: "55",
+                        })}
+                    </p>
+                </div>
             </div>
-        </div>
-        <div className="govuk-grid-row ">
-            <div className="govuk-grid-column-full">
-                <dl className="govuk-summary-list  govuk-!-margin-bottom-0 results">
-                    <div className="govuk-summary-list__row results-headings">
-                        <dd className="govuk-summary-list__key govuk-!-font-size-16 results_wider  ">
-                            {t(
-                                "dnsApplications:result-list-heading-label-reference"
-                            )}
-                        </dd>
-                        <dd className="govuk-summary-list__key govuk-!-font-size-16">
-                            {t(
-                                "dnsApplications:result-list-heading-label-application"
-                            )}
-                        </dd>
-                        <dd className="govuk-summary-list__key govuk-!-font-size-16">
-                            {t(
-                                "dnsApplications:result-list-heading-label-developer"
-                            )}
-                        </dd>
-                        <dd className="govuk-summary-list__key govuk-!-font-size-16">
-                            {t(
-                                "dnsApplications:result-list-heading-label-type"
-                            )}
-                        </dd>
-                        <dd className="govuk-summary-list__key govuk-!-font-size-16">
-                            {t(
-                                "dnsApplications:result-list-heading-label-status"
-                            )}
-                        </dd>
-                    </div>
-                    <div className="govuk-summary-list__row">
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
-                            <span className="results-visually-hidden">
+            <div className="govuk-grid-row ">
+                <div className="govuk-grid-column-full">
+                    <dl className="govuk-summary-list  govuk-!-margin-bottom-0 results">
+                        <div className="govuk-summary-list__row results-headings">
+                            <dd className="govuk-summary-list__key govuk-!-font-size-16 results_wider  ">
                                 {t(
                                     "dnsApplications:result-list-heading-label-reference"
                                 )}
-                                :
-                            </span>
-                            CAS-00009-W8N6W4
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <Link href="/dns/application-view">
-
-                                <span className="results-visually-hidden">
-                                    {t(
-                                        "dnsApplications:result-list-heading-label-application"
-                                    )}
-                                    :{" "}
-                                </span>TWA - Morlais Demonstration Zone
-                            </Link>
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
+                            </dd>
+                            <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                                {t(
+                                    "dnsApplications:result-list-heading-label-application"
+                                )}
+                            </dd>
+                            <dd className="govuk-summary-list__key govuk-!-font-size-16">
                                 {t(
                                     "dnsApplications:result-list-heading-label-developer"
                                 )}
-                                :
-                            </span>
-                            Menter Mon
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
+                            </dd>
+                            <dd className="govuk-summary-list__key govuk-!-font-size-16">
                                 {t(
                                     "dnsApplications:result-list-heading-label-type"
                                 )}
-                                :
-                            </span>
-                            Energy
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
+                            </dd>
+                            <dd className="govuk-summary-list__key govuk-!-font-size-16">
                                 {t(
                                     "dnsApplications:result-list-heading-label-status"
                                 )}
-                                :
-                            </span>
-                            Recommendation
-                        </dd>
-                    </div>
-                    <div className="govuk-summary-list__row">
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-reference"
-                                )}
-                                :
-                            </span>
-                            CAS-00009-W8N6W4
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <Link href="/dns/application-view">
-
+                            </dd>
+                        </div>
+                        <div className="govuk-summary-list__row">
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
                                 <span className="results-visually-hidden">
                                     {t(
-                                        "dnsApplications:result-list-heading-label-application"
+                                        "dnsApplications:result-list-heading-label-reference"
                                     )}
-                                    :{" "}
-                                </span>TWA - Morlais Demonstration Zone
-                            </Link>
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-developer"
-                                )}
-                                :
-                            </span>
-                            Menter Mon
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-type"
-                                )}
-                                :
-                            </span>
-                            Energy
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-status"
-                                )}
-                                :
-                            </span>
-                            Recommendation
-                        </dd>
-                    </div>
-                    <div className="govuk-summary-list__row">
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-reference"
-                                )}
-                                :
-                            </span>
-                            CAS-00009-W8N6W4
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <Link href="/dns/application-view">
-
+                                    :
+                                </span>
+                                CAS-00009-W8N6W4
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <Link href="/dns/application-view">
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
+                                </Link>
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                 <span className="results-visually-hidden">
                                     {t(
-                                        "dnsApplications:result-list-heading-label-application"
+                                        "dnsApplications:result-list-heading-label-developer"
                                     )}
-                                    :{" "}
-                                </span>TWA - Morlais Demonstration Zone
-                            </Link>
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-developer"
-                                )}
-                                :
-                            </span>
-                            Menter Mon
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-type"
-                                )}
-                                :
-                            </span>
-                            Energy
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-status"
-                                )}
-                                :
-                            </span>
-                            Recommendation
-                        </dd>
-                    </div>
-                    <div className="govuk-summary-list__row">
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-reference"
-                                )}
-                                :
-                            </span>
-                            CAS-00009-W8N6W4
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <Link href="/dns/application-view">
-
+                                    :
+                                </span>
+                                Menter Mon
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                 <span className="results-visually-hidden">
                                     {t(
-                                        "dnsApplications:result-list-heading-label-application"
+                                        "dnsApplications:result-list-heading-label-type"
                                     )}
-                                    :{" "}
-                                </span>TWA - Morlais Demonstration Zone
-                            </Link>
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-developer"
-                                )}
-                                :
-                            </span>
-                            Menter Mon
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-type"
-                                )}
-                                :
-                            </span>
-                            Energy
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-status"
-                                )}
-                                :
-                            </span>
-                            Recommendation
-                        </dd>
-                    </div>
-                    <div className="govuk-summary-list__row">
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-reference"
-                                )}
-                                :
-                            </span>
-                            CAS-00009-W8N6W4
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <Link href="/dns/application-view">
-
+                                    :
+                                </span>
+                                Energy
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                 <span className="results-visually-hidden">
                                     {t(
-                                        "dnsApplications:result-list-heading-label-application"
+                                        "dnsApplications:result-list-heading-label-status"
                                     )}
-                                    :{" "}
-                                </span>TWA - Morlais Demonstration Zone
-                            </Link>
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-developer"
-                                )}
-                                :
-                            </span>
-                            Menter Mon
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-type"
-                                )}
-                                :
-                            </span>
-                            Energy
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-status"
-                                )}
-                                :
-                            </span>
-                            Recommendation
-                        </dd>
-                    </div>
-                    <div className="govuk-summary-list__row">
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-reference"
-                                )}
-                                :
-                            </span>
-                            CAS-00009-W8N6W4
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <Link href="/dns/application-view">
-
+                                    :
+                                </span>
+                                Recommendation
+                            </dd>
+                        </div>
+                        <div className="govuk-summary-list__row">
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
                                 <span className="results-visually-hidden">
                                     {t(
-                                        "dnsApplications:result-list-heading-label-application"
+                                        "dnsApplications:result-list-heading-label-reference"
                                     )}
-                                    :{" "}
-                                </span>TWA - Morlais Demonstration Zone
-                            </Link>
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-developer"
-                                )}
-                                :
-                            </span>
-                            Menter Mon
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-type"
-                                )}
-                                :
-                            </span>
-                            Energy
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-status"
-                                )}
-                                :
-                            </span>
-                            Recommendation
-                        </dd>
-                    </div>
-                    <div className="govuk-summary-list__row">
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-reference"
-                                )}
-                                :
-                            </span>
-                            CAS-00009-W8N6W4
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <Link href="/dns/application-view">
-
+                                    :
+                                </span>
+                                CAS-00009-W8N6W4
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <Link href="/dns/application-view">
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
+                                </Link>
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                 <span className="results-visually-hidden">
                                     {t(
-                                        "dnsApplications:result-list-heading-label-application"
+                                        "dnsApplications:result-list-heading-label-developer"
                                     )}
-                                    :{" "}
-                                </span>TWA - Morlais Demonstration Zone
-                            </Link>
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-developer"
-                                )}
-                                :
-                            </span>
-                            Menter Mon
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-type"
-                                )}
-                                :
-                            </span>
-                            Energy
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-status"
-                                )}
-                                :
-                            </span>
-                            Recommendation
-                        </dd>
-                    </div>
-                    <div className="govuk-summary-list__row">
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-reference"
-                                )}
-                                :
-                            </span>
-                            CAS-00009-W8N6W4
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <Link href="/dns/application-view">
-
+                                    :
+                                </span>
+                                Menter Mon
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                 <span className="results-visually-hidden">
                                     {t(
-                                        "dnsApplications:result-list-heading-label-application"
+                                        "dnsApplications:result-list-heading-label-type"
                                     )}
-                                    :{" "}
-                                </span>TWA - Morlais Demonstration Zone
-                            </Link>
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-developer"
-                                )}
-                                :
-                            </span>
-                            Menter Mon
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-type"
-                                )}
-                                :
-                            </span>
-                            Energy
-                        </dd>
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16">
-                            <span className="results-visually-hidden">
-                                {t(
-                                    "dnsApplications:result-list-heading-label-status"
-                                )}
-                                :
-                            </span>
-                            Recommendation
-                        </dd>
-                    </div>
-                </dl>
+                                    :
+                                </span>
+                                Energy
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-status"
+                                    )}
+                                    :
+                                </span>
+                                Recommendation
+                            </dd>
+                        </div>
+                        <div className="govuk-summary-list__row">
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-reference"
+                                    )}
+                                    :
+                                </span>
+                                CAS-00009-W8N6W4
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <Link href="/dns/application-view">
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
+                                </Link>
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-developer"
+                                    )}
+                                    :
+                                </span>
+                                Menter Mon
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-type"
+                                    )}
+                                    :
+                                </span>
+                                Energy
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-status"
+                                    )}
+                                    :
+                                </span>
+                                Recommendation
+                            </dd>
+                        </div>
+                        <div className="govuk-summary-list__row">
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-reference"
+                                    )}
+                                    :
+                                </span>
+                                CAS-00009-W8N6W4
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <Link href="/dns/application-view">
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
+                                </Link>
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-developer"
+                                    )}
+                                    :
+                                </span>
+                                Menter Mon
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-type"
+                                    )}
+                                    :
+                                </span>
+                                Energy
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-status"
+                                    )}
+                                    :
+                                </span>
+                                Recommendation
+                            </dd>
+                        </div>
+                        <div className="govuk-summary-list__row">
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-reference"
+                                    )}
+                                    :
+                                </span>
+                                CAS-00009-W8N6W4
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <Link href="/dns/application-view">
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
+                                </Link>
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-developer"
+                                    )}
+                                    :
+                                </span>
+                                Menter Mon
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-type"
+                                    )}
+                                    :
+                                </span>
+                                Energy
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-status"
+                                    )}
+                                    :
+                                </span>
+                                Recommendation
+                            </dd>
+                        </div>
+                        <div className="govuk-summary-list__row">
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-reference"
+                                    )}
+                                    :
+                                </span>
+                                CAS-00009-W8N6W4
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <Link href="/dns/application-view">
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
+                                </Link>
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-developer"
+                                    )}
+                                    :
+                                </span>
+                                Menter Mon
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-type"
+                                    )}
+                                    :
+                                </span>
+                                Energy
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-status"
+                                    )}
+                                    :
+                                </span>
+                                Recommendation
+                            </dd>
+                        </div>
+                        <div className="govuk-summary-list__row">
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-reference"
+                                    )}
+                                    :
+                                </span>
+                                CAS-00009-W8N6W4
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <Link href="/dns/application-view">
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
+                                </Link>
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-developer"
+                                    )}
+                                    :
+                                </span>
+                                Menter Mon
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-type"
+                                    )}
+                                    :
+                                </span>
+                                Energy
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-status"
+                                    )}
+                                    :
+                                </span>
+                                Recommendation
+                            </dd>
+                        </div>
+                        <div className="govuk-summary-list__row">
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-reference"
+                                    )}
+                                    :
+                                </span>
+                                CAS-00009-W8N6W4
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <Link href="/dns/application-view">
+                                    <span className="results-visually-hidden">
+                                        {t(
+                                            "dnsApplications:result-list-heading-label-application"
+                                        )}
+                                        :{" "}
+                                    </span>
+                                    TWA - Morlais Demonstration Zone
+                                </Link>
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-developer"
+                                    )}
+                                    :
+                                </span>
+                                Menter Mon
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-type"
+                                    )}
+                                    :
+                                </span>
+                                Energy
+                            </dd>
+                            <dd className="govuk-summary-list__value govuk-!-font-size-16">
+                                <span className="results-visually-hidden">
+                                    {t(
+                                        "dnsApplications:result-list-heading-label-status"
+                                    )}
+                                    :
+                                </span>
+                                Recommendation
+                            </dd>
+                        </div>
+                    </dl>
+                </div>
             </div>
-        </div>
-        <div className="govuk-grid-row ">
-            <div className="govuk-grid-column-full">
-                <p>
-                    {t("dnsCommon:result-list-previous-label")}{" "}
-                    <span>1</span>{" "}
-                    <span>
-                        <Link href="#">2</Link>
-                    </span>{" "}
-                    <span>
-                        <Link href="#">3</Link>
-                    </span>{" "}
-                    <span>
-                        <Link href="#">4</Link>
-                    </span>{" "}
-                    <span>
-                        <Link href="#">5</Link>
-                    </span>{" "}
-                    <Link href="#" legacyBehavior>
-                        {t("dnsCommon:result-list-next-label")}
-                    </Link>
-                </p>
+            <div className="govuk-grid-row ">
+                <div className="govuk-grid-column-full">
+                    <p>
+                        {t("dnsCommon:result-list-previous-label")}{" "}
+                        <span>1</span>{" "}
+                        <span>
+                            <Link href="#">2</Link>
+                        </span>{" "}
+                        <span>
+                            <Link href="#">3</Link>
+                        </span>{" "}
+                        <span>
+                            <Link href="#">4</Link>
+                        </span>{" "}
+                        <span>
+                            <Link href="#">5</Link>
+                        </span>{" "}
+                        <Link href="#" legacyBehavior>
+                            {t("dnsCommon:result-list-next-label")}
+                        </Link>
+                    </p>
+                </div>
             </div>
-        </div>
-    </>;
+        </>
+    );
 };
 
 export default ApplicationList;
diff --git a/components/myportal/awaitingsubmissionfromblob.js b/components/myportal/awaitingsubmissionfromblob.js
index a673dda9..dd17eba8 100644
--- a/components/myportal/awaitingsubmissionfromblob.js
+++ b/components/myportal/awaitingsubmissionfromblob.js
@@ -178,6 +178,7 @@ const AwaitingSubmissionFromBlob = (props) => {
                 </div>
                 <div className="">
                     <button
+                        title={t("case:do-you-want-to-delete-case-label")}
                         className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
                         onClick={() => {
                             confirm(
diff --git a/components/myportal/topthree.js b/components/myportal/topthree.js
index e0baafd5..907cc013 100644
--- a/components/myportal/topthree.js
+++ b/components/myportal/topthree.js
@@ -304,6 +304,7 @@ const TopThree = (props) => {
                 {topThreeType == "watchedCases" && (
                     <div className="">
                         <button
+                            title={t("case:you-have-stopped-watching-label")}
                             className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
                             onClick={() => {
                                 confirm(
@@ -325,6 +326,7 @@ const TopThree = (props) => {
                 {topThreeType == "awaitingSubmission" && (
                     <div className="">
                         <button
+                            title={t("case:do-you-want-to-delete-case-label")}
                             className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
                             onClick={() => {
                                 confirm(
diff --git a/components/myportal/topthree_reps.js b/components/myportal/topthree_reps.js
index 020423eb..92fc4ae5 100644
--- a/components/myportal/topthree_reps.js
+++ b/components/myportal/topthree_reps.js
@@ -50,7 +50,6 @@ const TopThree = (props) => {
     });
 
     showTopThreeArr.sort(function compare(a, b) {
-        console.log(a.createdDate, b.createdDate);
         var dateA = new Date(a.createdDate);
         var dateB = new Date(b.createdDate);
         return dateB - dateA;
diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js
index 4d09d69f..782ae552 100644
--- a/components/search/dnssearchresults.js
+++ b/components/search/dnssearchresults.js
@@ -743,7 +743,10 @@ const DNSSearchResults = (props) => {
             {searchResultsObj["@odata.count"] > 5 && (
                 <div id="recordCountSelect" className="govuk-grid-row">
                     <div className="govuk-form-group">
-                        <label className="govuk-label-s " htmlFor="sort">
+                        <label
+                            className="govuk-label-s "
+                            htmlFor="showNumberOfRecords"
+                        >
                             {t("search:searchresults-show-records-label-a")}
                             <select
                                 onChange={(e) => {
diff --git a/components/search/searchresults.js b/components/search/searchresults.js
index 14dc51f9..2b9a6607 100644
--- a/components/search/searchresults.js
+++ b/components/search/searchresults.js
@@ -810,7 +810,7 @@ const SearchResults = (props) => {
                             <div className="govuk-form-group">
                                 <label
                                     className="govuk-label-s "
-                                    htmlFor="sort"
+                                    htmlFor="showNumberOfRecords"
                                 >
                                     {t(
                                         "search:searchresults-show-records-label-a"
diff --git a/styles/sass/welshgov/_application.scss b/styles/sass/welshgov/_application.scss
index 5c256212..3635f36f 100644
--- a/styles/sass/welshgov/_application.scss
+++ b/styles/sass/welshgov/_application.scss
@@ -2402,4 +2402,19 @@ fade {
     }
 
 
+}
+
+.govuk-link.watchCase {
+    background-color: transparent;
+    border: none;
+    cursor: pointer;
+
+    &:focus {
+        background-color: #ffd530 !important;
+        border-color: transparent !important;
+        color: #1f1f1f !important;
+        outline: 2px solid #1f1f1f;
+        text-decoration: none !important;
+        box-shadow: none;
+    }
 }
\ No newline at end of file