Index: sources/gui/qml/dialogs/CalibrationDialog.qml
===================================================================
diff -u -rbb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43 -rfd13750406289b7fd9d49c7827ad143fe246278f
--- sources/gui/qml/dialogs/CalibrationDialog.qml	(.../CalibrationDialog.qml)	(revision bb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43)
+++ sources/gui/qml/dialogs/CalibrationDialog.qml	(.../CalibrationDialog.qml)	(revision fd13750406289b7fd9d49c7827ad143fe246278f)
@@ -127,10 +127,15 @@
     }
 
     Grid { id: entryColumn
-        anchors.horizontalCenter: parent.horizontalCenter
-        columns         : 2
-        rowSpacing      : Variables.defaultMargin * 5
-        columnSpacing   : Variables.defaultMargin * 5
+        readonly property bool needExtraColumn : _repeater.count  > 9
+        anchors{
+            horizontalCenter: parent.horizontalCenter
+            top             : parent.top
+            topMargin       : needExtraColumn ? 0 : Variables.defaultMargin
+        }
+        columns         : needExtraColumn ? 4 : 3
+        rowSpacing      : needExtraColumn ? Variables.defaultMargin * 4 : Variables.defaultMargin * 5
+        columnSpacing   : needExtraColumn ? Variables.defaultMargin * 3 : Variables.defaultMargin * 5
 
         Repeater { id: _repeater
             model: _root.entries
@@ -148,7 +153,7 @@
                         horizontalCenter: parent.horizontalCenter
                     }
 
-                    height          : Variables.contentHeight
+                    height          : 40
                     width           : parent.width
 
                     color           : Colors.textMain