diff --git a/nemo_dummy_temp.py b/nemo_dummy_temp.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/MeasurementComplexItem/geometry/MeasurementArea.cc b/src/MeasurementComplexItem/geometry/MeasurementArea.cc
index ed07573238c469628cec71924f32a1a0d98ef352..8aa02a04702321b8328c6dc8e0e31d0552519939 100644
--- a/src/MeasurementComplexItem/geometry/MeasurementArea.cc
+++ b/src/MeasurementComplexItem/geometry/MeasurementArea.cc
@@ -326,7 +326,13 @@ bool MeasurementArea::loadFromJson(const QJsonObject &json,
 bool MeasurementArea::isCorrect() {
   if (GeoArea::isCorrect()) {
     if (ready()) {
-      return true;
+      if (_tiles->count() > 0) {
+        return true;
+      } else {
+        setErrorString(tr("Not able to create tiles. This indicates that the "
+                          "tile parameters must be adjusted. Reducing the Min. "
+                          "Area parameter might deliver the desired result."));
+      }
     } else if (_toManyTiles) {
       setErrorString(
           tr("Calculation would yield to many tiles, please adjust the tile "
@@ -627,8 +633,10 @@ bool getTiles(const FPolygon &area, Length tileHeight, Length tileWidth,
     minimalBoundingBox(area, bbox);
   }
 
-  if (bbox.corners.outer().size() < 5)
+  if (bbox.corners.outer().size() < 5) {
     return false;
+  }
+
   double bboxWidth = bbox.width;
   double bboxHeight = bbox.height;
   FPoint origin = bbox.corners.outer()[0];
diff --git a/src/MeasurementComplexItem/qml/AreaDataEditor.qml b/src/MeasurementComplexItem/qml/AreaDataEditor.qml
index d6828d2aa7eeabbbb6f764cc14287e4fb42fa4eb..2457174ebfc0b5b20ca7aa0df16de41e00e78471 100644
--- a/src/MeasurementComplexItem/qml/AreaDataEditor.qml
+++ b/src/MeasurementComplexItem/qml/AreaDataEditor.qml
@@ -218,8 +218,8 @@ Rectangle {
                     wrapMode: Text.WordWrap
                     horizontalAlignment: Text.AlignLeft
                     text: qsTr("Use the Intersection button to clip the Measurement Area(s).
-Use the Reset button to restore the areas to the state before entering this tab.
-Use the Abort button to reset the areas and leave the tab.")
+Use the Reset button to restore the areas to the state before entering this tab."
+)
                     Layout.fillWidth: true
                     Layout.columnSpan: parent.columns
                 }
diff --git a/src/MeasurementComplexItem/qml/MeasurementItemEditor.qml b/src/MeasurementComplexItem/qml/MeasurementItemEditor.qml
index f5efc17514caf29eaa770d13feb115a909151e71..7752fb92774ac4ae72cd3a554819c1281d909d85 100644
--- a/src/MeasurementComplexItem/qml/MeasurementItemEditor.qml
+++ b/src/MeasurementComplexItem/qml/MeasurementItemEditor.qml
@@ -43,6 +43,7 @@ Rectangle {
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
+        spacing: _margin
 
         QGCTabBar {
             id: tabBar
@@ -78,11 +79,6 @@ Rectangle {
             visible: tabBar.currentIndex === tabBar.areaEditorIndex
             missionItem: _root._missionItem
             availableWidth: mainColumn.width
-            onVisibleChanged:{
-                if (visible){
-                    _missionItem.startEditing()
-                }
-            }
         }
 
         MCI.ParameterEditor {
diff --git a/src/MeasurementComplexItem/qml/NemoEditor.qml b/src/MeasurementComplexItem/qml/NemoEditor.qml
index 8e42193416aef76b5d17a3f299c90eb3fefdc345..51895a7aa8f378cd5d0dd817ced9d7f832288264 100644
--- a/src/MeasurementComplexItem/qml/NemoEditor.qml
+++ b/src/MeasurementComplexItem/qml/NemoEditor.qml
@@ -179,7 +179,7 @@ Rectangle {
                 id: hintLabel
                 wrapMode: Text.WordWrap
                 horizontalAlignment: Text.AlignLeft
-                text: qsTr("Use this tab to connect to a device implementing the Nemo Interface.
+                text: qsTr("Use this tab to connect to a device implementing the Nemointerface.
 Use the Random button to simulate measurement progress.")
                 Layout.fillWidth: true
                 Layout.columnSpan: parent.columns