diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index 20978f3..c257cfe 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -13,8 +13,8 @@
 // Tip: Use the "Theme Builder" on Quasar's documentation website.
 
 $primary: #019547;
-$secondary: #EFFFEF;
-$accent: #4ada86;
+$secondary: #DAE0E7;
+$accent: #81AFE3;
 
 $dark-font: #305530;
 $dark: #323232;
diff --git a/src/i18n/en-ca/index.ts b/src/i18n/en-ca/index.ts
index 0abf782..13a0655 100644
--- a/src/i18n/en-ca/index.ts
+++ b/src/i18n/en-ca/index.ts
@@ -32,8 +32,8 @@ export default {
     userMenuCalendar: 'Calendar',
   },
   notFoundPage: {
-    pageTitle: 'Oops. Nothing here...',
-    backButton: 'Go to the home page',
+    pageText: 'We cannot seem to find the page you are looking for, sorry!',
+    backButton: 'Take me back!',
   },
   loginPage: {
     title: 'Log in to Targo',
diff --git a/src/i18n/fr-ca/index.ts b/src/i18n/fr-ca/index.ts
index b3b61f9..f6ef5c9 100644
--- a/src/i18n/fr-ca/index.ts
+++ b/src/i18n/fr-ca/index.ts
@@ -171,8 +171,8 @@ export default {
     userMenuCalendar: 'Calendrier annuel',
   },
   notFoundPage: {
-    pageTitle: 'Oops. Rien ici...',
-    backButton: 'Aller à la page d’accueil',
+    pageText: 'On ne semble pas trouver la page que vous cherchez, désolé!',
+    backButton: 'Je veux retourner en arrière!',
   },
   notificationDialog: {
     notice: 'Notification',
diff --git a/src/modules/auth/composables/use-auth-api.ts b/src/modules/auth/composables/use-auth-api.ts
index 6f14402..8a7b8c2 100644
--- a/src/modules/auth/composables/use-auth-api.ts
+++ b/src/modules/auth/composables/use-auth-api.ts
@@ -1,5 +1,5 @@
 import { useAuthStore } from "../../../stores/auth-store";
-import type { User } from "src/modules/users/types/user-interface";
+import type { User } from "src/modules/shared/types/user-interface";
 
 export const useAuthApi = () => {
     const authStore = useAuthStore();
diff --git a/src/modules/auth/pages/auth-login.vue b/src/modules/auth/pages/auth-login.vue
index 012d43d..d08ca9d 100644
--- a/src/modules/auth/pages/auth-login.vue
+++ b/src/modules/auth/pages/auth-login.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
     import { ref, watch } from 'vue';
     import { useAuthApi } from '../composables/use-auth-api';
-    import type { User } from 'src/modules/users/types/user-interface';
-import { useRouter } from 'vue-router';
+    import type { User } from 'src/modules/shared/types/user-interface';
+    import { useRouter } from 'vue-router';
 
 
     const authApi = useAuthApi();
diff --git a/src/modules/auth/types/auth-interface.ts b/src/modules/auth/types/auth-interface.ts
index c27df68..6027520 100644
--- a/src/modules/auth/types/auth-interface.ts
+++ b/src/modules/auth/types/auth-interface.ts
@@ -1,4 +1,4 @@
-import type { User } from "src/modules/users/types/user-interface";
+import type { User } from "src/modules/shared/types/user-interface";
 
 export interface AuthState {
   token: string;
diff --git a/src/pages/error-page.vue b/src/pages/error-page.vue
index bc41d10..cbe39b9 100644
--- a/src/pages/error-page.vue
+++ b/src/pages/error-page.vue
@@ -3,25 +3,21 @@
 </script>
 
 <template>
-  <div class="fullscreen bg-blue text-white text-center q-pa-md flex flex-center">
-    <div>
-      <div style="font-size: 30vh">
-        404
-      </div>
-
-      <div class="text-h2" style="opacity:.4">
-        Oops. Nothing here...
-      </div>
-
-      <q-btn
-        class="q-mt-xl"
-        color="white"
-        text-color="blue"
-        unelevated
-        to="/"
-        label="Go Home"
-        no-caps
-      />
-    </div>
-  </div>
+  <q-layout view="hHh lpR fFf">
+    <q-page-container>
+      <q-page padding class="column justify-center items-center bg-secondary">
+        <q-card class="col-shrink rounded-20">         
+          <q-img src="src/assets/line-truck-1.jpg" height="20vh">
+            <div class="absolute-bottom text-h4 text-center text-weight-bolder justify-center items-center row">
+              <div class="q-pr-md text-primary text-h3 text-weight-bolder">404</div> 
+              PAGE NOT FOUND
+            </div>
+          </q-img>
+          <q-card-section class="text-center text-h5 text-primary">
+            {{$t('notFoundPage.pageText')}}
+          </q-card-section>
+        </q-card>
+      </q-page>
+    </q-page-container>
+  </q-layout>
 </template>
\ No newline at end of file
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 0c13dc2..18509ef 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -1,4 +1,5 @@
 import type { RouteRecordRaw } from 'vue-router';
+import { RouteNames } from './router-constants';
 
 const routes: RouteRecordRaw[] = [
   {
@@ -8,22 +9,27 @@ const routes: RouteRecordRaw[] = [
     children: [
       { 
         path: '', 
-        name: 'dashboard',
+        name: RouteNames.DASHBOARD,
         component: () => import('src/pages/test-page.vue'),
       },
+      {
+        path: 'timesheet-approvals',
+        name: RouteNames.TIMESHEET_APPROVALS,
+        component: () => import('src/modules/timesheet-approval/pages/timesheet-approval.vue'),
+      },
     ],
   },
 
   {
     path: '/v1/login', 
-    name: 'login',
+    name: RouteNames.LOGIN,
     component: () => import('src/modules/auth/pages/auth-login.vue'),
     meta: { requiresAuth: false },
   },
 
   {
     path: '/login-success', 
-    name: 'login-success',
+    name: RouteNames.LOGIN_SUCCESS,
     component: () => import('src/modules/auth/pages/auth-login-popup-success.vue'),
     meta: { requiresAuth: false },
   },