diff --git a/src/app/ui/main/main.ui.html b/src/app/ui/main/main.ui.html
index 28e3034..5bfaa92 100644
--- a/src/app/ui/main/main.ui.html
+++ b/src/app/ui/main/main.ui.html
@@ -11,7 +11,31 @@
     <a routerLink="/submit" mat-raised-button color="accent">{{'submission' |
       i18n}}</a>
   </ng-container>
-
+  <ng-container>
+    <button mat-button [matMenuTriggerFor]="menu">
+      <mat-icon>settings</mat-icon>
+      <mat-icon>arrow_drop_down</mat-icon>
+    </button>
+    <mat-menu #menu="matMenu">
+      <a *ngIf="!authenticated" routerLink="/login" routerLinkActive="active" mat-menu-item>
+        <mat-icon>login</mat-icon> {{'login' | i18n}}
+      </a>
+      <mat-divider *ngIf="!authenticated"></mat-divider>
+      <a *ngFor="let locale of locales" mat-menu-item (click)="setLocale(locale)">
+        <mat-icon *ngIf="locale == currentLocale">done</mat-icon>{{'locale.' + locale + '.long' |
+        i18n}}
+      </a>
+      <a mat-menu-item (click)="toggleDarkTheme()">
+        <mat-slide-toggle [checked]="darkTheme">
+          {{'darkTheme' | i18n}}
+        </mat-slide-toggle>
+      </a>
+      <mat-divider *ngIf="authenticated"></mat-divider>
+      <a *ngIf="authenticated" (click)="logout()" mat-menu-item>
+        <mat-icon>exit_to_app</mat-icon> {{'logout' | i18n}}
+      </a>
+    </mat-menu>
+  </ng-container>
 </mat-toolbar>
 
 <mat-sidenav-container>
@@ -19,24 +43,22 @@
     (click)="!isBiggerScreen() && opened=false">
 
     <mat-nav-list>
-      <a *ngIf="!authenticated" routerLink="/login" routerLinkActive="active" mat-list-item>
-        <mat-icon>login</mat-icon> {{'login' | i18n}}
-      </a>
       <a *ngIf="authenticated" routerLink="/top" routerLinkActive="active" mat-list-item>
         <mat-icon>trending_up</mat-icon> {{'page.top' | i18n}}
       </a>
       <a *ngIf="authenticated" routerLink="/new" routerLinkActive="active" mat-list-item>
         <mat-icon>today</mat-icon> {{'page.new' | i18n}}
       </a>
-      <mat-divider></mat-divider>
+      <mat-divider *ngIf="authenticated"></mat-divider>
       <a *ngIf="authenticated" routerLink="/hot" routerLinkActive="active" mat-list-item>
         <mat-icon>whatshot</mat-icon> {{'page.hot' | i18n}}
       </a>
       <a *ngIf="authenticated" routerLink="/last" routerLinkActive="active" mat-list-item>
         <mat-icon>history</mat-icon> {{'page.last' | i18n}}
       </a>
-      <mat-divider></mat-divider>
-      <a (click)="openExternal('https://wiki.bstly.de/services/bstlboard#faq','_blank')" routerLinkActive="active" mat-list-item>
+      <mat-divider *ngIf="authenticated"></mat-divider>
+      <a (click)="openExternal('https://wiki.bstly.de/services/bstlboard#faq','_blank')" routerLinkActive="active"
+        mat-list-item>
         <mat-icon>help</mat-icon> {{'page.faq' | i18n}}
       </a>
       <mat-divider *ngIf="authenticated"></mat-divider>
@@ -46,30 +68,16 @@
       <a *ngIf="authenticated" routerLink="/settings" routerLinkActive="active" mat-list-item>
         <mat-icon>tune</mat-icon> {{'settings' | i18n}}
       </a>
-      <mat-divider *ngIf="authenticated" ></mat-divider>
-      <a *ngIf="authenticated" (click)="logout()" mat-list-item>
-        <mat-icon>exit_to_app</mat-icon> {{'logout' | i18n}}
-      </a>
     </mat-nav-list>
-
     <span class="spacer"></span>
-
     <mat-nav-list>
-      <a *ngFor="let locale of locales" mat-list-item (click)="setLocale(locale)">
-        <mat-icon *ngIf="locale == currentLocale">done</mat-icon>{{'locale.' + locale + '.long' |
-        i18n}}
-      </a>
-      <a mat-list-item (click)="toggleDarkTheme()" >
-        <mat-slide-toggle [checked]="darkTheme">
-          {{'darkTheme' | i18n}}
-        </mat-slide-toggle>
-      </a>
       <mat-divider></mat-divider>
       <a (click)="openExternal('https://www.bstly.de/imprint/')" mat-list-item style="font-size: 0.7em;">
         {{'page.imprint' | i18n}}
       </a>
-      <a (click)="openExternal('https://www.bstly.de/privacy-policy/#bstlboard')" mat-list-item style="font-size: 0.7em;">
-        {{'pageprivacy-policy' | i18n}}
+      <a (click)="openExternal('https://www.bstly.de/privacy-policy/#bstlboard')" mat-list-item
+        style="font-size: 0.7em;">
+        {{'page.privacy-policy' | i18n}}
       </a>
     </mat-nav-list>
   </mat-sidenav>