diff --git a/components/case/representation/index.js b/components/case/representation/index.js
index db17e814..fdc56e91 100644
--- a/components/case/representation/index.js
+++ b/components/case/representation/index.js
@@ -322,9 +322,9 @@ let MakeRepresentation = (props) => {
             todaysDate <= statementDueDate &&
             buildArr.push("Statement");
 
-        currentView.caseReference.appealType != 846040004 &&
-            currentView.caseReference.appealType == 846040015 &&
-            currentView.caseReference.specialistProcess != 846040001 &&
+        (currentView.caseReference.appealType != 846040004 ||
+            (currentView.caseReference.appealType == 846040015 &&
+                currentView.caseReference.specialistProcess != 846040001)) &&
             todaysDate >= statementDueDate &&
             todaysDate <= finalCommentsDate &&
             buildArr.push("Final comments");
diff --git a/components/case/representation/representationAgent.js b/components/case/representation/representationAgent.js
index 64d97291..2babc922 100644
--- a/components/case/representation/representationAgent.js
+++ b/components/case/representation/representationAgent.js
@@ -196,31 +196,34 @@ const RepAgent = (props) => {
                     </div>
                 </>
             )}
-            <div className="govuk-grid-row">
-                <div className="govuk-button-group">
-                    <button
-                        type="submit"
-                        className="govuk-button"
-                        data-module="govuk-button"
-                    >
-                        {t("common:continue-button")}{" "}
-                    </button>
+            {typeof formObj.representationForm.values.representationType !=
+                "undefined" && (
+                <div className="govuk-grid-row">
+                    <div className="govuk-button-group">
+                        <button
+                            type="submit"
+                            className="govuk-button"
+                            data-module="govuk-button"
+                        >
+                            {t("common:continue-button")}
+                        </button>
 
-                    <a
-                        onClick={() => {
-                            setRepresentationCapacity();
-                            props.updateField(
-                                "representationForm",
-                                "representationCapacity",
-                                ""
-                            );
-                        }}
-                        className="govuk-link"
-                    >
-                        {t("common:back-link")}
-                    </a>
+                        <a
+                            onClick={() => {
+                                setRepresentationCapacity();
+                                props.updateField(
+                                    "representationForm",
+                                    "representationCapacity",
+                                    ""
+                                );
+                            }}
+                            className="govuk-link"
+                        >
+                            {t("common:back-link")}
+                        </a>
+                    </div>
                 </div>
-            </div>
+            )}
         </>
     );
 };
diff --git a/components/case/representation/representationAppellant.js b/components/case/representation/representationAppellant.js
index f7f8d9e1..a61f748f 100644
--- a/components/case/representation/representationAppellant.js
+++ b/components/case/representation/representationAppellant.js
@@ -180,31 +180,33 @@ const RepAppellant = (props) => {
                     </div>{" "}
                 </div>
             )}
-            <div className="govuk-grid-row">
-                <div className="govuk-button-group">
-                    <button
-                        type="submit"
-                        className="govuk-button"
-                        data-module="govuk-button"
-                    >
-                        {t("common:continue-button")}
-                    </button>
-
-                    <a
-                        onClick={() => {
-                            setRepresentationCapacity();
-                            props.updateField(
-                                "representationForm",
-                                "representationType",
-                                ""
-                            );
-                        }}
-                        className="govuk-link"
-                    >
-                        {t("common:back-link")}
-                    </a>
+            {typeof formObj.representationForm.values.representationType !=
+                "undefined" && (
+                <div className="govuk-grid-row">
+                    <div className="govuk-button-group">
+                        <button
+                            type="submit"
+                            className="govuk-button"
+                            data-module="govuk-button"
+                        >
+                            {t("common:continue-button")}
+                        </button>
+                        <a
+                            onClick={() => {
+                                setRepresentationCapacity();
+                                props.updateField(
+                                    "representationForm",
+                                    "representationType",
+                                    ""
+                                );
+                            }}
+                            className="govuk-link"
+                        >
+                            {t("common:back-link")}
+                        </a>
+                    </div>
                 </div>
-            </div>
+            )}
         </>
     );
 };
diff --git a/components/case/representation/representationElements.js b/components/case/representation/representationElements.js
index 78551695..18257770 100644
--- a/components/case/representation/representationElements.js
+++ b/components/case/representation/representationElements.js
@@ -468,7 +468,7 @@ export const RenderPickList = ({
     datafieldname,
     name,
     label,
-    input,
+    input: { onChange, value },
     optionsArr,
     meta: { touched, error },
     errorMsg,
@@ -493,14 +493,15 @@ export const RenderPickList = ({
                         {errorMsg}
                     </span>
                 )}
-
+                {value}
                 <div>
                     <select
-                        {...input}
+                        // {...input}
                         className="govuk-select "
                         id={datafieldname}
                         name={datafieldname}
                         disabled={custom.disabled}
+                        onChange={onChange}
                     >
                         <option>Select...</option>
                         {Object.keys(optionsArr).map((key, index) => {
diff --git a/components/case/representation/representationInterestedPartyPerson.js b/components/case/representation/representationInterestedPartyPerson.js
index 9ea438cb..052f89fe 100644
--- a/components/case/representation/representationInterestedPartyPerson.js
+++ b/components/case/representation/representationInterestedPartyPerson.js
@@ -157,36 +157,39 @@ const RepInterestedPartyPerson = (props) => {
                     </div>
                 </>
             )}
-            <div className="govuk-grid-row">
-                <div className="govuk-button-group">
-                    <button
-                        type="submit"
-                        className="govuk-button"
-                        data-module="govuk-button"
-                    >
-                        {t("common:continue-button")}
-                    </button>
+            {typeof formObj.representationForm.values.representationType !=
+                "undefined" && (
+                <div className="govuk-grid-row">
+                    <div className="govuk-button-group">
+                        <button
+                            type="submit"
+                            className="govuk-button"
+                            data-module="govuk-button"
+                        >
+                            {t("common:continue-button")}
+                        </button>
 
-                    <a
-                        onClick={() => {
-                            setRepresentationCapacity();
-                            props.updateField(
-                                "representationForm",
-                                "representationCapacity",
-                                ""
-                            );
-                            props.updateField(
-                                "representationForm",
-                                "representationType",
-                                ""
-                            );
-                        }}
-                        className="govuk-link"
-                    >
-                        {t("case:summary-back-button-label")}
-                    </a>
+                        <a
+                            onClick={() => {
+                                setRepresentationCapacity();
+                                props.updateField(
+                                    "representationForm",
+                                    "representationCapacity",
+                                    ""
+                                );
+                                props.updateField(
+                                    "representationForm",
+                                    "representationType",
+                                    ""
+                                );
+                            }}
+                            className="govuk-link"
+                        >
+                            {t("case:summary-back-button-label")}
+                        </a>
+                    </div>
                 </div>
-            </div>
+            )}
         </>
     );
 };
diff --git a/components/case/representation/representationLandowner.js b/components/case/representation/representationLandowner.js
index 57e28309..10c34e12 100644
--- a/components/case/representation/representationLandowner.js
+++ b/components/case/representation/representationLandowner.js
@@ -104,26 +104,28 @@ const RepLandOwner = (props) => {
                         </fieldset>
                     </div>{" "}
                 </div>
-
-                <div className="govuk-grid-row">
-                    <div className="govuk-button-group">
-                        <button
-                            type="submit"
-                            className="govuk-button"
-                            data-module="govuk-button"
-                        >
-                            {t("common:continue-button")}
-                        </button>
-                        <a
-                            onClick={() => {
-                                setRepresentationCapacity();
-                            }}
-                            className="govuk-link"
-                        >
-                            {t("common:back-link")}
-                        </a>
+                {typeof formObj.representationForm.values.representationType !=
+                    "undefined" && (
+                    <div className="govuk-grid-row">
+                        <div className="govuk-button-group">
+                            <button
+                                type="submit"
+                                className="govuk-button"
+                                data-module="govuk-button"
+                            >
+                                {t("common:continue-button")}
+                            </button>
+                            <a
+                                onClick={() => {
+                                    setRepresentationCapacity();
+                                }}
+                                className="govuk-link"
+                            >
+                                {t("common:back-link")}
+                            </a>
+                        </div>
                     </div>
-                </div>
+                )}
             </div>
         </div>
     );
diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js
index 77085ba6..a806edc3 100644
--- a/components/myportal/viewall.js
+++ b/components/myportal/viewall.js
@@ -657,6 +657,7 @@ const ViewAllResults = (props) => {
                             </button>
                         </dd>
                     )}
+
                     {currentView.viewKey == "watchedCases" && (
                         <dd className="govuk-summary-list__value govuk-!-font-size-16 cardModuleItem ">
                             <button