diff --git a/src/app/demo/components/auth/access/access.component.html b/src/app/demo/components/auth/access/access.component.html
index 3ec6d03..c592c6f 100644
--- a/src/app/demo/components/auth/access/access.component.html
+++ b/src/app/demo/components/auth/access/access.component.html
@@ -1,20 +1,16 @@
-<div class="surface-0 flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
-    <div class="grid justify-content-center p-2 lg:p-0" style="min-width:80%">
-        <div class="col-12 mt-5 xl:mt-0 text-center">
-            <img src="assets/demo/images/access/logo-orange.svg" alt="Sakai logo" class="mb-5" style="width:81px; height:60px;">
-        </div>
-        <div class="col-12 xl:col-6" style="border-radius:56px; padding:0.3rem; background: linear-gradient(180deg, rgba(247, 149, 48, 0.4) 10%, rgba(247, 149, 48, 0) 30%);">
-            <div class="h-full w-full m-0 py-7 px-4" style="border-radius:53px; background: linear-gradient(180deg, var(--surface-50) 38.9%, var(--surface-0));">
+<div class="surface-ground flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
+    <div class="flex flex-column align-items-center justify-content-center">
+        <img src="assets/demo/images/access/logo-orange.svg" alt="Sakai logo" class="mb-5 w-6rem flex-shrink-0">
+        <div style="border-radius:56px; padding:0.3rem; background: linear-gradient(180deg, rgba(247, 149, 48, 0.4) 10%, rgba(247, 149, 48, 0) 30%);">
+            <div class="w-full surface-card py-8 px-5 sm:px-8 flex flex-column align-items-center" style="border-radius:53px">
                 <div class="grid flex flex-column align-items-center">
                     <div class="flex justify-content-center align-items-center bg-orange-500 border-circle" style="width:3.2rem; height:3.2rem;">
                         <i class="text-50 pi pi-fw pi-lock text-2xl"></i>
                     </div>
                     <h1 class="text-900 font-bold text-4xl lg:text-5xl mb-2">Access Denied</h1>
-                    <span class="text-600 text-center">You do not have the necessary permisions. Please contact admins.</span>
-                    <img src="assets/demo/images/access/asset-access.svg" alt="Access denied" class="mt-5" width="80%">
-                    <div class="col-12 mt-5 text-center">
-                        <i class="pi pi-fw pi-arrow-left text-blue-500 mr-2" style="vertical-align:center;"></i><a href="#" class="text-blue-500">Go to Dashboard</a>
-                    </div>
+                    <span class="text-600 mb-5">You do not have the necessary permisions. Please contact admins.</span>
+                    <img src="assets/demo/images/access/asset-access.svg" alt="Access denied" class="mb-5" width="80%">
+                    <button pButton pRipple icon="pi pi-arrow-left" label="Go to Dashboard" class="p-button-text" [routerLink]="['/']"></button>
                 </div>
             </div>
         </div>
diff --git a/src/app/demo/components/auth/error/error.component.html b/src/app/demo/components/auth/error/error.component.html
index 03d8e14..f51f8c4 100644
--- a/src/app/demo/components/auth/error/error.component.html
+++ b/src/app/demo/components/auth/error/error.component.html
@@ -1,20 +1,16 @@
-<div class="surface-0 flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
-    <div class="grid justify-content-center p-2 lg:p-0" style="min-width:80%;">
-        <div class="col-12 mt-5 xl:mt-0 text-center">
-            <img src="assets/demo/images/error/logo-error.svg" alt="Sakai logo" class="mb-5" style="width:81px; height:60px;">
-        </div>
-        <div class="col-12 xl:col-6" style="border-radius:56px; padding:0.3rem; background: linear-gradient(180deg, rgba(233, 30, 99, 0.4) 10%, rgba(33, 150, 243, 0) 30%);">
-            <div class="h-full w-full m-0 py-7 px-4" style="border-radius:53px; background: linear-gradient(180deg, var(--surface-50) 38.9%, var(--surface-0));">
+<div class="surface-ground flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
+    <div class="flex flex-column align-items-center justify-content-center">
+        <img src="assets/demo/images/error/logo-error.svg" alt="Sakai logo" class="mb-5 w-6rem flex-shrink-0">
+        <div style="border-radius:56px; padding:0.3rem; background: linear-gradient(180deg, rgba(233, 30, 99, 0.4) 10%, rgba(33, 150, 243, 0) 30%);">
+            <div class="w-full surface-card py-8 px-5 sm:px-8 flex flex-column align-items-center" style="border-radius:53px">
                 <div class="grid flex flex-column align-items-center">
                     <div class="flex justify-content-center align-items-center bg-pink-500 border-circle" style="height:3.2rem; width:3.2rem;">
                         <i class="pi pi-fw pi-exclamation-circle text-2xl text-white"></i>
                     </div>
                     <h1 class="text-900 font-bold text-5xl mb-2">Error Occured</h1>
-                    <span class="text-600">Requested resource is not available.</span>
-                    <img src="assets/demo/images/error/asset-error.svg" alt="Error" class="mt-5" width="80%">
-                    <div class="col-12 mt-5 text-center">
-                        <i class="pi pi-fw pi-arrow-left text-blue-500 mr-2" style="vertical-align:center;"></i><a href="#" class="text-blue-500">Go to Dashboard</a>
-                    </div>
+                    <span class="text-600 mb-5">Requested resource is not available.</span>
+                    <img src="assets/demo/images/error/asset-error.svg" alt="Error" class="mb-5" width="80%">
+                    <button pButton pRipple icon="pi pi-arrow-left" label="Go to Dashboard" class="p-button-text" [routerLink]="['/']"></button>
                 </div>
             </div>
         </div>
diff --git a/src/app/demo/components/auth/login/login.component.html b/src/app/demo/components/auth/login/login.component.html
index 45c3955..e147466 100644
--- a/src/app/demo/components/auth/login/login.component.html
+++ b/src/app/demo/components/auth/login/login.component.html
@@ -23,7 +23,7 @@
                         </div>
                         <a class="font-medium no-underline ml-2 text-right cursor-pointer" style="color: var(--primary-color)">Forgot password?</a>
                     </div>
-                    <button pButton pRipple label="Sign In" class="w-full p-3 text-xl"></button>
+                    <button pButton pRipple label="Sign In" class="w-full p-3 text-xl" [routerLink]="['/']"></button>
                 </div>
             </div>
         </div>
diff --git a/src/app/demo/components/notfound/notfound.component.html b/src/app/demo/components/notfound/notfound.component.html
index 5dad9a4..d5b47dc 100644
--- a/src/app/demo/components/notfound/notfound.component.html
+++ b/src/app/demo/components/notfound/notfound.component.html
@@ -1,45 +1,39 @@
-<div class="surface-0 flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
-    <div class="grid justify-content-center p-2 lg:p-0" style="min-width:80%">
-        <div class="col-12 mt-5 xl:mt-0 text-center">
-            <img src="assets/demo/images/notfound/logo-blue.svg" alt="Sakai logo" class="mb-5" style="width:81px; height:60px;">
-        </div>
-        <div class="col-12 xl:col-6" style="border-radius:56px; padding:0.3rem; background: linear-gradient(180deg, rgba(33, 150, 243, 0.4) 10%, rgba(33, 150, 243, 0) 30%);">
-            <div class="flex justify-content-center h-full w-full m-0 py-7 px-4" style="border-radius:53px; background: linear-gradient(180deg, var(--surface-50) 38.9%, var(--surface-0));">
-                <div class="grid flex-column align-items-center">
-                    <span class="text-blue-500 font-bold text-3xl">404</span>
-                    <h1 class="text-900 font-bold text-3xl lg:text-5xl mb-2">Looks like you are lost</h1>
-                    <span class="text-600">Requested resource is not available.</span>
-                    <a href="/" class="col-12 flex align-items-center py-5 mt-6 border-300 border-bottom-1">
-                        <div class="flex justify-content-center align-items-center bg-cyan-400 border-round" style="height:3.5rem; width:3.5rem;">
-                            <i class="text-50 pi pi-fw pi-table text-2xl"></i>
-                        </div>
-                        <div class="ml-4">
-                            <p class="text-900 lg:text-xl font-medium mb-0 block">Frequently Asked Questions</p>
-                            <span class="text-600 lg:text-xl">Ultricies mi quis hendrerit dolor.</span>
-                        </div>
-                    </a>
-                    <a href="/" class="col-12 flex align-items-center py-5 border-300 border-bottom-1">
-                        <div class="flex justify-content-center align-items-center bg-orange-400 border-round" style="height:3.5rem; width:3.5rem;">
-                            <i class="pi pi-fw pi-question-circle text-50 text-2xl"></i>
-                        </div>
-                        <div class="ml-4">
-                            <p class="text-900 lg:text-xl font-medium mb-0">Solution Center</p>
-                            <span class="text-600 lg:text-xl">Phasellus faucibus scelerisque eleifend.</span>
-                        </div>
-                    </a>
-                    <a href="/" class="col-12 flex align-items-center py-5 border-300 border-bottom-1">
-                        <div class="flex justify-content-center align-items-center bg-indigo-400 border-round" style="height:3.5rem; width:3.5rem;">
-                            <i class="pi pi-fw pi-unlock text-50 text-2xl"></i>
-                        </div>
-                        <div class="ml-4">
-                            <p class="text-900 lg:text-xl font-medium mb-0">Permission Manager</p>
-                            <span class="text-600 lg:text-xl">Accumsan in nisl nisi scelerisque</span>
-                        </div>
-                    </a>
-                    <div class="col-12 mt-5 text-center">
-                        <i class="pi pi-fw pi-arrow-left text-blue-500 mr-2" style="vertical-align:center;"></i><a href="#" class="text-blue-500">Go to Dashboard</a>
-                    </div>
-                </div>
+<div class="surface-ground flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
+    <div class="flex flex-column align-items-center justify-content-center">
+        <img src="assets/demo/images/notfound/logo-blue.svg" alt="Sakai logo" class="mb-5 w-6rem flex-shrink-0">
+        <div style="border-radius:56px; padding:0.3rem; background: linear-gradient(180deg, rgba(33, 150, 243, 0.4) 10%, rgba(33, 150, 243, 0) 30%);">
+            <div class="w-full surface-card py-8 px-5 sm:px-8 flex flex-column align-items-center" style="border-radius:53px">
+                <span class="text-blue-500 font-bold text-3xl">404</span>
+                <h1 class="text-900 font-bold text-3xl lg:text-5xl mb-2">Not Found</h1>
+                <div class="text-600 mb-5">Requested resource is not available.</div>
+                <a [routerLink]="['/']" class="w-full flex align-items-center py-5 border-300 border-bottom-1">
+                    <span class="flex justify-content-center align-items-center bg-cyan-400 border-round" style="height:3.5rem; width:3.5rem;">
+                        <i class="text-50 pi pi-fw pi-table text-2xl"></i>
+                    </span>
+                    <span class="ml-4 flex flex-column">
+                        <span class="text-900 lg:text-xl font-medium mb-0 block">Frequently Asked Questions</span>
+                        <span class="text-600 lg:text-xl">Ultricies mi quis hendrerit dolor.</span>
+                    </span>
+                </a>
+                <a [routerLink]="['/']" class="w-full flex align-items-center py-5 border-300 border-bottom-1">
+                    <span class="flex justify-content-center align-items-center bg-orange-400 border-round" style="height:3.5rem; width:3.5rem;">
+                        <i class="pi pi-fw pi-question-circle text-50 text-2xl"></i>
+                    </span>
+                    <span class="ml-4 flex flex-column">
+                        <span class="text-900 lg:text-xl font-medium mb-0">Solution Center</span>
+                        <span class="text-600 lg:text-xl">Phasellus faucibus scelerisque eleifend.</span>
+                    </span>
+                </a>
+                <a [routerLink]="['/']" class="w-full flex align-items-center mb-5 py-5 border-300 border-bottom-1">
+                    <span class="flex justify-content-center align-items-center bg-indigo-400 border-round" style="height:3.5rem; width:3.5rem;">
+                        <i class="pi pi-fw pi-unlock text-50 text-2xl"></i>
+                    </span>
+                    <span class="ml-4 flex flex-column">
+                        <span class="text-900 lg:text-xl font-medium mb-0">Permission Manager</span>
+                        <span class="text-600 lg:text-xl">Accumsan in nisl nisi scelerisque</span>
+                    </span>
+                </a>
+                <button pButton pRipple icon="pi pi-arrow-left" label="Go to Dashboard" class="p-button-text" [routerLink]="['/']"></button>
             </div>
         </div>
     </div>