diff --git a/components/Account.vue b/components/Account.vue
index d01d384b6..adb163e57 100644
--- a/components/Account.vue
+++ b/components/Account.vue
@@ -41,6 +41,7 @@
         </div>
 
         <Loading :value="profiles"><template v-if="profiles !== undefined">
+            <h3 class="h4"><T>profile.list</T>:</h3>
             <ul class="list-group mb-3">
                 <li v-for="(options, locale) in locales" :key="locale" :class="['list-group-item', locale === config.locale ? 'profile-current' : '']">
                     <ProfileOverview :profile="profiles[locale]" :locale="locale"/>
diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml
index 8179ffb0f..9338931f4 100644
--- a/locale/pl/translations.suml
+++ b/locale/pl/translations.suml
@@ -686,6 +686,7 @@ profile:
     names: 'Imiona'
     pronouns: 'Zaimki'
     words: 'Słowa'
+    list: 'Twoje wizytówki'
     init: 'Stwórz wizytówkę'
     show: 'Pokaż'
     edit: 'Edytuj'
diff --git a/routes/profile.vue b/routes/profile.vue
index 225e45715..d3807ec3e 100644
--- a/routes/profile.vue
+++ b/routes/profile.vue
@@ -1,84 +1,83 @@
 <template>
-    <div class="container">
-        <template v-if="profile">
-            <div class="mb-3 d-flex justify-content-between align-items-center flex-column flex-md-row">
-                <h2 class="text-nowrap">
-                    <Avatar :user="profile"/>
-                    @{{username}}
-                </h2>
-                <div class="list-group">
-                    <LocaleLink v-for="(options, locale) in locales" :key="locale" v-if="profiles[locale] !== undefined"
-                                :locale="locale" :link="`/@${username}`"
-                                :class="['list-group-item list-group-item-action small px-3 py-2 text-center', locale === config.locale ? 'active disabled' : '']">
-                        {{options.name}}
-                    </LocaleLink>
-                </div>
+    <NotFound v-if="!profile"/>
+    <div v-else class="container">
+        <div class="mb-3 d-flex justify-content-between align-items-center flex-column flex-md-row">
+            <h2 class="text-nowrap">
+                <Avatar :user="profile"/>
+                @{{username}}
+            </h2>
+            <div class="list-group" v-if="Object.keys(profiles).length > 1">
+                <LocaleLink v-for="(options, locale) in locales" :key="locale" v-if="profiles[locale] !== undefined"
+                            :locale="locale" :link="`/@${username}`"
+                            :class="['list-group-item list-group-item-action small px-3 py-2 text-center', locale === config.locale ? 'active disabled' : '']">
+                    {{options.name}}
+                </LocaleLink>
             </div>
+        </div>
 
-            <section v-if="profile.description.trim().length">
-                <p v-for="line in profile.description.split('\n')" class="mb-1">
-                    {{ line }}
-                </p>
-            </section>
+        <section v-if="profile.description.trim().length">
+            <p v-for="line in profile.description.split('\n')" class="mb-1">
+                {{ line }}
+            </p>
+        </section>
 
-            <section v-if="profile.age || Object.keys(profile.links).length">
-                <ul class="list-inline">
-                    <li v-if="profile.age" class="list-inline-item">
-                        <Icon v="birthday-cake"/>
-                        {{ profile.age }}
-                    </li>
-                    <li v-for="link in profile.links" class="list-inline-item pr-2">
-                        <ProfileLink :link="link"/>
-                    </li>
-                </ul>
-            </section>
+        <section v-if="profile.age || Object.keys(profile.links).length">
+            <ul class="list-inline">
+                <li v-if="profile.age" class="list-inline-item">
+                    <Icon v="birthday-cake"/>
+                    {{ profile.age }}
+                </li>
+                <li v-for="link in profile.links" class="list-inline-item pr-2">
+                    <ProfileLink :link="link"/>
+                </li>
+            </ul>
+        </section>
 
-            <section v-if="Object.keys(profile.flags).length">
-                <ul class="list-inline">
-                    <li v-for="(name, flag) in profile.flags" class="list-inline-item pr-2">
-                        <Flag :name="name" :src="`/flags/${flag}.png`"/>
-                    </li>
-                </ul>
-            </section>
+        <section v-if="Object.keys(profile.flags).length">
+            <ul class="list-inline">
+                <li v-for="(name, flag) in profile.flags" class="list-inline-item pr-2">
+                    <Flag :name="name" :src="`/flags/${flag}.png`"/>
+                </li>
+            </ul>
+        </section>
 
-            <section class="d-flex">
-                <div class="w-50" v-if="Object.keys(profile.names).length">
-                    <h3>
-                        <Icon v="signature"/>
-                        <T>profile.names</T>
-                    </h3>
-
-                    <ul class="list-unstyled">
-                        <li v-for="(opinion, name) in profile.names"><Opinion :word="name" :opinion="opinion"/></li>
-                    </ul>
-                </div>
-                <div class="w-50" v-if="Object.keys(profile.pronouns).length">
-                    <h3>
-                        <Icon v="tags"/>
-                        <T>profile.pronouns</T>
-                    </h3>
-
-                    <ul class="list-unstyled">
-                        <li v-for="(opinion, pronoun) in profile.pronouns"><Opinion :word="buildTemplate(pronoun).name('')" :opinion="opinion" :link="`/${pronoun}`"/></li>
-                    </ul>
-                </div>
-            </section>
-
-            <section>
+        <section class="d-flex">
+            <div class="w-50" v-if="Object.keys(profile.names).length">
                 <h3>
-                    <Icon v="scroll-old"/>
-                    <T>profile.words</T>
+                    <Icon v="signature"/>
+                    <T>profile.names</T>
                 </h3>
 
-                <div class="d-flex">
-                    <div v-for="group in profile.words" v-if="Object.keys(profile.words).length" class="w-25">
-                        <ul class="list-unstyled">
-                            <li v-for="(opinion, word) in group"><Opinion :word="word" :opinion="opinion"/></li>
-                        </ul>
-                    </div>
+                <ul class="list-unstyled">
+                    <li v-for="(opinion, name) in profile.names"><Opinion :word="name" :opinion="opinion"/></li>
+                </ul>
+            </div>
+            <div class="w-50" v-if="Object.keys(profile.pronouns).length">
+                <h3>
+                    <Icon v="tags"/>
+                    <T>profile.pronouns</T>
+                </h3>
+
+                <ul class="list-unstyled">
+                    <li v-for="(opinion, pronoun) in profile.pronouns"><Opinion :word="buildTemplate(pronoun).name('')" :opinion="opinion" :link="`/${pronoun}`"/></li>
+                </ul>
+            </div>
+        </section>
+
+        <section>
+            <h3>
+                <Icon v="scroll-old"/>
+                <T>profile.words</T>
+            </h3>
+
+            <div class="d-flex">
+                <div v-for="group in profile.words" v-if="Object.keys(profile.words).length" class="w-25">
+                    <ul class="list-unstyled">
+                        <li v-for="(opinion, word) in group"><Opinion :word="word" :opinion="opinion"/></li>
+                    </ul>
                 </div>
-            </section>
-        </template>
+            </div>
+        </section>
     </div>
 </template>
 
diff --git a/routes/template.vue b/routes/template.vue
index 2d65841a5..de6c172f6 100644
--- a/routes/template.vue
+++ b/routes/template.vue
@@ -1,6 +1,6 @@
 <template>
     <NotFound v-if="!selectedTemplate"/>
-    <div class="container" v-else>
+    <div v-else class="container">
         <h2>
             <Icon v="tag"/>
             <T>template.intro</T>: