diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vue
index a1b7ca9..044e3a2 100644
--- a/frontend/layouts/default.vue
+++ b/frontend/layouts/default.vue
@@ -49,6 +49,13 @@
                             :collapsed="ui.sidebarCollapsed"
                             sub
                         />
+                        <SidebarLink
+                            :to="`/projects/${currentProjectId}/archives`"
+                            icon="mdi:archive-outline"
+                            label="Archives"
+                            :collapsed="ui.sidebarCollapsed"
+                            sub
+                        />
 
                     </template>
                     <SidebarLink
@@ -84,14 +91,12 @@
                 </div>
             </aside>
 
-            <div class="h-full flex-1 overflow-hidden flex flex-col">
+            <div class="h-full flex-1 flex flex-col min-h-0">
                 <AppTopNav :user="auth.user" />
-                <div class="relative flex-1 overflow-hidden bg-white">
-                    <div aria-hidden="true" class="pointer-events-none absolute inset-x-0 top-0 z-30 h-12 bg-white" />
-                    <main class="h-full overflow-y-auto px-16 pt-12 pb-24">
-                        <slot/>
-                    </main>
-                </div>
+                <main class="flex-1 overflow-y-auto bg-white px-16 pb-24">
+                    <div aria-hidden="true" class="pointer-events-none sticky top-0 z-30 h-12 bg-white" />
+                    <slot/>
+                </main>
             </div>
         </div>
 
@@ -100,7 +105,7 @@
             :entry="timerStore.pendingCompleteEntry"
             :users="refData.users"
             :projects="refData.projects"
-            :types="refData.types"
+            :tags="refData.tags"
             @saved="onCompleteSaved"
         />
     </div>
@@ -109,7 +114,7 @@
 <script setup lang="ts">
 import type { UserData } from '~/services/dto/user-data'
 import type { Project } from '~/services/dto/project'
-import type { TaskType } from '~/services/dto/task-type'
+import type { TaskTag } from '~/services/dto/task-tag'
 import { useAppVersion } from '~/composables/useAppVersion'
 import { extractHydraMembers } from '~/utils/api'
 
@@ -155,7 +160,7 @@ const completeDrawerOpen = ref(false)
 const refData = reactive({
     users: [] as UserData[],
     projects: [] as Project[],
-    types: [] as TaskType[],
+    tags: [] as TaskTag[],
     loaded: false,
 })
 
@@ -165,11 +170,11 @@ async function loadRefData() {
     const [usersData, projectsData, typesData] = await Promise.all([
         api.get<any>('/users'),
         api.get<any>('/projects'),
-        api.get<any>('/task_types'),
+        api.get<any>('/task_tags'),
     ])
     refData.users = extractHydraMembers(usersData)
     refData.projects = extractHydraMembers(projectsData)
-    refData.types = extractHydraMembers(typesData)
+    refData.tags = extractHydraMembers(typesData)
     refData.loaded = true
 }