diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 78c9eac54..9d93ecb30 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -20,7 +20,7 @@
               :width="{ base: '85%', sm: '85%', md: '50%', lg: '50%' }"
               :class="{ 'hide-mobile-menu': !toggleMobileMenu }"
             >
-              <div id="nav-search-box">
+              <div id="nav-search-box" v-if="isLoggedIn">
                 <search-input
                   id="nav-search"
                   :delay="300"
@@ -33,6 +33,7 @@
               </div>
             </ds-flex-item>
             <ds-flex-item
+              v-if="isLoggedIn"
               :width="{ base: '15%', sm: '15%', md: '10%', lg: '10%' }"
               :class="{ 'hide-mobile-menu': !toggleMobileMenu }"
             >
@@ -125,11 +126,11 @@
       &nbsp;-&nbsp;
       <nuxt-link to="/imprint">{{ $t('site.imprint') }}</nuxt-link>
       &nbsp;‑&nbsp;
-      <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAc') }}</nuxt-link>
+      <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link>
       &nbsp;‑&nbsp;
       <nuxt-link to="/code-of-conduct">{{ $t('site.code-of-conduct') }}</nuxt-link>
       &nbsp;‑&nbsp;
-      <nuxt-link to="/privacy">{{ $t('site.privacy') }}</nuxt-link>
+      <nuxt-link to="/data-privacy">{{ $t('site.data-privacy') }}</nuxt-link>
       &nbsp;‑&nbsp;
       <nuxt-link to="/changelog">{{ $t('site.changelog') }}</nuxt-link>
     </div>
@@ -151,7 +152,6 @@ import HcAvatar from '~/components/Avatar/Avatar.vue'
 import seo from '~/mixins/seo'
 import FilterPosts from '~/components/FilterPosts/FilterPosts.vue'
 import CategoryQuery from '~/graphql/CategoryQuery.js'
-
 export default {
   components: {
     Dropdown,
@@ -268,47 +268,38 @@ export default {
   align-self: center;
   display: inline-flex;
 }
-
 .main-container {
   padding-top: 6rem;
   padding-bottom: 5rem;
 }
-
 .main-navigation {
   a {
     color: $text-color-soft;
   }
 }
-
 .main-navigation-right {
   display: flex;
   flex: 1;
 }
-
 .main-navigation-right .desktop-view {
   float: right;
 }
-
 .avatar-menu {
   margin: 2px 0px 0px 5px;
 }
-
 .avatar-menu-trigger {
   user-select: none;
   display: flex;
   align-items: center;
   padding-left: $space-xx-small;
 }
-
 .avatar-menu-popover {
   padding-top: 0.5rem;
   padding-bottom: 0.5rem;
-
   hr {
     color: $color-neutral-90;
     background-color: $color-neutral-90;
   }
-
   .logout-link {
     margin-left: -$space-small;
     margin-right: -$space-small;
@@ -317,43 +308,35 @@ export default {
     padding: $space-x-small $space-small;
     // subtract menu border with from padding
     padding-left: $space-small - 2;
-
     color: $text-color-base;
-
     &:hover {
       color: $text-color-link-active;
     }
   }
-
   nav {
     margin-left: -$space-small;
     margin-right: -$space-small;
     margin-top: -$space-xx-small;
     margin-bottom: -$space-xx-small;
-
     a {
       padding-left: 12px;
     }
   }
 }
-
 @media only screen and (min-width: 960px) {
   .mobile-hamburger-menu {
     display: none;
   }
 }
-
 @media only screen and (max-width: 960px) {
   #nav-search-box,
   .main-navigation-right {
     margin: 10px 0px;
   }
-
   .hide-mobile-menu {
     display: none;
   }
 }
-
 .ds-footer {
   text-align: center;
   position: fixed;
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 36db51e57..9e310c299 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -12,7 +12,7 @@
     "made": "Mit &#10084; gemacht",
     "imprint": "Impressum",
     "termsAc": "Nutzungsbedingungen",
-    "privacy": "Datenschutz",
+    "data-privacy": "Datenschutz",
     "changelog": "Änderungen & Verlauf",
     "contact": "Kontakt",
     "tribunal": "Registergericht",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index a96a44999..99932d029 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -11,8 +11,8 @@
   "site": {
     "made": "Made with &#10084;",
     "imprint": "Imprint",
-    "termsAc": "Terms and conditions",
-    "privacy": "Data privacy",
+    "termsAndConditions": "Terms and conditions",
+    "data-privacy": "Data privacy",
     "changelog": "Changes & History",
     "contact": "Contact",
     "tribunal": "Registry court",
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index 1d8f08ecc..e52933c69 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -6,7 +6,7 @@
     "made": "Con &#10084; realizado",
     "imprint": "Pie de imprenta",
     "termsAc": "términos y condiciones",
-    "privacy": "protección de datos",
+    "data-privacy": "protección de datos",
     "changelog": "Cambios e historia",
     "contact": "Contacto",
     "tribunal": "tribunal de registro",
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index c04e42a89..631c9436a 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -6,7 +6,7 @@
     "made": "Avec &#10084; fait",
     "imprint": "Mentions légales",
     "termsAc": "modalités et conditions",
-    "privacy": "protection des données",
+    "data-privacy": "protection des données",
     "changelog": "Changements et historique",
     "contact": "Contacter",
     "tribunal": "tribunal de registre",
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index 968ee3269..fc6371b24 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -3,7 +3,7 @@
     "made": "Con &#10084; fatto",
     "imprint": "Impressum",
     "termsAc": "Condizioni d'uso",
-    "privacy": "protezione dei dati",
+    "data-privacy": "protezione dei dati",
     "changelog": "Cambiamenti e storia",
     "contact": "Contatto",
     "tribunal": "registro tribunale",
diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
index a2bde02f1..da763735a 100644
--- a/webapp/locales/nl.json
+++ b/webapp/locales/nl.json
@@ -3,7 +3,7 @@
     "made": "Met &#10084; gemaakt",
     "imprint": "Afdruk",
     "termsAc": "Gebruiksvoorwaarden",
-    "privacy": "gegevensbescherming",
+    "data-privacy": "gegevensbescherming",
     "changelog": "Veranderingen & Geschiedenis",
     "contact": "contact",
     "tribunal": "registerrechtbank",
diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
index e657229eb..1a1b3a516 100644
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@@ -6,7 +6,7 @@
     "made": "Z &#10084; zrobiony",
     "imprint": "Nadruk",
     "termsAc": "Warunki użytkowania",
-    "privacy": "ochrona danych",
+    "data-privacy": "ochrona danych",
     "changelog": "Zmiany i historia",
     "contact": "Kontakt",
     "tribunal": "sąd rejestrowy",
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index d84e00c08..785844ebf 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -3,7 +3,7 @@
     "made": "Com &#10084; feito",
     "imprint": "Impressão",
     "termsAc": "termos e condições",
-    "privacy": "protecção de dados",
+    "data-privacy": "protecção de dados",
     "changelog": "Mudanças e Histórico",
     "contact": "Contato",
     "tribunal": "tribunal",
diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js
index e9f34d1be..e7f4d5cbd 100644
--- a/webapp/nuxt.config.js
+++ b/webapp/nuxt.config.js
@@ -39,6 +39,11 @@ module.exports = {
       'registration-verify-code',
       'registration-create-user-account',
       'pages-slug',
+      'imprint',
+      'terms-and-conditions',
+      'code-of-conduct',
+      'data-privacy',
+      'changelog',
     ],
     // pages to keep alive
     keepAlivePages: ['index'],
diff --git a/webapp/pages/privacy.vue b/webapp/pages/data-privacy.vue
similarity index 61%
rename from webapp/pages/privacy.vue
rename to webapp/pages/data-privacy.vue
index b68b27e28..719d1bbef 100644
--- a/webapp/pages/privacy.vue
+++ b/webapp/pages/data-privacy.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
     <ds-space>
-      <ds-heading tag="h2">{{ $t('site.privacy') }}</ds-heading>
+      <ds-heading tag="h2">{{ $t('site.data-privacy') }}</ds-heading>
     </ds-space>
     <ds-container>
       <ds-space margin-top="large">
-        <ds-text>{{ $t('site.privacy') }}</ds-text>
+        <ds-text>{{ $t('site.data-privacy') }}</ds-text>
         <ds-text>...</ds-text>
       </ds-space>
     </ds-container>
@@ -16,7 +16,7 @@
 export default {
   head() {
     return {
-      title: this.$t('site.privacy'),
+      title: this.$t('site.data-privacy'),
     }
   },
 }
diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index e659d8448..14f9f4171 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -23,9 +23,7 @@
           </ds-flex-item>
           <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
             <ds-space margin="small">
-              <ds-text size="small">
-                {{ $t('login.copy') }}
-              </ds-text>
+              <ds-text size="small">{{ $t('login.copy') }}</ds-text>
             </ds-space>
             <form :disabled="pending" @submit.prevent="onSubmit">
               <ds-input
@@ -46,9 +44,7 @@
                 type="password"
               />
               <ds-space class="password-reset-link" margin-bottom="large">
-                <nuxt-link to="/password-reset/request">
-                  {{ $t('login.forgotPassword') }}
-                </nuxt-link>
+                <nuxt-link to="/password-reset/request">{{ $t('login.forgotPassword') }}</nuxt-link>
               </ds-space>
               <ds-button
                 :loading="pending"
@@ -84,7 +80,7 @@ export default {
   components: {
     LocaleSwitch,
   },
-  layout: 'blank',
+  layout: 'default',
   data() {
     return {
       ready: false,
diff --git a/webapp/pages/logout.vue b/webapp/pages/logout.vue
index a73b2730a..6562410cd 100644
--- a/webapp/pages/logout.vue
+++ b/webapp/pages/logout.vue
@@ -6,9 +6,7 @@
           <img style="width: 200px;" src="/img/sign-up/onourjourney.png" alt="Human Connection" />
         </ds-space>
         <ds-space style="text-align: center;" margin-top="small" margin-bottom="xxx-small" centered>
-          <ds-heading tag="h3" soft>
-            Logging out...
-          </ds-heading>
+          <ds-heading tag="h3" soft>Logging out...</ds-heading>
         </ds-space>
       </ds-flex-item>
     </ds-flex>
@@ -17,7 +15,7 @@
 
 <script>
 export default {
-  layout: 'blank',
+  layout: 'default',
   async beforeCreate() {
     await this.$store.dispatch('auth/logout')
     this.$router.replace('/')