diff --git a/UI/i18n/Translations.ts b/UI/i18n/Translations.ts
index 0fe30eb..ac6ed73 100644
--- a/UI/i18n/Translations.ts
+++ b/UI/i18n/Translations.ts
@@ -184,18 +184,19 @@ export default class Translations {
                         fr: 'TODO: fr'
                     }),
                     pump: new T({
-                        en: 'There is only a pump available',
-                        nl: 'Er is enkel een pomp beschikbaar',
+                        // Note: this previously read: a pump is available. It is not because the pump is present, that it is available (e.g. broken)
+                        en: 'There is only a pump present',
+                        nl: 'Er is enkel een pomp aanwezig',
                         fr: 'TODO: fr'
                     }),
                     tools: new T({
-                        en: 'There are only tools (screwdrivers, pliers...) available',
-                        nl: 'Er is enkel gereedschap beschikbaar (schroevendraaier, tang...)',
+                        en: 'There are only tools (screwdrivers, pliers...) aanwezig',
+                        nl: 'Er is enkel gereedschap aanwezig (schroevendraaier, tang...)',
                         fr: 'TODO: fr'
                     }),
                     both: new T({
-                        en: 'There are both tools and a pump available',
-                        nl: 'Er is zowel een pomp als gereedschap beschikbaar',
+                        en: 'There are both tools and a pump present',
+                        nl: 'Er is zowel een pomp als gereedschap aanwezig',
                         fr: 'TODO: fr'
                     }),
                 },
diff --git a/index.css b/index.css
index 02b83e0..1897bbe 100644
--- a/index.css
+++ b/index.css
@@ -225,24 +225,35 @@ form {
 
 }
 
-@media only screen and (max-height: 300px) {
+@media only screen and (max-height: 600px) {
     /* Landscape */
+    #topleft-tools {
+        margin: 0.3em !important;
+    }
+    
     #userbadge-and-search {
+        position: relative;
         display: inline-block;
         width: auto;
         max-width: 50vw;
+        margin: 0;
     }
 
     #userbadge {
-        display: none;
+        position: fixed;
+        right: 0.3em;
+        width: min-content;
+        max-width: 50vw;
+        margin:0;
+        padding: 0;
     }
 
     #topleft-tools {
         margin: 0.5em;
     }
-
-    #userbadge {
-        margin-bottom: 0.3em;
+    
+    .collapse-button {
+        height: calc(100% - 3.5em) !important;
     }
 
 }
@@ -347,7 +358,6 @@ form {
 }
 
 #filter__selection{
-    z-index: 6000;
 }
 
 #filter__selection form {
diff --git a/index.ts b/index.ts
index 281c018..a9248e1 100644
--- a/index.ts
+++ b/index.ts
@@ -18,7 +18,6 @@ import {StrayClickHandler} from "./Logic/StrayClickHandler";
 import {SimpleAddUI} from "./UI/SimpleAddUI";
 import {VariableUiElement} from "./UI/Base/VariableUIElement";
 import {SearchAndGo} from "./UI/SearchAndGo";
-import {CollapseButton} from "./UI/Base/CollapseButton";
 import {AllKnownLayouts} from "./Customizations/AllKnownLayouts";
 import {CheckBox} from "./UI/Input/CheckBox";
 import Translations from "./UI/i18n/Translations";
@@ -42,10 +41,9 @@ if (location.href.startsWith("http://buurtnatuur.be")) {
 }
 
 if (location.hostname === "localhost" || location.hostname === "127.0.0.1") {
-
     // Set to true if testing and changes should NOT be saved
     const testing = QueryParameters.GetQueryParameter("test");
-    testing.setData((testing.data === undefined) + "")
+    testing.setData(testing.data ?? "true")
     // If you have a testfile somewhere, enable this to spoof overpass
     // This should be hosted independantly, e.g. with `cd assets; webfsd -p 8080` + a CORS plugin to disable cors rules
     //Overpass.testUrl = "http://127.0.0.1:8080/streetwidths.geojson";