diff --git a/components/myportal/awaitingsubmission.js b/components/myportal/awaitingsubmission.js
index 88bff7e7..42c215b7 100644
--- a/components/myportal/awaitingsubmission.js
+++ b/components/myportal/awaitingsubmission.js
@@ -23,24 +23,30 @@ const AwaitingSubmission = (props) => {
                         showTopThree={
                             props.awaitingSubmission.awaitingSubmission
                         }
+                        showDetails={
+                            props.awaitingSubmission.awaitingSubmissionDetails
+                        }
                         topThreeType={"awaitingSubmission"}
                     />
                 </div>
-                <div className="cardVieAll">
-                    <Link href="/myportal/viewall">
-                        <a
-                            className="govuk-link--no-underline"
-                            onClick={() => {
-                                setCurrentView({
-                                    "viewName": "Awaiting Submission",
-                                    "viewKey": "awaitingSubmission",
-                                });
-                            }}
-                        >
-                            {t("myportal:viewall-link")}
-                        </a>
-                    </Link>
-                </div>
+                {props.awaitingSubmission.awaitingSubmission["@odata.count"] >
+                    3 && (
+                    <div className="cardVieAll">
+                        <Link href="/myportal/viewall">
+                            <a
+                                className="govuk-link--no-underline"
+                                onClick={() => {
+                                    setCurrentView({
+                                        "viewName": "Awaiting Submission",
+                                        "viewKey": "awaitingSubmission",
+                                    });
+                                }}
+                            >
+                                {t("myportal:viewall-link")}
+                            </a>
+                        </Link>
+                    </div>
+                )}
             </div>
         </div>
     );
diff --git a/pages/_error.js b/pages/_error.js
index a478361e..03c19e07 100644
--- a/pages/_error.js
+++ b/pages/_error.js
@@ -4,6 +4,8 @@ import Link from "next/link";
 import CookieBanner from "../components/cookieBanner";
 import Footer from "../components/footer";
 import Header from "../components/header";
+import { parseCookies, setCookie, destroyCookie } from "nookies";
+import { useSession, signIn, signOut } from "next-auth/react";
 
 function Error({ statusCode }, props) {
     let { t, lang } = useTranslation();
@@ -29,9 +31,19 @@ function Error({ statusCode }, props) {
                                         ? `An error ${statusCode} occurred on server`
                                         : t("common:error-page-message")}
                                 </p>
-                                <Link href="/">
-                                    <a>Go back home</a>
-                                </Link>
+
+                                <a
+                                    onClick={() => {
+                                        destroyCookie({}, "pinsUser"),
+                                            window.localStorage.clear(),
+                                            signOut({
+                                                callbackUrl: "/",
+                                            });
+                                    }}
+                                >
+                                    {" "}
+                                    Go back home
+                                </a>
                             </div>
                         </div>
                     </main>