diff --git a/app/components/admin/Answer.vue b/app/components/admin/Answer.vue
index 263c269..42afb6d 100644
--- a/app/components/admin/Answer.vue
+++ b/app/components/admin/Answer.vue
@@ -145,7 +145,7 @@ async function submit() {
         <ClickableImage
           v-if="answer.picture?.url"
           :src="answer.picture.url"
-          :title="`${tKey(quest, 'title')}  –  ${answer.team.name}`"
+          :title="`${tKey(quest, 'title').value}  –  ${answer.team.name}`"
           class="h-48"
         />
         <h3 v-if="quest.textSolution">Solution:</h3>
diff --git a/app/pages/hunt/[huntSlug]/[questSlug]/admin.vue b/app/pages/hunt/[huntSlug]/[questSlug]/admin.vue
index 8132450..c7329bb 100644
--- a/app/pages/hunt/[huntSlug]/[questSlug]/admin.vue
+++ b/app/pages/hunt/[huntSlug]/[questSlug]/admin.vue
@@ -45,7 +45,7 @@ titleStore.title = data.value ? tKey(data.value, 'title').value : undefined;
             `/hunt/${data ? tSluggy(data.hunt).value : sluggy(huntSlug!)}`
           )
         "
-        >{{ t('pages.common.back_to_hunt') }}</VaButton
+        >{{ t('page.common.back_to_hunt') }}</VaButton
       >
       <VaButton icon="replay" color="success" @click="refresh"
         >Refresh</VaButton
diff --git a/app/pages/hunt/[huntSlug]/[questSlug]/index.vue b/app/pages/hunt/[huntSlug]/[questSlug]/index.vue
index 89c824f..44e5616 100644
--- a/app/pages/hunt/[huntSlug]/[questSlug]/index.vue
+++ b/app/pages/hunt/[huntSlug]/[questSlug]/index.vue
@@ -114,7 +114,7 @@ const createImageURL = (file: File) => URL.createObjectURL(file);
             `/hunt/${data ? tSluggy(data.hunt).value : sluggy(huntSlug!)}`
           )
         "
-        >{{ t('pages.common.back_to_hunt') }}</VaButton
+        >{{ t('page.common.back_to_hunt') }}</VaButton
       >
       <VaButton
         icon="refresh"
@@ -134,7 +134,7 @@ const createImageURL = (file: File) => URL.createObjectURL(file);
             `/hunt/${data?.hunt ? tSluggy(data.hunt).value : sluggy(huntSlug!)}/${data ? tSluggy(data).value : sluggy(questSlug!)}}/admin`
           )
         "
-        >{{ t('pages.common.admin') }}</VaButton
+        >{{ t('page.common.admin') }}</VaButton
       ></VaButtonGroup
     >
     <div v-if="data">
diff --git a/app/pages/hunt/[huntSlug]/diashow.vue b/app/pages/hunt/[huntSlug]/diashow.vue
index 1582d2f..dda2469 100644
--- a/app/pages/hunt/[huntSlug]/diashow.vue
+++ b/app/pages/hunt/[huntSlug]/diashow.vue
@@ -54,7 +54,7 @@ const { data, refresh, error } = await useFetch(`/api/hunt/${id}/diashow`, {
 useHead({
   title: t('layouts.two_title', {
     title: data.value?.name || name,
-    subtitle: t('pages.diashow.head')
+    subtitle: t('page.diashow.head')
   })
 });
 
@@ -93,7 +93,7 @@ titleStore.title = data.value?.name;
       class="flex h-full w-full flex-col items-center justify-center text-center text-2xl"
     >
       <VaAlert color="danger" class="w-[90%]">{{
-        t('pages.common.not_revealed')
+        t('page.common.not_revealed')
       }}</VaAlert>
       <VaAlert v-if="error.statusCode !== 403" color="danger" class="w-[90%]">{{
         error
@@ -101,7 +101,7 @@ titleStore.title = data.value?.name;
       ><VaButton
         icon="arrow_back"
         :to="$localePath(`/hunt/${sluggy($nuxt.$slugData.huntSlug!)}`)"
-        >{{ t('pages.common.back_to_hunt') }}</VaButton
+        >{{ t('page.common.back_to_hunt') }}</VaButton
       >
     </div>
     <div
@@ -109,12 +109,12 @@ titleStore.title = data.value?.name;
       class="flex h-full w-full flex-col items-center justify-center text-center text-2xl"
     >
       <VaAlert color="danger" class="w-[90%]">{{
-        t('pages.common.not_revealed')
+        t('page.common.not_revealed')
       }}</VaAlert
       ><VaButton
         icon="arrow_back"
         :to="$localePath(`/hunt/${sluggy($nuxt.$slugData.huntSlug!)}`)"
-        >{{ t('pages.common.back_to_hunt') }}</VaButton
+        >{{ t('page.common.back_to_hunt') }}</VaButton
       >
     </div>
   </article>
diff --git a/app/pages/hunt/[huntSlug]/pictures.vue b/app/pages/hunt/[huntSlug]/pictures.vue
index f6a9cb8..d1d7022 100644
--- a/app/pages/hunt/[huntSlug]/pictures.vue
+++ b/app/pages/hunt/[huntSlug]/pictures.vue
@@ -67,7 +67,7 @@ const { data, refresh, error } = await useFetch(`/api/hunt/${id}/diashow`, {
 useHead({
   title: t('layouts.two_title', {
     title: hasKey(data.value, 'name') ? tKey(data.value!, 'name').value : name,
-    subtitle: t('pages.pictures.head')
+    subtitle: t('page.pictures.head')
   })
 });
 
@@ -88,14 +88,14 @@ titleStore.title = data.value ? tKey(data.value, 'name').value : undefined;
           :key="pic.picture.url"
           :src="pic.picture.url"
           class="h-auto max-w-full rounded-lg"
-          :title="`${tKey(pic.quest, 'title')} — ${pic.team.name} — ${pic.picture.creator.name}`"
+          :title="`${tKey(pic.quest, 'title').value} — ${pic.team.name} — ${pic.picture.creator.name}`"
         />
       </div>
       <VaAlert
         v-if="data.count <= 0"
         color="warning"
         class="sm:col-span-2 md:col-span-3 lg:col-span-4"
-        >{{ t('pages.common.no_pictures') }}</VaAlert
+        >{{ t('page.common.no_pictures') }}</VaAlert
       >
     </div>
     <div
@@ -103,7 +103,7 @@ titleStore.title = data.value ? tKey(data.value, 'name').value : undefined;
       class="flex h-full w-full flex-col items-center justify-center text-center text-2xl"
     >
       <VaAlert color="danger" class="w-[90%]">{{
-        t('pages.common.not_revealed')
+        t('page.common.not_revealed')
       }}</VaAlert>
       <VaAlert v-if="error.statusCode !== 403" color="danger" class="w-[90%]">{{
         error
@@ -111,7 +111,7 @@ titleStore.title = data.value ? tKey(data.value, 'name').value : undefined;
       ><VaButton
         icon="arrow_back"
         :to="$localePath(`/hunt/${sluggy($nuxt.$slugData.huntSlug!)}`)"
-        >{{ t('pages.common.back_to_hunt') }}</VaButton
+        >{{ t('page.common.back_to_hunt') }}</VaButton
       >
     </div>
     <div
@@ -119,12 +119,12 @@ titleStore.title = data.value ? tKey(data.value, 'name').value : undefined;
       class="flex h-full w-full flex-col items-center justify-center text-center text-2xl"
     >
       <VaAlert color="danger" class="w-[90%]">{{
-        t('pages.common.not_revealed')
+        t('page.common.not_revealed')
       }}</VaAlert
       ><VaButton
         icon="arrow_back"
         :to="$localePath(`/hunt/${sluggy($nuxt.$slugData.huntSlug!)}`)"
-        >{{ t('pages.common.back_to_hunt') }}</VaButton
+        >{{ t('page.common.back_to_hunt') }}</VaButton
       >
     </div>
   </article>
diff --git a/app/pages/hunt/[huntSlug]/showcase.vue b/app/pages/hunt/[huntSlug]/showcase.vue
index 299b5dc..ca84268 100644
--- a/app/pages/hunt/[huntSlug]/showcase.vue
+++ b/app/pages/hunt/[huntSlug]/showcase.vue
@@ -265,7 +265,7 @@ const columns = leaderboardColumns.map((c) =>
     ><VaButton
       icon="arrow_back"
       :to="$localePath(`/hunt/${sluggy($nuxt.$slugData.huntSlug!)}`)"
-      >{{ t('pages.common.back_to_hunt') }}</VaButton
+      >{{ t('page.common.back_to_hunt') }}</VaButton
     >
   </article>
 </template>
diff --git a/app/pages/profile.vue b/app/pages/profile.vue
index 4c4adfc..8961b98 100644
--- a/app/pages/profile.vue
+++ b/app/pages/profile.vue
@@ -141,8 +141,8 @@ async function submitPassword() {
               v-model="password.old"
               class="w-full"
               :type="isPasswordVisible.value ? 'text' : 'password'"
-              :label="t('pages.profile.old_password')"
-              :placeholder="t('pages.profile.old_password')"
+              :label="t('page.profile.old_password')"
+              :placeholder="t('page.profile.old_password')"
               autocomplete="current-password"
               :minlength="8"
               required
@@ -179,7 +179,7 @@ async function submitPassword() {
               v-model="password.password"
               class="w-full"
               :type="isPasswordVisible.value ? 'text' : 'password'"
-              :label="t('pages.profile.new_password')"
+              :label="t('page.profile.new_password')"
               :placeholder="t('auth.password')"
               autocomplete="current-password"
               :minlength="8"
@@ -234,7 +234,7 @@ async function submitPassword() {
       </VaCardContent>
     </VaCard>
     <VaCard stripe stripe-color="primary">
-      <VaCardTitle>{{ t('pages.profile.uploaded_pictures') }}</VaCardTitle>
+      <VaCardTitle>{{ t('page.profile.uploaded_pictures') }}</VaCardTitle>
       <VaCardContent v-if="data && data.uploadedFiles.length > 0">
         <VaCarousel
           stateful
@@ -264,7 +264,7 @@ async function submitPassword() {
           >
         </VaCarousel>
       </VaCardContent>
-      <VaCardContent v-else>{{ t('pages.profile.no_pictures') }}</VaCardContent>
+      <VaCardContent v-else>{{ t('page.profile.no_pictures') }}</VaCardContent>
     </VaCard>
   </div>
 </template>