diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 6712dbd901f3f956bb37d2d2f2d6f1e63cb14cca..eedeb42efbc42c108790d4bbf84627c316b7910a 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -606,8 +606,8 @@ QGCView {
             anchors.bottom:         parent.bottom
             anchors.leftMargin:     ScreenTools.defaultFontPixelWidth
             anchors.bottomMargin:   ScreenTools.defaultFontPixelWidth
-            maxWidth:               300
-            maxHeight:              parent.height - toolStrip.height - ScreenTools.defaultFontPixelWidth*4
+            maxWidth:               Math.min(300, singleMultiSelector.x - ScreenTools.defaultFontPixelHeight*4 )
+            maxHeight:              parent.height - toolStrip.height - toolStrip.y - ScreenTools.defaultFontPixelHeight*4
 
 
             wimaController: wimaController
diff --git a/src/FlightDisplay/FlightDisplayWimaMenu.qml b/src/FlightDisplay/FlightDisplayWimaMenu.qml
index 45670d651b8534ba237bbf93e1da9a1ca1b466d2..d84b73865a24d97a842080ffa3b04d46838e1bba 100644
--- a/src/FlightDisplay/FlightDisplayWimaMenu.qml
+++ b/src/FlightDisplay/FlightDisplayWimaMenu.qml
@@ -68,12 +68,6 @@ Item {
 
         property real _margins:       _root._margins
 
-        Component.onCompleted: {
-            console.log('mainFrame onCompleted')
-            console.log('_margins')
-            console.log(_margins)
-        }
-
         // checkbox to enable/ disable wima
         SliderSwitch {
             id: enableWima
diff --git a/src/Wima/WimaPlaner.cc b/src/Wima/WimaPlaner.cc
index 9dace16b01dfcff85129203c346ecec1e88ec483..910c15153da32d216e5b2f45acae88bff69e9d6c 100644
--- a/src/Wima/WimaPlaner.cc
+++ b/src/Wima/WimaPlaner.cc
@@ -36,10 +36,10 @@ WimaPlaner::WimaPlaner(QObject *parent)
     _updateTimer.setInterval(500); // 250 ms means: max update time 2*250 ms
     _updateTimer.start();
 
-    // for debugging and testing purpose
+    // for debugging and testing purpose, remove if not needed anymore
     connect(&_autoLoadTimer, &QTimer::timeout, this, &WimaPlaner::autoLoadMission);
     _autoLoadTimer.setSingleShot(true);
-    _autoLoadTimer.start(300);
+    //_autoLoadTimer.start(300);
 
     _calcArrivalAndReturnPathTimer.setInterval(100);
     _calcArrivalAndReturnPathTimer.setSingleShot(true);