diff --git a/client/public/stylesheets/olympus.css b/client/public/stylesheets/olympus.css
index cdd1cacd..44427346 100644
--- a/client/public/stylesheets/olympus.css
+++ b/client/public/stylesheets/olympus.css
@@ -773,4 +773,9 @@ body[data-hide-naval] #unit-visibility-control-naval {
 
 #reaction-to-threat-buttons-container button[title="Abort"].selected::before {
     background-image: url( "/themes/olympus/images/icons_roe_stop_dark.svg");
+}
+
+.map-source-dropdown::before {
+    content: url("/themes/olympus/images/map_source.svg");
+    margin-right: 10px;
 }
\ No newline at end of file
diff --git a/client/public/themes/olympus/images/map_source.svg b/client/public/themes/olympus/images/map_source.svg
new file mode 100644
index 00000000..977057cc
--- /dev/null
+++ b/client/public/themes/olympus/images/map_source.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="15" viewBox="0 0 16 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<path d="M11.1562 3.53125C11.1562 5.03516 9.13281 7.6875 8.25781 8.78125C8.06641 9.05469 7.65625 9.05469 7.46484 8.78125C6.58984 7.6875 4.59375 5.03516 4.59375 3.53125C4.59375 1.72656 6.04297 0.25 7.875 0.25C9.67969 0.25 11.1562 1.72656 11.1562 3.53125ZM11.375 5.74609C11.457 5.55469 11.5391 5.36328 11.6211 5.17188C11.6484 5.14453 11.6484 5.11719 11.6758 5.08984L14.8477 3.80469C15.2578 3.64062 15.75 3.94141 15.75 4.40625V11.8164C15.75 12.0898 15.5859 12.3359 15.3125 12.4453L11.375 14.0039V5.74609ZM3.74609 4.05078C3.82812 4.43359 3.9375 4.81641 4.10156 5.17188C4.18359 5.36328 4.26562 5.55469 4.375 5.74609V12.6094L0.875 14.0039C0.464844 14.168 0 13.8672 0 13.4023V5.99219C0 5.71875 0.164062 5.47266 0.410156 5.39062L3.74609 4.05078ZM8.94141 9.32812C9.32422 8.86328 9.92578 8.09766 10.5 7.22266V14.0586L5.25 12.5547V7.22266C5.79688 8.09766 6.39844 8.86328 6.78125 9.32812C7.32812 10.0391 8.39453 10.0391 8.94141 9.32812ZM7.875 4.40625C8.47656 4.40625 8.96875 3.94141 8.96875 3.3125C8.96875 2.71094 8.47656 2.21875 7.875 2.21875C7.24609 2.21875 6.78125 2.71094 6.78125 3.3125C6.78125 3.94141 7.24609 4.40625 7.875 4.40625Z" fill="white"/>
+</svg>
\ No newline at end of file
diff --git a/client/src/map/map.ts b/client/src/map/map.ts
index 0ebd8526..daf94fa3 100644
--- a/client/src/map/map.ts
+++ b/client/src/map/map.ts
@@ -4,6 +4,7 @@ import { BoxSelect } from "./boxselect";
 import { MapContextMenu, SpawnOptions } from "../controls/mapcontextmenu";
 import { UnitContextMenu } from "../controls/unitcontextmenu";
 import { AirbaseContextMenu } from "../controls/airbasecontextmenu";
+import { Dropdown } from "../controls/dropdown";
 
 export const IDLE = "IDLE";
 export const MOVE_UNIT = "MOVE_UNIT";
@@ -21,6 +22,8 @@ export class Map extends L.Map {
     #unitContextMenu: UnitContextMenu = new UnitContextMenu("unit-contextmenu");
     #airbaseContextMenu: AirbaseContextMenu = new AirbaseContextMenu("airbase-contextmenu");
 
+    #mapSourceDropdown: Dropdown;
+
     constructor(ID: string) {
         /* Init the leaflet map */
         //@ts-ignore
@@ -40,6 +43,8 @@ export class Map extends L.Map {
         this.on('mousedown', (e: any) => this.#onMouseDown(e));
         this.on('mouseup', (e: any) => this.#onMouseUp(e));
         this.on('mousemove', (e: any) => this.#onMouseMove(e));
+
+        this.#mapSourceDropdown = new Dropdown("map-type", (layerName: string) => this.setLayer(layerName), this.getLayers())
     }
 
     setLayer(layerName: string) {
diff --git a/client/views/dialogs.ejs b/client/views/dialogs.ejs
index 2a193d95..d3204081 100644
--- a/client/views/dialogs.ejs
+++ b/client/views/dialogs.ejs
@@ -1,4 +1,4 @@
-<div id="aircraft-settings-dialog" class="ol-panel ol-dialog" role="dialog">
+<div id="aircraft-settings-dialog" class="ol-panel ol-dialog hide" role="dialog">
 
     <div class="ol-dialog-close" data-on-click="closeDialog"></div>
 
diff --git a/client/views/navbar.ejs b/client/views/navbar.ejs
index 303d1514..5bbbe286 100644
--- a/client/views/navbar.ejs
+++ b/client/views/navbar.ejs
@@ -19,31 +19,11 @@
     </div>
 
     <div id="map-type" class="ol-select">
-        <div class="ol-select-value">
-            <svg width="16" height="15" viewBox="0 0 16 15" fill="none" xmlns="http://www.w3.org/2000/svg">
-                <path d="M11.1562 3.53125C11.1562 5.03516 9.13281 7.6875 8.25781 8.78125C8.06641 9.05469 7.65625 9.05469 7.46484 8.78125C6.58984 7.6875 4.59375 5.03516 4.59375 3.53125C4.59375 1.72656 6.04297 0.25 7.875 0.25C9.67969 0.25 11.1562 1.72656 11.1562 3.53125ZM11.375 5.74609C11.457 5.55469 11.5391 5.36328 11.6211 5.17188C11.6484 5.14453 11.6484 5.11719 11.6758 5.08984L14.8477 3.80469C15.2578 3.64062 15.75 3.94141 15.75 4.40625V11.8164C15.75 12.0898 15.5859 12.3359 15.3125 12.4453L11.375 14.0039V5.74609ZM3.74609 4.05078C3.82812 4.43359 3.9375 4.81641 4.10156 5.17188C4.18359 5.36328 4.26562 5.55469 4.375 5.74609V12.6094L0.875 14.0039C0.464844 14.168 0 13.8672 0 13.4023V5.99219C0 5.71875 0.164062 5.47266 0.410156 5.39062L3.74609 4.05078ZM8.94141 9.32812C9.32422 8.86328 9.92578 8.09766 10.5 7.22266V14.0586L5.25 12.5547V7.22266C5.79688 8.09766 6.39844 8.86328 6.78125 9.32812C7.32812 10.0391 8.39453 10.0391 8.94141 9.32812ZM7.875 4.40625C8.47656 4.40625 8.96875 3.94141 8.96875 3.3125C8.96875 2.71094 8.47656 2.21875 7.875 2.21875C7.24609 2.21875 6.78125 2.71094 6.78125 3.3125C6.78125 3.94141 7.24609 4.40625 7.875 4.40625Z" fill="white"/>
-            </svg>
+        <div class="ol-select-value map-source-dropdown">
             <span>ArcGIS Satellite</span>
         </div>
         <div class="ol-select-options">
-            <div>
-                <button>ArcGIS Satellite</button>
-            </div>
-            <div>
-                <button>USGS Topographic</button>
-            </div>
-            <div>
-                <button>OpenStreet Map</button>
-            </div>
-            <div>
-                <button>OPENVKarte</button>
-            </div>
-            <div>
-                <button>ESRI.Delorme</button>
-            </div>
-            <div>
-                <button>CyclOSM</button>
-            </div>
+            <!-- Here the available map sources will be listed-->
         </div>
     </div>