diff --git a/WimaDok/main.tex b/WimaDok/main.tex
index 15efb6802526ff455dfa562f9369f46c6ea7a0de..b569afe1d09ab382026478ef566a24d6a30c6686 100644
--- a/WimaDok/main.tex
+++ b/WimaDok/main.tex
@@ -26,6 +26,8 @@ WiMA is a abbreviation for \textbf{Wi}reless \textbf{M}easurement \textbf{A}ppli
 This document was created to explain the functionality of the WiMA-Extension at one hand, and to encourage the reader to find bugs inside the program. As the extension is still being developed the contents demonstrated inside this document may differ from those ones in the program.
 
 The folder "deploy" in the QGroundControl root directory (can be cloned from Gitlab) contains a AppImage of the program. QGroundControl can be launched by double-clicking the AppImage. Currently only a Linux version is available.
+
+A Documentation of the QGroundControl program can be found under \url{https://docs.qgroundcontrol.com/en/}.
  
 
 \section{Documentation}
diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index cc07dd40737badf834094c8aa266687c49997e9d..c5cdea2278235b56166698c651dfed17fe922757 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -229,6 +229,7 @@
         <file alias="QGroundControl/Controls/WimaCorridorEditor.qml">src/WimaView/WimaCorridorEditor.qml</file>
         <file alias="QGroundControl/FlightMap/WimaPlanMapItems.qml">src/FlightMap/MapItems/WimaPlanMapItems.qml</file>
         <file alias="QGroundControl/FlightMap/WimaMissionItemMapVisual.qml">src/PlanView/WimaMissionItemMapVisual.qml</file>
+        <file alias="QGroundControl/FlightDisplay/FlightDisplayWimaMenu.qml">src/FlightDisplay/FlightDisplayWimaMenu.qml</file>
     </qresource>
     <qresource prefix="/json">
         <file alias="APMMavlinkStreamRate.SettingsGroup.json">src/Settings/APMMavlinkStreamRate.SettingsGroup.json</file>
diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 673974b02126e0a0fad998ca8e8c38f94a995ad9..6a4e25cebe1f49b76edb3d34b85837ec04366225 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -510,17 +510,25 @@ QGCView {
             }
         }
 
-        FlightDisplayViewWidgets {
-            id:                 flightDisplayViewWidgets
+//        FlightDisplayViewWidgets {
+//            id:                 flightDisplayViewWidgets
+//            z:                  _panel.z + 4
+//            height:             ScreenTools.availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0)
+//            anchors.left:       parent.left
+//            anchors.right:      altitudeSlider.visible ? altitudeSlider.left : parent.right
+//            anchors.bottom:     parent.bottom
+//            qgcView:            root
+//            useLightColors:     isBackgroundDark
+//            missionController:  _missionController
+//            visible:            singleVehicleView.checked && !QGroundControl.videoManager.fullScreen
+//        }
+
+        FlightDisplayWimaMenu {
+            id: wimaMenu
             z:                  _panel.z + 4
-            height:             ScreenTools.availableHeight - (singleMultiSelector.visible ? singleMultiSelector.height + _margins : 0)
             anchors.left:       parent.left
             anchors.right:      altitudeSlider.visible ? altitudeSlider.left : parent.right
             anchors.bottom:     parent.bottom
-            qgcView:            root
-            useLightColors:     isBackgroundDark
-            missionController:  _missionController
-            visible:            singleVehicleView.checked && !QGroundControl.videoManager.fullScreen
         }
 
         //-------------------------------------------------------------------------
diff --git a/src/FlightDisplay/FlightDisplayWimaMenu.qml b/src/FlightDisplay/FlightDisplayWimaMenu.qml
new file mode 100644
index 0000000000000000000000000000000000000000..1d90c0f09fbaf9eda1158b99d0088d652d016256
--- /dev/null
+++ b/src/FlightDisplay/FlightDisplayWimaMenu.qml
@@ -0,0 +1,32 @@
+import QtQuick                  2.3
+import QtQuick.Controls         1.2
+import QtQuick.Controls.Styles  1.4
+import QtQuick.Dialogs          1.2
+import QtLocation               5.3
+import QtPositioning            5.3
+import QtQuick.Layouts          1.2
+
+import QGroundControl               1.0
+import QGroundControl.ScreenTools   1.0
+import QGroundControl.Controls      1.0
+import QGroundControl.Palette       1.0
+import QGroundControl.Vehicle       1.0
+import QGroundControl.FlightMap     1.0
+import QGroundControl.Airspace      1.0
+import QGroundControl.Airmap        1.0
+
+Item {
+    id: _root
+
+    Rectangle {
+        anchors.top:        parent.top
+        color:              "white"
+        height: 100
+        width: 200
+
+        QGCCheckBox {
+            id: enableWima
+            text: qsTr("WiMA")
+        }
+    }
+}
diff --git a/src/FlightDisplay/qmldir b/src/FlightDisplay/qmldir
index f37894a8b7de3e97cf3a70eb14bd974b818c5000..7eb144dc6d7d5d249e5326e843f4ff58ee59dcb3 100644
--- a/src/FlightDisplay/qmldir
+++ b/src/FlightDisplay/qmldir
@@ -15,4 +15,5 @@ PreFlightGPSCheck           1.0 PreFlightGPSCheck.qml
 PreFlightRCCheck            1.0 PreFlightRCCheck.qml
 PreFlightSensorsHealthCheck 1.0 PreFlightSensorsHealthCheck.qml
 PreFlightSoundCheck         1.0 PreFlightSoundCheck.qml
+FlightDisplayWimaMenu       1.0 FlightDisplayWimaMenu.qml
 
diff --git a/src/FlightMap/Images/.directory b/src/FlightMap/Images/.directory
new file mode 100644
index 0000000000000000000000000000000000000000..7f2a552800449f3024f021c8c015686c01dc9c61
--- /dev/null
+++ b/src/FlightMap/Images/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2019,10,13,16,25,8
+Version=4
diff --git a/src/Wima/WimaController.cc b/src/Wima/WimaController.cc
index fa3705bb1a7770fbe88066ecbc342f5831dbc6bb..435f93909d6a98173112be857c10aa59362b590c 100644
--- a/src/Wima/WimaController.cc
+++ b/src/Wima/WimaController.cc
@@ -123,11 +123,6 @@ void WimaController::resumeMission()
 
 }
 
-bool WimaController::updateMission()
-{
-    return true;
-}
-
 void WimaController::saveToCurrent()
 {
 }