diff --git a/qt/DeviceView.cpp b/qt/DeviceView.cpp
index c0b11a41..8e19597e 100644
--- a/qt/DeviceView.cpp
+++ b/qt/DeviceView.cpp
@@ -92,6 +92,13 @@ void DeviceView::paintEvent(QPaintEvent *event)
painter.drawRect((col * (box_size + box_margin)), (row * (box_size + box_margin)), box_size, box_size);
col++;
+ if(((controller->zones[zone_idx].matrix_map != NULL)
+ &&(col >= (controller->zones[zone_idx].matrix_map->width))))
+ {
+ row++;
+ col = 0;
+ }
+
if(col > max_cols)
{
row++;
diff --git a/qt/OpenRGBDevicePage.ui b/qt/OpenRGBDevicePage.ui
index 018cf215..10d09bd1 100644
--- a/qt/OpenRGBDevicePage.ui
+++ b/qt/OpenRGBDevicePage.ui
@@ -6,265 +6,265 @@
0
0
- 687
- 300
+ 875
+ 374
Frame
- -
-
-
- B:
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
- Random
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Colors:
-
-
-
- -
-
-
- -
-
-
-
-
-
-
- -
-
-
- 255
-
-
-
- -
-
-
- S:
-
-
-
- -
-
-
- R:
-
-
-
- -
-
-
- Resize
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- 255
-
-
-
- -
-
-
- Per-LED
-
-
-
- -
-
-
- 255
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Zone
-
-
-
- -
-
-
- LED
-
-
-
- -
-
-
- Set All Devices
-
-
-
- -
-
-
- G:
-
-
-
- -
-
-
- V:
-
-
-
- -
-
-
- -
-
-
-
-
-
-
- -
-
-
- Dir:
-
-
-
- -
-
-
- Mode-Specific
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- 255
-
-
-
- -
-
-
- LED:
-
-
-
- -
-
-
- 359
-
-
-
- -
-
-
- Mode:
-
-
-
- -
-
-
- Set:
-
-
-
- -
-
-
- Zone:
-
-
-
- -
+
-
Speed:
- -
+
-
+
+
+ 255
+
+
+
+ -
+
+
+ Zone:
+
+
+
+ -
+
+
+ S:
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ G:
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Per-LED
+
+
+
+ -
+
+
+ Mode-Specific
+
+
+
+ -
+
+
+ R:
+
+
+
+ -
+
+
+ Random
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Mode:
+
+
+
+ -
255
- -
-
-
- -
-
-
- -
-
-
- Device
+
-
+
+
+ 255
- -
+
-
+
+
+ 255
+
+
+
+ -
+
+
+ LED
+
+
+
+ -
+
+
+ LED:
+
+
+
+ -
H:
- -
+
-
+
+
+ Colors:
+
+
+
+ -
+
+
+ -
+
+
+ Set All Devices
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Dir:
+
+
+
+ -
+
+
+ Set:
+
+
+
+ -
+
+
+ V:
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Device
+
+
+
+ -
+
+
+ B:
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ Zone
+
+
+
+ -
+
+
+ -
+
+
+ Resize
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ 255
+
+
+
+ -
+
+
+ 359
+
+
+
+ -
@@ -274,8 +274,21 @@
- -
-
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 100
+
+
+