diff --git a/components/case/representation/index.js b/components/case/representation/index.js
index 5f290696..c694ea84 100644
--- a/components/case/representation/index.js
+++ b/components/case/representation/index.js
@@ -479,6 +479,8 @@ let MakeRepresentation = (props) => {
                     />;
                     break;
                 case "appellant":
+                case "apelydd":
+                case "Apelydd":
                 case t(
                     "myrepresentations:capacity-options-arr-appellant"
                 ).toLocaleLowerCase():
@@ -543,6 +545,8 @@ let MakeRepresentation = (props) => {
                     );
                     break;
                 case "agent":
+                case "Asiant":
+                case "asiant":
                 case t(
                     "myrepresentations:capacity-options-arr-agent"
                 ).toLowerCase():
@@ -1188,6 +1192,7 @@ let MakeRepresentation = (props) => {
                         </h1>
                         <div id="rep-form">
                             <div className="govuk-grid-column-three-quarters wgForm">
+                                www
                                 {whichControl()}
                             </div>
 
diff --git a/components/case/representation/representationAgent.js b/components/case/representation/representationAgent.js
index 1aad6080..c5c39db2 100644
--- a/components/case/representation/representationAgent.js
+++ b/components/case/representation/representationAgent.js
@@ -124,12 +124,7 @@ const RepAgent = (props) => {
                                     name="representationOnBehalfOf"
                                     datafieldname="representationOnBehalfOf"
                                     // label={t("myrepresentations:capacity-select-what-capacity-label")}
-                                    options={[
-                                        t(
-                                            "myrepresentations:questionnaire-yes"
-                                        ),
-                                        t("myrepresentations:questionnaire-no"),
-                                    ]}
+                                    options={["Yes", "No"]}
                                     id="representationOnBehalfOf"
                                     className="govuk-radios__input"
                                     errorMsg={t(
diff --git a/components/case/representation/representationElements.js b/components/case/representation/representationElements.js
index 06799dee..6057b18d 100644
--- a/components/case/representation/representationElements.js
+++ b/components/case/representation/representationElements.js
@@ -541,6 +541,13 @@ export const RenderPickList = ({
                                             : optionsArr[key] ==
                                               "Final comments"
                                             ? "Sylwadau terfynol"
+                                            : optionsArr[key] ==
+                                              "Written representations"
+                                            ? "Sylwadau ysgrifenedig"
+                                            : optionsArr[key] == "Inquiry"
+                                            ? "Ymchwiliad"
+                                            : optionsArr[key] == "Hearing"
+                                            ? "Gwrandawiad"
                                             : optionsArr[key]
                                         : optionsArr[key]}
                                 </option>
diff --git a/components/case/representation/representationLPA.js b/components/case/representation/representationLPA.js
index 5646ee95..477d5c9d 100644
--- a/components/case/representation/representationLPA.js
+++ b/components/case/representation/representationLPA.js
@@ -225,7 +225,8 @@ let RepLPA = (props) => {
                     {!_.has(
                         formObj["representationForm"],
                         ["values", "representationType"] ||
-                            typeof props.representationType != "undefined"
+                            typeof props.currentView.caseReference.repDetails !=
+                                "undefined"
                     ) ? (
                         <>
                             <label