diff --git a/.eslintrc b/.eslintrc
index f03a56fe..ee1d2c9f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,9 @@
 {
-  "extends": "next",
+  "extends": "next/core-web-vitals",
   "rules": {
-    "@next/next/no-img-element": "off"
+    "@next/next/no-img-element": "off",
+    "react/no-unknown-property": "error"
   }
 }
+
+
diff --git a/components/case/documents.js b/components/case/documents.js
index 21218c5c..9194b687 100644
--- a/components/case/documents.js
+++ b/components/case/documents.js
@@ -387,7 +387,7 @@ const DocumentDetails = (props) => {
         getSearchDocumentTypes(props.incidentid).then((data) => {
             setDocumentTypes(data);
         });
-    });
+    }, [props.incidentid]);
 
     const getDocumentResults = useCallback(
         (pageNumber, orderBy, fieldSort) => {
diff --git a/components/cookiemanager/index.js b/components/cookiemanager/index.js
index 93c01dbb..b4dc457a 100644
--- a/components/cookiemanager/index.js
+++ b/components/cookiemanager/index.js
@@ -205,7 +205,6 @@ const CookieManagementMain = (props) => {
                                                     name="usage"
                                                     className="govuk-radios__input"
                                                     id="usage-1"
-                                                    component="input"
                                                     type="radio"
                                                     value="revoked"
                                                     checked={
@@ -234,7 +233,6 @@ const CookieManagementMain = (props) => {
                                                     name="usage"
                                                     type="radio"
                                                     value="accepted"
-                                                    component="input"
                                                     checked={
                                                         usageState ===
                                                         "accepted"
@@ -352,7 +350,6 @@ const CookieManagementMain = (props) => {
                                                 name="settings"
                                                 type="radio"
                                                 value="revoked"
-                                                component="input"
                                                 checked={
                                                     settingsState === "revoked"
                                                 }
@@ -379,7 +376,6 @@ const CookieManagementMain = (props) => {
                                                 name="settings"
                                                 type="radio"
                                                 value="accepted"
-                                                component="input"
                                                 checked={
                                                     settingsState === "accepted"
                                                 }
diff --git a/components/elements/index.js b/components/elements/index.js
index 98533d8d..6fc76b5e 100644
--- a/components/elements/index.js
+++ b/components/elements/index.js
@@ -94,7 +94,7 @@ export function Textfield(props) {
                         type="text"
                         name={name}
                         id={props.name}
-                        component={RenderCaseID}
+                        //component={RenderCaseID}
                         value={ticketnumber}
                         className="govuk-input  govuk-input--width-20"
                         disabled
@@ -1195,7 +1195,7 @@ export function ReadOnlyfield(props) {
                     type="text"
                     name={props.name}
                     id={props.name}
-                    component={RenderCaseID}
+                    //component={RenderCaseID}
                     value={value}
                     className="govuk-input  govuk-input--width-20"
                     disabled
diff --git a/components/newappeal/complete.js b/components/newappeal/complete.js
index 4bb254d9..9670ee4a 100644
--- a/components/newappeal/complete.js
+++ b/components/newappeal/complete.js
@@ -66,6 +66,7 @@ let CompleteAppeal = (props) => {
         props.appealType.appealLPA,
         props.props.accountDetails.loggedinUserId,
         props.appealType.appealTypeID,
+        props.props.accountDetails.loggedinUserEmail,
     ]);
 
     let { t } = useTranslation();
diff --git a/components/timeout/timeoutmodal.js b/components/timeout/timeoutmodal.js
index 4b60749f..fadd8c82 100644
--- a/components/timeout/timeoutmodal.js
+++ b/components/timeout/timeoutmodal.js
@@ -6,6 +6,7 @@ const TimeoutModal = (props) => {
 
     return (
         <div className={showModal == false ? "modal fade" : "modal fade show"}>
+            {/* <div backdrop="static" className="modal-dialog"> */}
             <div backdrop="static" className="modal-dialog">
                 <div className="modal-content">
                     <h3>
diff --git a/components/tracking/index.js b/components/tracking/index.js
index 4ade8ccb..7cf5fa1b 100644
--- a/components/tracking/index.js
+++ b/components/tracking/index.js
@@ -1,8 +1,11 @@
 import React, { Fragment } from "react";
+import Script from "next/script";
 
 export const Tracking = ({ googleTagManagerID, nonce }) => (
     <Fragment>
-        <script
+        <Script
+            id="google-analytics"
+            strategy="afterInteractive"
             nonce={nonce}
             dangerouslySetInnerHTML={{
                 __html: `(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
diff --git a/pages/error.js b/pages/error.js
index 39bb90f0..68fe06a8 100644
--- a/pages/error.js
+++ b/pages/error.js
@@ -33,7 +33,7 @@ function Error({ statusCode }, props) {
                                 </p>
 
                                 <a
-                                    href="/"
+                                    href="#"
                                     className="govuk-link"
                                     onClick={() => {
                                         destroyCookie({}, "pinsUser"),