diff --git a/locale/en/config.suml b/locale/en/config.suml
index 05cd12b3c..ce931d40b 100644
--- a/locale/en/config.suml
+++ b/locale/en/config.suml
@@ -43,7 +43,7 @@ sources:
 
 nouns:
     enabled: true
-    route: 'nouns'
+    route: 'dictionary'
     collapsable: false
     plurals: true
     declension: false
diff --git a/locale/en/nouns/NounsNav.vue b/locale/en/nouns/NounsNav.vue
new file mode 100644
index 000000000..6beff5199
--- /dev/null
+++ b/locale/en/nouns/NounsNav.vue
@@ -0,0 +1,2 @@
+<template>
+</template>
diff --git a/locale/en/translations.suml b/locale/en/translations.suml
index 082796505..2cef3ed3a 100644
--- a/locale/en/translations.suml
+++ b/locale/en/translations.suml
@@ -91,8 +91,9 @@ sources:
         moderation: 'Submissions will have to get approved before getting published.'
 
 nouns:
-    header: 'Nouns'
-    headerLong: 'Dictionary of gender neutral language'
+    header: 'Dictionary'
+    headerLong: 'Dictionary of neutral nouns'
+    headerLonger: 'Dictionary of gender neutral language'
     description: 'It''s not just pronouns! Check out our dictionary of gender neutral nouns.'
     intro:
         - >
diff --git a/locale/pl/config.suml b/locale/pl/config.suml
index d5312ff1b..88fb76424 100644
--- a/locale/pl/config.suml
+++ b/locale/pl/config.suml
@@ -23,7 +23,7 @@ sources:
 
 nouns:
     enabled: true
-    route: 'rzeczowniki'
+    route: 'słownik'
     collapsable: true
     plurals: true
     declension: true
@@ -321,7 +321,9 @@ profile:
         - ['partner', 'osoba partnerska', 'chłopak', 'dziewczyna', 'mąż', 'żona', 'towarzysz', 'kochanie', 'ukochane', 'małżonie', 'druga połówka']
 
 redirects:
-    - { from: '^/neutratywy', to: '/rzeczowniki' }
+    - { from: '^/neutratywy', to: '/słownik' }
+    - { from: '^/rzeczowniki', to: '/słownik' }
+    - { from: '^/slownik', to: '/słownik' }
     - { from: '^/literatura', to: '/korpus' }
 
 api:
diff --git a/locale/pl/nouns/NounsExtra.vue b/locale/pl/nouns/NounsExtra.vue
index 072bae2ce..4cc421fb0 100644
--- a/locale/pl/nouns/NounsExtra.vue
+++ b/locale/pl/nouns/NounsExtra.vue
@@ -1,20 +1,5 @@
 <template>
     <div>
-        <div class="btn-group btn-block">
-            <a :href="'#' + $t('nouns.neuterNouns.id')" class="btn btn-outline-primary">
-                <Icon v="atom-alt"/>
-                <T>nouns.neuterNouns.header</T>
-            </a>
-            <a :href="'#' + $t('nouns.dukajNouns.id')" class="btn btn-outline-primary">
-                <Icon v="atom-alt"/>
-                <T>nouns.dukajNouns.header</T>
-            </a>
-            <a :href="'#' + $t('nouns.personNouns.id')" class="btn btn-outline-primary">
-                <Icon v="atom-alt"/>
-                <T>nouns.personNouns.header</T>
-            </a>
-        </div>
-
         <Separator icon="atom-alt"/>
 
         <h3 :id="$t('nouns.neuterNouns.id')">
@@ -23,6 +8,8 @@
 
         <T>nouns.neuterNouns.info</T>
 
+        <slot></slot>
+
         <details class="border mb-3">
             <summary class="bg-light p-3">
                 <h4 class="h5 d-inline"><T>nouns.neuterNouns.extended.header</T></h4>
@@ -76,8 +63,6 @@
             </div>
         </details>
 
-        <slot></slot>
-
         <Separator icon="atom-alt"/>
 
         <h3 :id="$t('nouns.dukajNouns.id')">
diff --git a/locale/pl/nouns/NounsNav.vue b/locale/pl/nouns/NounsNav.vue
new file mode 100644
index 000000000..fa18d5085
--- /dev/null
+++ b/locale/pl/nouns/NounsNav.vue
@@ -0,0 +1,16 @@
+<template>
+    <section class="btn-group btn-block mb-2">
+        <a :href="'#' + $t('nouns.neuterNouns.id')" class="btn btn-outline-primary">
+            <Icon v="atom-alt"/>
+            <T>nouns.neuterNouns.header</T>
+        </a>
+        <a :href="'#' + $t('nouns.dukajNouns.id')" class="btn btn-outline-primary">
+            <Icon v="atom-alt"/>
+            <T>nouns.dukajNouns.header</T>
+        </a>
+        <a :href="'#' + $t('nouns.personNouns.id')" class="btn btn-outline-primary">
+            <Icon v="atom-alt"/>
+            <T>nouns.personNouns.header</T>
+        </a>
+    </section>
+</template>
diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml
index c4e586f06..3ae86346a 100644
--- a/locale/pl/translations.suml
+++ b/locale/pl/translations.suml
@@ -103,8 +103,9 @@ sources:
         moderation: 'Propozycje będą musiały zostać zatwierdzone przed opublikowaniem.'
 
 nouns:
-    header: 'Rzeczowniki'
-    headerLong: 'Neutralne i niebinarne rzeczowniki'
+    header: 'Słownik'
+    headerLong: 'Słownik: neutralne rzeczowniki'
+    headerLonger: 'Neutralne i niebinarne rzeczowniki'
     description: 'Feminatywy feminatywami, ale prawdziwe wyzwanie to tworzenie neutratywów! Przedstawiamy tworzony przez społeczność słownik rzeczowników z wyszczególnieniem ich formy męskiej, żeńskiej i neutralnej.'
     intro:
         - >
diff --git a/routes/nouns.vue b/routes/nouns.vue
index 4aaff1a05..943533bda 100644
--- a/routes/nouns.vue
+++ b/routes/nouns.vue
@@ -2,9 +2,11 @@
     <div>
         <h2>
             <Icon v="atom-alt"/>
-            <T>nouns.headerLong</T>
+            <T>nouns.headerLonger</T>
         </h2>
 
+        <NounsNav/>
+
         <section>
             <T>nouns.intro</T>
 
@@ -30,10 +32,11 @@
 
 <script>
     import { head } from "../src/helpers";
+    import NounsNav from "../data/nouns/NounsNav.vue";
     import NounsExtra from "../data/nouns/NounsExtra.vue";
 
     export default {
-        components: { NounsExtra },
+        components: { NounsNav, NounsExtra },
         mounted() {
             if (process.client) {
                 if (window.location.hash) {
@@ -56,7 +59,7 @@
         },
         head() {
             return head({
-                title: this.$t('nouns.headerLong'),
+                title: this.$t('nouns.headerLonger'),
                 description: this.$t('nouns.description'),
                 banner: this.config.locale === 'pl' ? 'bannerNouns.png' : undefined,
             });