diff --git a/locale/pl/nouns/NounsNav.vue b/locale/pl/nouns/NounsNav.vue
index d88d34f57..1c0b3b099 100644
--- a/locale/pl/nouns/NounsNav.vue
+++ b/locale/pl/nouns/NounsNav.vue
@@ -1,13 +1,15 @@
 <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 btn-outline-primary">
+            <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']">
                 <Icon :v="icon"/>
                 <T>nouns.{{name}}.header</T>
             </a>
         </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 btn-outline-primary">
+            <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']">
                 <Icon :v="icon"/>
                 <T>nouns.{{name}}.header</T>
             </a>
diff --git a/locale/pl/nouns/dukatywy.vue b/locale/pl/nouns/dukatywy.vue
index 18086c6b0..7576a7d20 100644
--- a/locale/pl/nouns/dukatywy.vue
+++ b/locale/pl/nouns/dukatywy.vue
@@ -1,9 +1,16 @@
 <template>
     <div>
         <h2>
+            <Icon v="book"/>
+            <T>nouns.headerLonger</T>
+        </h2>
+
+        <NounsNav/>
+
+        <h3>
             <Icon v="ghost"/>
             <T>nouns.dukajNouns.header</T>
-        </h2>
+        </h3>
 
         <div class="d-flex flex-column flex-md-row">
             <div>
@@ -97,8 +104,10 @@
 <script>
     import {Noun, NounDeclension} from "../../../src/classes";
     import {head} from "../../../src/helpers";
+    import NounsNav from "./NounsNav";
 
     export default {
+        components: { NounsNav },
         data() {
             return {
                 dukajNouns: [
diff --git a/locale/pl/nouns/neutratywy.vue b/locale/pl/nouns/neutratywy.vue
index 56c0b27b1..ae2aa3f78 100644
--- a/locale/pl/nouns/neutratywy.vue
+++ b/locale/pl/nouns/neutratywy.vue
@@ -1,9 +1,16 @@
 <template>
     <div>
         <h2>
+            <Icon v="book"/>
+            <T>nouns.headerLonger</T>
+        </h2>
+
+        <NounsNav/>
+
+        <h3>
             <Icon v="deer"/>
             <T>nouns.neuterNouns.header</T>
-        </h2>
+        </h3>
 
         <div class="d-flex flex-column flex-md-row">
             <div>
@@ -79,8 +86,10 @@
     import {Noun, NounDeclension} from "../../../src/classes";
     import hash from "../../../plugins/hash";
     import {head} from "../../../src/helpers";
+    import NounsNav from "./NounsNav";
 
     export default {
+        components: { NounsNav },
         mixins: [ hash ],
         data() {
             return {
diff --git a/locale/pl/nouns/osobatywy.vue b/locale/pl/nouns/osobatywy.vue
index 3913b189d..6f8db175b 100644
--- a/locale/pl/nouns/osobatywy.vue
+++ b/locale/pl/nouns/osobatywy.vue
@@ -1,10 +1,17 @@
 <template>
     <div>
         <h2>
+            <Icon v="book"/>
+            <T>nouns.headerLonger</T>
+        </h2>
+
+        <NounsNav/>
+
+        <h3>
             <Icon v="user-friends"/>
             <T>nouns.personNouns.header</T>
             <small><NormativeBadge/></small>
-        </h2>
+        </h3>
 
         <section>
             <T>nouns.personNouns.info</T>
@@ -70,8 +77,10 @@
 <script>
     import {Noun} from "../../../src/classes";
     import {head} from "../../../src/helpers";
+    import NounsNav from "./NounsNav";
 
     export default {
+        components: { NounsNav },
         data() {
             return {
                 personNouns: [
diff --git a/routes/inclusive.vue b/routes/inclusive.vue
index d3b5f69b3..89157430d 100644
--- a/routes/inclusive.vue
+++ b/routes/inclusive.vue
@@ -1,9 +1,16 @@
 <template>
     <div>
         <h2>
+            <Icon v="book"/>
+            <T>nouns.headerLonger</T>
+        </h2>
+
+        <NounsNav/>
+
+        <h3>
             <Icon v="book-heart"/>
             <T>nouns.inclusive.headerLong</T>
-        </h2>
+        </h3>
 
         <section>
             <T>nouns.inclusive.info</T>
@@ -17,8 +24,10 @@
 <script>
     import { head } from "../src/helpers";
     import hash from "../plugins/hash";
+    import NounsNav from "../data/nouns/NounsNav.vue";
 
     export default {
+        components: { NounsNav },
         mixins: [ hash ],
         mounted() {
             this.handleHash(this.config.nouns.inclusive.hashNamespace || '', filter => {
diff --git a/routes/queerTerms.vue b/routes/queerTerms.vue
index 312311d9c..98feb9c9b 100644
--- a/routes/queerTerms.vue
+++ b/routes/queerTerms.vue
@@ -1,9 +1,16 @@
 <template>
     <div>
         <h2>
+            <Icon v="book"/>
+            <T>nouns.headerLonger</T>
+        </h2>
+
+        <NounsNav/>
+
+        <h3>
             <Icon v="flag"/>
             <T>nouns.terms.headerLong</T>
-        </h2>
+        </h3>
 
         <section>
             <T>nouns.terms.info</T>
@@ -17,8 +24,11 @@
 <script>
     import { head } from "../src/helpers";
     import hash from "../plugins/hash";
+    import NounsNav from "../data/nouns/NounsNav.vue";
 
     export default {
+        components: { NounsNav },
+
         mixins: [ hash ],
         mounted() {
             this.handleHash(this.config.nouns.terms.hashNamespace || '', filter => {