diff --git a/components/homepage/login.js b/components/homepage/login.js
index 72ffeac0..ed565c0c 100644
--- a/components/homepage/login.js
+++ b/components/homepage/login.js
@@ -165,7 +165,6 @@ let Login = (props) => {
                   router.replace({
                       pathname:
                           router.locale == "cy" ? "/fymhorth" : "/myportal",
-                      shallow: true,
                   }))
                 : //setShowSpinnerState(false),
                   setValidLoginID(false);
diff --git a/components/myportal.js b/components/myportal.js
index 79fe02cf..5912aaa7 100644
--- a/components/myportal.js
+++ b/components/myportal.js
@@ -89,8 +89,18 @@ const MyPortal = (props) => {
                             alt={router.locale == "cy" ? "Defnyddiwr" : "User"}
                         />{" "}
                         <div className="serviceBanner_userDetails_name">
-                            {props.accountDetails.accountDetails.firstname}{" "}
-                            {props.accountDetails.accountDetails.lastname}
+                            <Link href="/account/personaldetails">
+                                <a className="govuk-button-secondary">
+                                    {
+                                        props.accountDetails.accountDetails
+                                            .firstname
+                                    }{" "}
+                                    {
+                                        props.accountDetails.accountDetails
+                                            .lastname
+                                    }
+                                </a>
+                            </Link>
                         </div>
                         <div>
                             <Link
@@ -117,16 +127,33 @@ const MyPortal = (props) => {
                         <div className="flex-container grid-row govuk-body ">
                             <MakeNewAppeal />
                             <SearchCases />
-                            <AwaitingSubmission
-                                awaitingSubmission={props.awaitingSubmission}
-                            />
-                            <MyCases myCases={props.myCases} />
-                            <WatchedCases watchedCases={props.watchedCases} />
-                            <MyRepresentations
-                                myRepresentations={props.myRepresentations}
-                            />
+                            {props.awaitingSubmission.awaitingSubmission[
+                                "@odata.count"
+                            ] > 0 && (
+                                <AwaitingSubmission
+                                    awaitingSubmission={
+                                        props.awaitingSubmission
+                                    }
+                                />
+                            )}
+                            {props.myCases.myCases["@odata.count"] > 0 && (
+                                <MyCases myCases={props.myCases} />
+                            )}
+                            {props.watchedCases.watchedCases["@odata.count"] >
+                                0 && (
+                                <WatchedCases
+                                    watchedCases={props.watchedCases}
+                                />
+                            )}
+                            {props.myRepresentations.myRepresentations[
+                                "@odata.count"
+                            ] > 0 && (
+                                <MyRepresentations
+                                    myRepresentations={props.myRepresentations}
+                                />
+                            )}
                             <Dns />
-                            <YourAccount />
+                            {/* <YourAccount /> */}
                             {showFileUpload == "true" && <UploadFile />}
                         </div>
                     </div>
diff --git a/components/myportal/mycases.js b/components/myportal/mycases.js
index 1b1ab822..73321722 100644
--- a/components/myportal/mycases.js
+++ b/components/myportal/mycases.js
@@ -24,9 +24,9 @@ const MyCases = (props) => {
                         topThreeType={"myCases"}
                     />
                 </div>
-                {props.myCases.myCases["@odata.count"] != 0 && (
+                {props.myCases.myCases["@odata.count"] > 3 && (
                     <div className="cardVieAll">
-                        <Link href="/myportal/viewall" shallow>
+                        <Link href="/myportal/viewall">
                             <a
                                 className="govuk-link--no-underline"
                                 onClick={() => {
diff --git a/components/myportal/myrepresentations.js b/components/myportal/myrepresentations.js
index a4db29a8..139c7dd4 100644
--- a/components/myportal/myrepresentations.js
+++ b/components/myportal/myrepresentations.js
@@ -21,12 +21,15 @@ const MyRepresentations = (props) => {
                 <div className="cardModuleContainer">
                     <TopThree
                         showTopThree={props.myRepresentations.myRepresentations}
+                        showDetails={
+                            props.myRepresentations.myRepresentationsDetails
+                        }
                         topThreeType={"myRepresentations"}
                     />
                 </div>
 
-                {props.myRepresentations.myRepresentations["@odata.count"] !=
-                    0 && (
+                {props.myRepresentations.myRepresentations["@odata.count"] >
+                    3 && (
                     <div className="cardVieAll">
                         <Link href="/myportal/viewall" shallow>
                             <a
diff --git a/components/myportal/topthree.js b/components/myportal/topthree.js
index b0094833..4a762a34 100644
--- a/components/myportal/topthree.js
+++ b/components/myportal/topthree.js
@@ -228,26 +228,40 @@ const TopThree = (props) => {
                             }
                         </div>
                     )}
-                    {topThreeType != "awaitingSubmission" ? (
-                        <div className="carModuleAddress">
-                            <b>{t("myportal:case-address")}:</b>{" "}
-                            {_.isEmpty(showDetails)
-                                ? t("myportal:case-address-not-entered")
-                                : _.isEmpty(showDetails[index])
-                                ? t("myportal:case-address-not-entered")
-                                : _.isEmpty(showDetails[index].value[0])
-                                ? t("myportal:case-address-not-entered")
-                                : _.isEmpty(
-                                      showDetails[index].value[0]
-                                          .pinswg_siteaddressline1
-                                  )
-                                ? t("myportal:case-address-not-entered")
-                                : showDetails[index].value[0]
-                                      .pinswg_siteaddressline1}
-                        </div>
-                    ) : (
-                        ""
-                    )}
+                    {/* {topThreeType != "awaitingSubmission" ? ( */}
+                    <div className="carModuleAddress">
+                        <b>{t("myportal:case-address")}:</b>{" "}
+                        {_.isEmpty(showDetails)
+                            ? t("myportal:case-address-not-entered")
+                            : _.isEmpty(showDetails[index])
+                            ? t("myportal:case-address-not-entered")
+                            : _.isEmpty(showDetails[index].value[0])
+                            ? t("myportal:case-address-not-entered")
+                            : _.isEmpty(
+                                  showDetails[index].value[0]
+                                      .pinswg_siteaddressline1
+                              )
+                            ? t("myportal:case-address-not-entered")
+                            : showDetails[index].value[0]
+                                  .pinswg_siteaddressline1 +
+                              (!_.isEmpty(
+                                  showDetails[index].value[0]
+                                      .pinswg_siteaddressline2
+                              )
+                                  ? ", " +
+                                    showDetails[index].value[0]
+                                        .pinswg_siteaddressline2
+                                  : "") +
+                              (!_.isEmpty(
+                                  showDetails[index].value[0]
+                                      .pinswg_siteaddresstown
+                              )
+                                  ? ", " +
+                                    showDetails[index].value[0]
+                                        .pinswg_siteaddresstown
+                                  : "")}
+                    </div>
+
                     {router.locale == "cy"
                         ? jsonpath.query(
                               transLookup,
diff --git a/components/myportal/watchedcases.js b/components/myportal/watchedcases.js
index 617ba86f..1d871c80 100644
--- a/components/myportal/watchedcases.js
+++ b/components/myportal/watchedcases.js
@@ -21,11 +21,12 @@ const WatchedCases = (props) => {
                 <div className="cardModuleContainer">
                     <TopThree
                         showTopThree={props.watchedCases.watchedCases}
+                        showDetails={props.watchedCases.watchedCasesDetails}
                         topThreeType={"watchedCases"}
                     />
                 </div>
 
-                {props.watchedCases.watchedCases["@odata.count"] != 0 && (
+                {props.watchedCases.watchedCases["@odata.count"] > 3 && (
                     <div className="cardVieAll">
                         <Link href="/myportal/viewall" shallow>
                             <a