diff --git a/src/app/app.component.html b/src/app/app.component.html
index 22eddca..8f395d2 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,6 +1,6 @@
 <div class="button-container">
   <div class="dropdown dropdown-hover" id="translate">
-    <label tabindex="0" class="btn m-1 bg-black border-neutral text-base-100"
+    <label tabindex="0" class="btn m-1 bg-black border-neutral text-base-100 hover:bg-neutral hover:text-base-100"
            id="translateLabel">{{homeTranslations.translate}}</label>
     <ul tabindex="0" class="dropdown-content menu p-2 shadow rounded-box w-52" id="translateUl">
       <li (click)="switchLanguage('DE')"><a>DE</a></li>
@@ -9,6 +9,13 @@
       <li (click)="switchLanguage('EN')"><a>EN</a></li>
     </ul>
   </div>
-  <button (click)="clearAllCookies()" class="btn btn-active btn-ghost" id="logout">Logout</button>
+  <div>
+    <button (click)="clearAllCookies()" class="btn btn-active btn-ghost hover:btn-error" id="logout">Logout</button>
+    <button (click)="goHome()"
+            class="btn gap-2 border-primary bg-secondary text-primary hover:bg-secondary hover:text-secondary hover:border-secondary hover:bg-primary" style="margin-right: 5px">
+      Home
+    </button>
+  </div>
+
 </div>
 <router-outlet></router-outlet>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 344b2b7..7b3d26f 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -99,4 +99,8 @@ export class AppComponent implements OnInit {
     // Load Detail Page Translations
     this.detailTranslation.congratulations = await this.translateService.getData(this.detailTranslation.congratulations, lang);
   }
+
+  goHome() {
+    this.router.navigate(['/home']);
+  }
 }
diff --git a/src/app/component/list/list.component.ts b/src/app/component/list/list.component.ts
index d5edf8b..1ffdc25 100644
--- a/src/app/component/list/list.component.ts
+++ b/src/app/component/list/list.component.ts
@@ -1,9 +1,7 @@
 import {Component, OnChanges, OnInit, SimpleChanges} from '@angular/core';
-import {ActivatedRoute} from "@angular/router";
+import {ActivatedRoute, Router} from "@angular/router";
 import {positionService} from "../../service/position.service";
 import {listTranslations} from "../../interface/translations";
-import {TranslateService} from "../../service/language/translate.service";
-import {ReadTranslateJsonService} from "../../service/language/readTranslateJson.service";
 import {LocationService} from "../../service/http/location.service";
 import {LocationEntity} from "../../interface/LocationEntity";
 import {WaypointsEntity} from "../../interface/WaypointsEntity";
diff --git a/src/app/component/management/management.component.html b/src/app/component/management/management.component.html
index 4b927b8..efb2891 100644
--- a/src/app/component/management/management.component.html
+++ b/src/app/component/management/management.component.html
@@ -130,7 +130,7 @@
   </button>
 </div>
 
-<div class="overlay" [style.display]="showWaypointForm ? 'block' : 'none'">
+<div class="overlay" [style.display]="showWaypointForm ? 'block' : 'none'" style="margin-bottom: 20px">
   <div class="form-container">
     <h2>{{translations.addWaypointButton}}</h2>
     <form