diff --git a/SAKPaaS/src/app/components/footer/footer.component.scss b/SAKPaaS/src/app/components/footer/footer.component.scss
index ff97efb3..39b6f50f 100644
--- a/SAKPaaS/src/app/components/footer/footer.component.scss
+++ b/SAKPaaS/src/app/components/footer/footer.component.scss
@@ -6,6 +6,7 @@
     bottom: 5px;
     left: 5px;
     flex-wrap: wrap;
+    z-index: 2;
 }
 
 .footer * {
diff --git a/SAKPaaS/src/app/components/home/home.component.html b/SAKPaaS/src/app/components/home/home.component.html
index 0f1aa65e..aa0fc3bd 100644
--- a/SAKPaaS/src/app/components/home/home.component.html
+++ b/SAKPaaS/src/app/components/home/home.component.html
@@ -2,5 +2,5 @@
 <app-logo></app-logo>
 <app-map (locationEmitted)="onLocationEmitted($event, true)" style="z-index: 1;"></app-map>
 <app-search-bar style="z-index: 2;" (locationEmitted)="onLocationEmitted($event, false)"></app-search-bar>
-<app-locate-button style="z-index: 2;"></app-locate-button>
+<app-locate-button></app-locate-button>
 <app-footer></app-footer>
diff --git a/SAKPaaS/src/app/components/locate-button/locate-button.component.scss b/SAKPaaS/src/app/components/locate-button/locate-button.component.scss
index b82f2da9..bb2f2570 100644
--- a/SAKPaaS/src/app/components/locate-button/locate-button.component.scss
+++ b/SAKPaaS/src/app/components/locate-button/locate-button.component.scss
@@ -11,6 +11,7 @@ button {
   color: white;
   padding: 0;
   box-shadow: 0 5px 20px 0 rgba(11, 0, 51, 0.2);
+  z-index: 3;
   ::ng-deep * {
     padding: 3.75px;
     font-size: 20px;
diff --git a/SAKPaaS/src/styles.scss b/SAKPaaS/src/styles.scss
index f100fcb4..fee5a1c2 100644
--- a/SAKPaaS/src/styles.scss
+++ b/SAKPaaS/src/styles.scss
@@ -47,6 +47,10 @@ body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
   }
 }
 
+div.ol-overlaycontainer-stopevent {
+  z-index: auto !important;
+}
+
 div.ol-zoom {
   top: auto;
   left: auto;
@@ -67,6 +71,7 @@ div.ol-rotate {
   background-color: transparent;
   color: white;
   border-radius: 7px;
+  z-index: 3;
 }
 
 div.ol-control:hover {