diff --git a/qt/OpenRGBDevicePage.cpp b/qt/OpenRGBDevicePage.cpp
index ff72adf1f..98b7e226e 100644
--- a/qt/OpenRGBDevicePage.cpp
+++ b/qt/OpenRGBDevicePage.cpp
@@ -1219,5 +1219,6 @@ void Ui::OpenRGBDevicePage::on_SelectAllLEDsButton_clicked()
     {
         ui->LEDBox->setCurrentIndex(0);
         on_LEDBox_currentIndexChanged(0);
+        ui->DeviceViewBox->repaint();
     }
 }
diff --git a/qt/OpenRGBDialog2.ui b/qt/OpenRGBDialog2.ui
index 4220afff4..decf790fd 100644
--- a/qt/OpenRGBDialog2.ui
+++ b/qt/OpenRGBDialog2.ui
@@ -15,27 +15,6 @@
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QGridLayout" name="gridLayout">
-    <item row="3" column="2" colspan="3">
-     <widget class="QProgressBar" name="DetectionProgressBar">
-      <property name="value">
-       <number>24</number>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="3">
-     <widget class="QPushButton" name="ButtonDeleteProfile">
-      <property name="text">
-       <string>Delete Profile</string>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="2">
-     <widget class="QPushButton" name="ButtonLoadProfile">
-      <property name="text">
-       <string>Load Profile</string>
-      </property>
-     </widget>
-    </item>
     <item row="2" column="0" colspan="5">
      <widget class="QTabWidget" name="MainTabBar">
       <property name="tabShape">
@@ -83,32 +62,61 @@
       </widget>
      </widget>
     </item>
-    <item row="3" column="0">
-     <widget class="QLabel" name="DetectionProgressLabel">
-      <property name="text">
-       <string>OpenRGB is detecting devices...</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
-     </widget>
+    <item row="6" column="0" colspan="5">
+     <layout class="QHBoxLayout" name="MainButtonsLayout">
+      <item>
+       <widget class="QPushButton" name="ButtonToggleDeviceView">
+        <property name="text">
+         <string>Toggle LED View</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="ButtonSaveProfile">
+        <property name="text">
+         <string>Save Profile</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="ButtonDeleteProfile">
+        <property name="text">
+         <string>Delete Profile</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="ButtonLoadProfile">
+        <property name="text">
+         <string>Load Profile</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="ProfileBox"/>
+      </item>
+     </layout>
     </item>
-    <item row="5" column="4">
-     <widget class="QComboBox" name="ProfileBox"/>
-    </item>
-    <item row="5" column="0">
-     <widget class="QPushButton" name="ButtonToggleDeviceView">
-      <property name="text">
-       <string>Toggle LED View</string>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="1">
-     <widget class="QPushButton" name="ButtonSaveProfile">
-      <property name="text">
-       <string>Save Profile</string>
-      </property>
-     </widget>
+    <item row="4" column="0" colspan="5">
+     <layout class="QHBoxLayout" name="DetectorLayout">
+      <item>
+       <widget class="QLabel" name="DetectionProgressLabel">
+        <property name="text">
+         <string>OpenRGB is detecting devices...</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QProgressBar" name="DetectionProgressBar">
+        <property name="value">
+         <number>24</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </item>
    </layout>
   </widget>