diff --git a/frontend/app.vue b/frontend/app.vue
index 9a9397c..2c454f9 100644
--- a/frontend/app.vue
+++ b/frontend/app.vue
@@ -27,7 +27,9 @@ const { data: globalsData } = await useAsyncData('globals', async () => {
       :pages="globalsData?.pages"
     />
     <Alert />
-    <NuxtPage />
+    <main class="page" id="main" tabindex="-1">
+      <NuxtPage />
+    </main>
     <Footer :globalData="globalsData?.global" />
   </div>
 </template>
diff --git a/frontend/components/navigation.vue b/frontend/components/navigation.vue
index 83458f0..5a6f650 100644
--- a/frontend/components/navigation.vue
+++ b/frontend/components/navigation.vue
@@ -15,6 +15,7 @@ defineProps({
           to="/blog" 
           class="block p-2 hover:underline text-red-600 hover:text-red-600"
           active-class="text-red-600"
+          :aria-current="$route.path === '/blog' ? 'page' : null"
         >
           Blog
         </NuxtLink>
@@ -24,6 +25,7 @@ defineProps({
           to="/guestbook" 
           class="block p-2 hover:underline text-red-600 hover:text-red-600"
           active-class="text-red-600"
+          :aria-current="$route.path === '/guestbook' ? 'page' : null"
         >
           Guestbook
         </NuxtLink>
@@ -33,6 +35,7 @@ defineProps({
           :to="page.uri" 
           class="block p-2 hover:underline text-red-600 hover:text-red-600"
           active-class="text-red-600"
+          :aria-current="$route.path === page.uri ? 'page' : null"
         >
           {{ page.title }}
         </NuxtLink>