Menu: Arrange 3 x 2 and 2 x 2 (#442)

* Arrange 3 x 3 and 2 x 2

* typo

panels/menu.py

@@ -43,6 +43,14 @@ class MenuPanel(ScreenPanel):
             if not self.evaluate_enable(item[key]['enable']):
                 continue
 
+            if columns == 4:
+                if length <= 4:
+                    # Arrange 2 x 2
+                    columns = 2
+                elif length > 4 and length <= 6:
+                    # Arrange 3 x 2
+                    columns = 3
+
             col = i % columns
             row = int(i/columns)
             width = 1