diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 7e7e15e93..50651209c 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -7,28 +7,29 @@
         </router-link>
       </div>
       <b-nav-text center>{{ balance }} GDD</b-nav-text>
-      
-      <b-collapse id="nav-collapse">
-        <b-navbar-nav class="d-none d-md-flex d-sm-flex">
+      <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
+
+      <b-collapse id="nav-collapse" is-nav>
+        <b-navbar-nav >
           <b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item>
           <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
           <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
           <b-nav-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-nav-item>
           <hr />
-          <b-nav-item to="/#" class="mb-3" @click="this.$emit('get-elopage-link')" target="_blank">
+          <b-nav-item to="#" class="mb-3" @click="this.$emit('get-elopage-link')" target="_blank">
             {{ $t('members_area') }}
             <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
           </b-nav-item>
           <b-nav-item
             v-if="$store.state.isAdmin"
-            to="/#"
+            to="#"
             class="mb-3"
             @click="this.$emit('admin')"
             target="_blank"
           >
             {{ $t('admin_area') }}
           </b-nav-item>
-          <b-nav-item to="/#" class="mb-3" @click="this.$emit('logout')">
+          <b-nav-item class="mb-3" @click="$emit('logout')">
             {{ $t('logout') }}
           </b-nav-item>
         </b-navbar-nav>
@@ -49,15 +50,12 @@
             <b-dropdown-item @click="this.$emit('admin')" target="_blank">
               {{ $t('admin_area') }}
             </b-dropdown-item>
-            <b-dropdown-item href="/#" @click="this.$emit('logout')">
+            <b-dropdown-item @click="$emit('logout')">
               {{ $t('logout') }}
             </b-dropdown-item>
           </b-nav-item-dropdown>
         </b-navbar-nav>
       </b-collapse>
-
-      <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
-
     </b-navbar>
   </div>
 </template>
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index a91d31177..40c02c2fd 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -16,7 +16,7 @@
             <b-nav-item class="mb-3" active>Active</b-nav-item>
             <b-nav-item class="mb-3">Link</b-nav-item>
             <b-nav-item class="mb-3">Another Link</b-nav-item>
-            <b-nav-item class="mb-3" disabled>Disabled</b-nav-item>
+            <b-nav-item class="mb-3" @click="$emit('logout')">{{ $t('logout') }}</b-nav-item>
           </b-nav>
         </div>
       </div>
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index aa343b60b..80a58432b 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <navbar :balance="balance" @get-elopage-link="getElopageLink" @admin="admin" @logout="logout"/>
+    <navbar :balance="balance" @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
     <div style="display: inline-flex">
       <div class="d-none d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
         <sidebar @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
@@ -59,12 +59,10 @@ export default {
           query: logout,
         })
         .then(() => {
-          this.$sidebar.displaySidebar(false)
           this.$store.dispatch('logout')
           this.$router.push('/login')
         })
         .catch(() => {
-          this.$sidebar.displaySidebar(false)
           this.$store.dispatch('logout')
           if (this.$router.currentRoute.path !== '/login') this.$router.push('/login')
         })