Index: sources/gui/qml/components/GridSelection.qml
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r5605f930ab5cd1a62b96347f4b4300ef30a830ee
--- sources/gui/qml/components/GridSelection.qml	(.../GridSelection.qml)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/gui/qml/components/GridSelection.qml	(.../GridSelection.qml)	(revision 5605f930ab5cd1a62b96347f4b4300ef30a830ee)
@@ -28,14 +28,18 @@
  *          where only one option is selected by the user
  */
 Rectangle { id: _root
-    property int    rowCount        :  2
-    property int    colCount        :  2
+    property int    rowCount        :  _rowCount
+    property int    colCount        :  _colCount
     property int    curIndex        : -1
     property int    optionHeight    : Variables.gridSelectionButtonHeight
     property int    optionWidth     : Variables.gridSelectionButtonWidth
     property alias  title           : _title.text
     property var    labels          : []
 
+    readonly property int _itemCount: labels.length
+    readonly property int _rowCount : Math.ceil( _itemCount / _colCount )
+    readonly property int _colCount : 2
+
     anchors.horizontalCenter: parent.horizontalCenter
     color   : Colors.transparent
     height  : _root.rowCount * _root.optionHeight