diff --git a/locale/pl/nouns/NounsNav.vue b/locale/pl/nouns/NounsNav.vue
index 1c0b3b09..93e78a4a 100644
--- a/locale/pl/nouns/NounsNav.vue
+++ b/locale/pl/nouns/NounsNav.vue
@@ -1,18 +1,18 @@
 <template>
     <section>
         <div class="d-none d-md-inline-flex btn-group btn-block mb-2">
-            <a v-for="{name, icon, route} in links" :href="`/${config.nouns.route}/${route}`"
-               :class="['btn', $route.fullPath === `/${encodeURIComponent(config.nouns.route)}/${encodeURIComponent(route)}` ? 'btn-primary' : 'btn-outline-primary']">
+            <router-link v-for="{name, icon, route} in links" :to="buildRoute(route)"
+                         :class="['btn', isActiveRoute(route) ? 'btn-primary' : 'btn-outline-primary']">
                 <Icon :v="icon"/>
                 <T>nouns.{{name}}.header</T>
-            </a>
+            </router-link>
         </div>
         <div class="d-block d-md-none btn-group-vertical btn-block mb-2">
-            <a v-for="{name, icon, route} in links" :href="`/${config.nouns.route}/${route}`"
-               :class="['btn', $route.fullPath === `/${encodeURIComponent(config.nouns.route)}/${encodeURIComponent(route)}` ? 'btn-primary' : 'btn-outline-primary']">
+            <router-link v-for="{name, icon, route} in links" :to="buildRoute(route)"
+                         :class="['btn', isActiveRoute(route) ? 'btn-primary' : 'btn-outline-primary']">
                 <Icon :v="icon"/>
                 <T>nouns.{{name}}.header</T>
-            </a>
+            </router-link>
         </div>
     </section>
 </template>
@@ -38,5 +38,13 @@
                 links,
             };
         },
+        methods: {
+            buildRoute(route) {
+                return `/${this.config.nouns.route}/${route}`;
+            },
+            isActiveRoute(route) {
+                return decodeURIComponent(this.$route.fullPath) === this.buildRoute(route);
+            },
+        }
     }
 </script>
diff --git a/locale/pl/nouns/dukatywy.vue b/locale/pl/nouns/dukatywy.vue
index 7576a7d2..8ed3f528 100644
--- a/locale/pl/nouns/dukatywy.vue
+++ b/locale/pl/nouns/dukatywy.vue
@@ -1,16 +1,11 @@
 <template>
     <div>
-        <h2>
-            <Icon v="book"/>
-            <T>nouns.headerLonger</T>
-        </h2>
-
         <NounsNav/>
 
-        <h3>
+        <h2>
             <Icon v="ghost"/>
             <T>nouns.dukajNouns.header</T>
-        </h3>
+        </h2>
 
         <div class="d-flex flex-column flex-md-row">
             <div>
diff --git a/locale/pl/nouns/neutratywy.vue b/locale/pl/nouns/neutratywy.vue
index ae2aa3f7..91125df5 100644
--- a/locale/pl/nouns/neutratywy.vue
+++ b/locale/pl/nouns/neutratywy.vue
@@ -1,16 +1,11 @@
 <template>
     <div>
-        <h2>
-            <Icon v="book"/>
-            <T>nouns.headerLonger</T>
-        </h2>
-
         <NounsNav/>
 
-        <h3>
+        <h2>
             <Icon v="deer"/>
             <T>nouns.neuterNouns.header</T>
-        </h3>
+        </h2>
 
         <div class="d-flex flex-column flex-md-row">
             <div>
diff --git a/locale/pl/nouns/osobatywy.vue b/locale/pl/nouns/osobatywy.vue
index 6f8db175..5d3b12dd 100644
--- a/locale/pl/nouns/osobatywy.vue
+++ b/locale/pl/nouns/osobatywy.vue
@@ -1,17 +1,12 @@
 <template>
     <div>
-        <h2>
-            <Icon v="book"/>
-            <T>nouns.headerLonger</T>
-        </h2>
-
         <NounsNav/>
 
-        <h3>
+        <h2>
             <Icon v="user-friends"/>
             <T>nouns.personNouns.header</T>
             <small><NormativeBadge/></small>
-        </h3>
+        </h2>
 
         <section>
             <T>nouns.personNouns.info</T>
diff --git a/routes/inclusive.vue b/routes/inclusive.vue
index 89157430..0bc6323a 100644
--- a/routes/inclusive.vue
+++ b/routes/inclusive.vue
@@ -1,16 +1,11 @@
 <template>
     <div>
-        <h2>
-            <Icon v="book"/>
-            <T>nouns.headerLonger</T>
-        </h2>
-
         <NounsNav/>
 
-        <h3>
+        <h2>
             <Icon v="book-heart"/>
             <T>nouns.inclusive.headerLong</T>
-        </h3>
+        </h2>
 
         <section>
             <T>nouns.inclusive.info</T>
diff --git a/routes/nouns.vue b/routes/nouns.vue
index d9faa4c0..43ce18db 100644
--- a/routes/nouns.vue
+++ b/routes/nouns.vue
@@ -1,12 +1,12 @@
 <template>
     <div>
+        <NounsNav/>
+
         <h2>
             <Icon v="book"/>
             <T>nouns.headerLonger</T>
         </h2>
 
-        <NounsNav/>
-
         <section>
             <T>nouns.intro</T>
 
diff --git a/routes/queerTerms.vue b/routes/queerTerms.vue
index 98feb9c9..3c1f1eeb 100644
--- a/routes/queerTerms.vue
+++ b/routes/queerTerms.vue
@@ -1,16 +1,11 @@
 <template>
     <div>
-        <h2>
-            <Icon v="book"/>
-            <T>nouns.headerLonger</T>
-        </h2>
-
         <NounsNav/>
 
-        <h3>
+        <h2>
             <Icon v="flag"/>
             <T>nouns.terms.headerLong</T>
-        </h3>
+        </h2>
 
         <section>
             <T>nouns.terms.info</T>