diff --git a/src/duckstation-qt/achievementsettingswidget.ui b/src/duckstation-qt/achievementsettingswidget.ui
index cd7793f61..724017d88 100644
--- a/src/duckstation-qt/achievementsettingswidget.ui
+++ b/src/duckstation-qt/achievementsettingswidget.ui
@@ -29,13 +29,6 @@
       <string>Settings</string>
      </property>
      <layout class="QGridLayout" name="settingsLayout">
-      <item row="1" column="1">
-       <widget class="QCheckBox" name="spectatorMode">
-        <property name="text">
-         <string>Enable Spectator Mode</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0">
        <widget class="QCheckBox" name="enable">
         <property name="text">
@@ -43,10 +36,10 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="unofficialAchievements">
+      <item row="0" column="1">
+       <widget class="QCheckBox" name="hardcoreMode">
         <property name="text">
-         <string>Test Unofficial Achievements</string>
+         <string>Enable Hardcore Mode</string>
         </property>
        </widget>
       </item>
@@ -57,10 +50,17 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QCheckBox" name="hardcoreMode">
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="spectatorMode">
         <property name="text">
-         <string>Enable Hardcore Mode</string>
+         <string>Enable Spectator Mode</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="unofficialAchievements">
+        <property name="text">
+         <string>Test Unofficial Achievements</string>
         </property>
        </widget>
       </item>
@@ -80,10 +80,10 @@
       <string>Notifications</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,1">
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="leaderboardNotifications">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="achievementNotifications">
         <property name="text">
-         <string>Show Leaderboard Notifications</string>
+         <string>Show Achievement Notifications</string>
         </property>
        </widget>
       </item>
@@ -126,10 +126,10 @@
         </item>
        </layout>
       </item>
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="achievementNotifications">
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="leaderboardNotifications">
         <property name="text">
-         <string>Show Achievement Notifications</string>
+         <string>Show Leaderboard Notifications</string>
         </property>
        </widget>
       </item>
@@ -172,17 +172,17 @@
         </item>
        </layout>
       </item>
-      <item row="2" column="1">
-       <widget class="QCheckBox" name="soundEffects">
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="leaderboardTrackers">
         <property name="text">
-         <string>Enable Sound Effects</string>
+         <string>Show Leaderboard Trackers</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="leaderboardTrackers">
+      <item row="2" column="1">
+       <widget class="QCheckBox" name="soundEffects">
         <property name="text">
-         <string>Show Leaderboard Trackers</string>
+         <string>Enable Sound Effects</string>
         </property>
        </widget>
       </item>
@@ -202,6 +202,9 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="challengeIndicatorMode"/>
+      </item>
       <item row="1" column="0">
        <widget class="QCheckBox" name="progressIndicators">
         <property name="text">
@@ -209,9 +212,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="challengeIndicatorMode"/>
-      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/duckstation-qt/biossettingswidget.ui b/src/duckstation-qt/biossettingswidget.ui
index 4e0c04434..0839ecee0 100644
--- a/src/duckstation-qt/biossettingswidget.ui
+++ b/src/duckstation-qt/biossettingswidget.ui
@@ -29,6 +29,23 @@
       <string>BIOS Selection</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>NTSC-J (Japan):</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="imageNTSCJ">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="1">
        <widget class="QComboBox" name="imageNTSCU">
         <property name="sizePolicy">
@@ -53,23 +70,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="imageNTSCJ">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>NTSC-J (Japan):</string>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="1">
        <widget class="QComboBox" name="imagePAL">
         <property name="sizePolicy">
diff --git a/src/duckstation-qt/consolesettingswidget.ui b/src/duckstation-qt/consolesettingswidget.ui
index 094b50924..6c431e661 100644
--- a/src/duckstation-qt/consolesettingswidget.ui
+++ b/src/duckstation-qt/consolesettingswidget.ui
@@ -58,17 +58,17 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
-         <widget class="QCheckBox" name="fastForwardBoot">
+        <item row="0" column="1">
+         <widget class="QCheckBox" name="fastForwardMemoryCardAccess">
           <property name="text">
-           <string>Fast Forward Boot</string>
+           <string>Fast Forward Memory Card Access</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
-         <widget class="QCheckBox" name="fastForwardMemoryCardAccess">
+        <item row="1" column="0">
+         <widget class="QCheckBox" name="fastForwardBoot">
           <property name="text">
-           <string>Fast Forward Memory Card Access</string>
+           <string>Fast Forward Boot</string>
           </property>
          </widget>
         </item>
@@ -90,16 +90,16 @@
       <string>CPU Emulation</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,1">
-      <item row="0" column="1">
-       <widget class="QComboBox" name="cpuExecutionMode"/>
-      </item>
-      <item row="3" column="0" colspan="2">
-       <widget class="QCheckBox" name="recompilerICache">
+      <item row="0" column="0">
+       <widget class="QLabel" name="cpuExecutionModeLabel">
         <property name="text">
-         <string>Enable Recompiler ICache</string>
+         <string>Execution Mode:</string>
         </property>
        </widget>
       </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="cpuExecutionMode"/>
+      </item>
       <item row="1" column="0" colspan="2">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
@@ -134,13 +134,6 @@
         </item>
        </layout>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="cpuExecutionModeLabel">
-        <property name="text">
-         <string>Execution Mode:</string>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="0" colspan="2">
        <widget class="QSlider" name="cpuClockSpeed">
         <property name="minimum">
@@ -163,6 +156,13 @@
         </property>
        </widget>
       </item>
+      <item row="3" column="0" colspan="2">
+       <widget class="QCheckBox" name="recompilerICache">
+        <property name="text">
+         <string>Enable Recompiler ICache</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/duckstation-qt/controllerglobalsettingswidget.ui b/src/duckstation-qt/controllerglobalsettingswidget.ui
index 9cba4ffc9..dc27004d1 100644
--- a/src/duckstation-qt/controllerglobalsettingswidget.ui
+++ b/src/duckstation-qt/controllerglobalsettingswidget.ui
@@ -23,86 +23,6 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="2" column="0">
-    <widget class="QGroupBox" name="dinputGroup">
-     <property name="title">
-      <string>DInput Source</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_4">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_9">
-        <property name="text">
-         <string>The DInput source provides support for legacy controllers which do not support XInput. Accessing these controllers via SDL instead is recommended.</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="enableDInputSource">
-        <property name="text">
-         <string>Enable DInput Input Source</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="0" column="1" rowspan="7">
-    <widget class="QGroupBox" name="deviceListGroup">
-     <property name="title">
-      <string>Detected Devices</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0" colspan="2">
-       <widget class="QListView" name="deviceList">
-        <property name="minimumSize">
-         <size>
-          <width>200</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>200</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QGroupBox" name="groupBox_4">
-     <property name="title">
-      <string>Controller Multitap</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
-      <item row="0" column="0" colspan="2">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>The multitap enables up to 8 controllers to be connected to the console. Each multitap provides 4 ports. Multitap is not supported by all games.</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_8">
-        <property name="text">
-         <string>Multitap Mode:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="multitapMode"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="sdlGroup">
      <property name="title">
@@ -196,16 +116,16 @@
      </layout>
     </widget>
    </item>
-   <item row="5" column="0">
-    <widget class="QGroupBox" name="profileSettings">
+   <item row="2" column="0">
+    <widget class="QGroupBox" name="dinputGroup">
      <property name="title">
-      <string>Profile Settings</string>
+      <string>DInput Source</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_5">
+     <layout class="QGridLayout" name="gridLayout_4">
       <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
+       <widget class="QLabel" name="label_9">
         <property name="text">
-         <string>When this option is enabled, hotkeys can be set in this input profile, and will be used instead of the global hotkeys. By default, hotkeys are always shared between all profiles.</string>
+         <string>The DInput source provides support for legacy controllers which do not support XInput. Accessing these controllers via SDL instead is recommended.</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
@@ -213,9 +133,9 @@
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QCheckBox" name="useProfileHotkeyBindings">
+       <widget class="QCheckBox" name="enableDInputSource">
         <property name="text">
-         <string>Use Per-Profile Hotkeys</string>
+         <string>Enable DInput Input Source</string>
         </property>
        </widget>
       </item>
@@ -369,6 +289,61 @@
      </layout>
     </widget>
    </item>
+   <item row="4" column="0">
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="title">
+      <string>Controller Multitap</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
+      <item row="0" column="0" colspan="2">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>The multitap enables up to 8 controllers to be connected to the console. Each multitap provides 4 ports. Multitap is not supported by all games.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>Multitap Mode:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="multitapMode"/>
+      </item>
+     </layout>
+    </widget>
+   </item>  
+   <item row="5" column="0">
+    <widget class="QGroupBox" name="profileSettings">
+     <property name="title">
+      <string>Profile Settings</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_5">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>When this option is enabled, hotkeys can be set in this input profile, and will be used instead of the global hotkeys. By default, hotkeys are always shared between all profiles.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="useProfileHotkeyBindings">
+        <property name="text">
+         <string>Use Per-Profile Hotkeys</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="6" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -382,6 +357,31 @@
      </property>
     </spacer>
    </item>
+   <item row="0" column="1" rowspan="7">
+    <widget class="QGroupBox" name="deviceListGroup">
+     <property name="title">
+      <string>Detected Devices</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0" colspan="2">
+       <widget class="QListView" name="deviceList">
+        <property name="minimumSize">
+         <size>
+          <width>200</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>200</width>
+          <height>16777215</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/duckstation-qt/emulationsettingswidget.ui b/src/duckstation-qt/emulationsettingswidget.ui
index 06bb7b367..c567bf296 100644
--- a/src/duckstation-qt/emulationsettingswidget.ui
+++ b/src/duckstation-qt/emulationsettingswidget.ui
@@ -68,10 +68,10 @@
       <string>Latency Control</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="1" column="1">
-       <widget class="QCheckBox" name="preFrameSleep">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="vsync">
         <property name="text">
-         <string>Reduce Input Latency</string>
+         <string>Vertical Sync (VSync)</string>
         </property>
        </widget>
       </item>
@@ -82,17 +82,17 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="vsync">
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="optimalFramePacing">
         <property name="text">
-         <string>Vertical Sync (VSync)</string>
+         <string>Optimal Frame Pacing</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="optimalFramePacing">
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="preFrameSleep">
         <property name="text">
-         <string>Optimal Frame Pacing</string>
+         <string>Reduce Input Latency</string>
         </property>
        </widget>
       </item>
diff --git a/src/duckstation-qt/foldersettingswidget.ui b/src/duckstation-qt/foldersettingswidget.ui
index ad29c99e4..61a5e55d2 100644
--- a/src/duckstation-qt/foldersettingswidget.ui
+++ b/src/duckstation-qt/foldersettingswidget.ui
@@ -29,6 +29,13 @@
       <string>Cache Directory</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0" colspan="4">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Used for storing shaders and game list data.</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0">
        <widget class="QLineEdit" name="cache"/>
       </item>
@@ -53,13 +60,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="4">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Used for storing shaders and game list data.</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -69,6 +69,13 @@
       <string>Covers Directory</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
+      <item row="0" column="0" colspan="4">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Used for storing covers in the game grid/Big Picture UIs.</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0">
        <widget class="QLineEdit" name="covers"/>
       </item>
@@ -93,13 +100,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="4">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Used for storing covers in the game grid/Big Picture UIs.</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -109,6 +109,13 @@
       <string>Save States Directory</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0" colspan="4">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Used for storing save states.</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0">
        <widget class="QLineEdit" name="saveStates"/>
       </item>
@@ -133,13 +140,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="4">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Used for storing save states.</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -149,13 +149,6 @@
       <string>Screenshots Directory</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="1" column="2">
-       <widget class="QPushButton" name="screenshotsOpen">
-        <property name="text">
-         <string>Open...</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0" colspan="4">
        <widget class="QLabel" name="label">
         <property name="text">
@@ -163,6 +156,9 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="0">
+       <widget class="QLineEdit" name="screenshots"/>
+      </item>
       <item row="1" column="1">
        <widget class="QPushButton" name="screenshotsBrowse">
         <property name="text">
@@ -170,8 +166,12 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLineEdit" name="screenshots"/>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="screenshotsOpen">
+        <property name="text">
+         <string>Open...</string>
+        </property>
+       </widget>
       </item>
       <item row="1" column="3">
        <widget class="QPushButton" name="screenshotsReset">
@@ -189,13 +189,6 @@
       <string>Videos Directory</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_5">
-      <item row="1" column="2">
-       <widget class="QPushButton" name="videosOpen">
-        <property name="text">
-         <string>Open...</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0" colspan="4">
        <widget class="QLabel" name="label_5">
         <property name="text">
@@ -203,6 +196,9 @@
         </property>
        </widget>
       </item>
+      <item row="1" column="0">
+       <widget class="QLineEdit" name="videos"/>
+      </item>
       <item row="1" column="1">
        <widget class="QPushButton" name="videosBrowse">
         <property name="text">
@@ -210,8 +206,12 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLineEdit" name="videos"/>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="videosOpen">
+        <property name="text">
+         <string>Open...</string>
+        </property>
+       </widget>
       </item>
       <item row="1" column="3">
        <widget class="QPushButton" name="videosReset">
diff --git a/src/duckstation-qt/graphicssettingswidget.ui b/src/duckstation-qt/graphicssettingswidget.ui
index 4e5f0c282..3fc8054f1 100644
--- a/src/duckstation-qt/graphicssettingswidget.ui
+++ b/src/duckstation-qt/graphicssettingswidget.ui
@@ -207,9 +207,6 @@
             </item>
            </layout>
           </item>
-          <item row="7" column="1">
-           <widget class="QComboBox" name="displayCropMode"/>
-          </item>
           <item row="7" column="0">
            <widget class="QLabel" name="label_7">
             <property name="text">
@@ -217,6 +214,9 @@
             </property>
            </widget>
           </item>
+          <item row="7" column="1">
+           <widget class="QComboBox" name="displayCropMode"/>
+          </item>
           <item row="8" column="0">
            <widget class="QLabel" name="label_8">
             <property name="text">
@@ -239,35 +239,35 @@
           </item>
           <item row="10" column="0" colspan="2">
            <layout class="QGridLayout" name="gridLayout_2">
-            <item row="2" column="0">
-             <widget class="QCheckBox" name="force43For24Bit">
+            <item row="0" column="0">
+             <widget class="QCheckBox" name="pgxpEnable">
               <property name="text">
-               <string>Force 4:3 For FMVs</string>
+               <string>PGXP Geometry Correction</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
+            <item row="0" column="1">
              <widget class="QCheckBox" name="pgxpDepthBuffer">
               <property name="text">
                <string>PGXP Depth Buffer (Low Compatibility)</string>
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
-             <widget class="QCheckBox" name="chromaSmoothingFor24Bit">
+            <item row="1" column="0">
+             <widget class="QCheckBox" name="force43For24Bit">
               <property name="text">
-               <string>FMV Chroma Smoothing</string>
+               <string>Force 4:3 For FMVs</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QCheckBox" name="pgxpEnable">
+            <item row="1" column="1">
+             <widget class="QCheckBox" name="chromaSmoothingFor24Bit">
               <property name="text">
-               <string>PGXP Geometry Correction</string>
+               <string>FMV Chroma Smoothing</string>
               </property>
              </widget>
             </item>
-            <item row="3" column="0">
+            <item row="2" column="0">
              <widget class="QCheckBox" name="widescreenHack">
               <property name="text">
                <string>Widescreen Rendering</string>
@@ -554,6 +554,13 @@
           </item>
           <item row="2" column="0" colspan="2">
            <layout class="QGridLayout" name="gridLayout">
+            <item row="0" column="0">
+             <widget class="QCheckBox" name="pgxpTextureCorrection">
+              <property name="text">
+               <string>Perspective Correct Textures</string>
+              </property>
+             </widget>
+            </item>
             <item row="0" column="1">
              <widget class="QCheckBox" name="pgxpColorCorrection">
               <property name="text">
@@ -561,17 +568,17 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
-             <widget class="QCheckBox" name="pgxpVertexCache">
+            <item row="1" column="0">
+             <widget class="QCheckBox" name="pgxpCulling">
               <property name="text">
-               <string>Vertex Cache</string>
+               <string>Culling Correction</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="0">
-             <widget class="QCheckBox" name="pgxpTextureCorrection">
+            <item row="1" column="1">
+             <widget class="QCheckBox" name="pgxpPreserveProjPrecision">
               <property name="text">
-               <string>Perspective Correct Textures</string>
+               <string>Preserve Projection Precision</string>
               </property>
              </widget>
             </item>
@@ -582,17 +589,10 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QCheckBox" name="pgxpPreserveProjPrecision">
-              <property name="text">
-               <string>Preserve Projection Precision</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QCheckBox" name="pgxpCulling">
+            <item row="2" column="1">
+             <widget class="QCheckBox" name="pgxpVertexCache">
               <property name="text">
-               <string>Culling Correction</string>
+               <string>Vertex Cache</string>
               </property>
              </widget>
             </item>
@@ -705,38 +705,38 @@
           </item>
           <item row="3" column="0" colspan="2">
            <layout class="QGridLayout" name="gridLayout_3">
-            <item row="1" column="1">
-             <widget class="QCheckBox" name="showFPS">
+            <item row="0" column="0">
+             <widget class="QCheckBox" name="showOSDMessages">
               <property name="text">
-               <string>Show FPS</string>
+               <string>Show OSD Messages</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="0">
-             <widget class="QCheckBox" name="showOSDMessages">
+            <item row="0" column="1">
+             <widget class="QCheckBox" name="showStatusIndicators">
               <property name="text">
-               <string>Show OSD Messages</string>
+               <string>Show Status Indicators</string>
               </property>
              </widget>
             </item>
-            <item row="2" column="0">
-             <widget class="QCheckBox" name="showCPU">
+            <item row="1" column="0">
+             <widget class="QCheckBox" name="showSpeed">
               <property name="text">
-               <string>Show CPU Usage</string>
+               <string>Show Emulation Speed</string>
               </property>
              </widget>
             </item>
-            <item row="3" column="0">
-             <widget class="QCheckBox" name="showGPUStatistics">
+            <item row="1" column="1">
+             <widget class="QCheckBox" name="showFPS">
               <property name="text">
-               <string>Show GPU Statistics</string>
+               <string>Show FPS</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QCheckBox" name="showSpeed">
+            <item row="2" column="0">
+             <widget class="QCheckBox" name="showCPU">
               <property name="text">
-               <string>Show Emulation Speed</string>
+               <string>Show CPU Usage</string>
               </property>
              </widget>
             </item>
@@ -747,45 +747,45 @@
               </property>
              </widget>
             </item>
-            <item row="5" column="1">
-             <widget class="QCheckBox" name="showSettings">
+            <item row="3" column="0">
+             <widget class="QCheckBox" name="showGPUStatistics">
               <property name="text">
-               <string>Show Settings</string>
+               <string>Show GPU Statistics</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
-             <widget class="QCheckBox" name="showStatusIndicators">
+            <item row="3" column="1">
+             <widget class="QCheckBox" name="showResolution">
               <property name="text">
-               <string>Show Status Indicators</string>
+               <string>Show Resolution</string>
               </property>
              </widget>
             </item>
-            <item row="5" column="0">
-             <widget class="QCheckBox" name="showInput">
+            <item row="4" column="0">
+             <widget class="QCheckBox" name="showFrameTimes">
               <property name="text">
-               <string>Show Controller Input</string>
+               <string>Show Frame Times</string>
               </property>
              </widget>
             </item>
-            <item row="4" column="0">
-             <widget class="QCheckBox" name="showFrameTimes">
+            <item row="4" column="1">
+             <widget class="QCheckBox" name="showLatencyStatistics">
               <property name="text">
-               <string>Show Frame Times</string>
+               <string>Show Latency Statistics</string>
               </property>
              </widget>
             </item>
-            <item row="3" column="1">
-             <widget class="QCheckBox" name="showResolution">
+            <item row="5" column="0">
+             <widget class="QCheckBox" name="showInput">
               <property name="text">
-               <string>Show Resolution</string>
+               <string>Show Controller Input</string>
               </property>
              </widget>
             </item>
-            <item row="4" column="1">
-             <widget class="QCheckBox" name="showLatencyStatistics">
+            <item row="5" column="1">
+             <widget class="QCheckBox" name="showSettings">
               <property name="text">
-               <string>Show Latency Statistics</string>
+               <string>Show Settings</string>
               </property>
              </widget>
             </item>
@@ -1249,13 +1249,6 @@
           <string>Textures Directory</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_10">
-          <item row="1" column="2">
-           <widget class="QPushButton" name="texturesDirectoryOpen">
-            <property name="text">
-             <string>Open...</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="0" colspan="4">
            <widget class="QLabel" name="texturesDirectoryLabel">
             <property name="text">
@@ -1263,6 +1256,9 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="0">
+           <widget class="QLineEdit" name="texturesDirectory"/>
+          </item>
           <item row="1" column="1">
            <widget class="QPushButton" name="texturesDirectoryBrowse">
             <property name="text">
@@ -1270,8 +1266,12 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QLineEdit" name="texturesDirectory"/>
+          <item row="1" column="2">
+           <widget class="QPushButton" name="texturesDirectoryOpen">
+            <property name="text">
+             <string>Open...</string>
+            </property>
+           </widget>
           </item>
           <item row="1" column="3">
            <widget class="QPushButton" name="texturesDirectoryReset">
diff --git a/src/duckstation-qt/interfacesettingswidget.ui b/src/duckstation-qt/interfacesettingswidget.ui
index 2618a2be9..9974684ea 100644
--- a/src/duckstation-qt/interfacesettingswidget.ui
+++ b/src/duckstation-qt/interfacesettingswidget.ui
@@ -29,59 +29,59 @@
       <string>Behavior</string>
      </property>
      <layout class="QGridLayout" name="formLayout_4">
-      <item row="3" column="0">
-       <widget class="QCheckBox" name="createSaveStateBackups">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="confirmPowerOff">
         <property name="text">
-         <string>Create Save State Backups</string>
+         <string>Confirm Power Off</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
-       <widget class="QCheckBox" name="enableDiscordPresence">
+      <item row="0" column="1">
+       <widget class="QCheckBox" name="saveStateOnExit">
         <property name="text">
-         <string>Enable Discord Presence</string>
+         <string>Save State On Shutdown</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QCheckBox" name="pauseOnControllerDisconnection">
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="inhibitScreensaver">
         <property name="text">
-         <string>Pause On Controller Disconnection</string>
+         <string>Inhibit Screensaver</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="confirmPowerOff">
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="pauseOnStart">
         <property name="text">
-         <string>Confirm Power Off</string>
+         <string>Pause On Start</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="inhibitScreensaver">
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="pauseOnFocusLoss">
         <property name="text">
-         <string>Inhibit Screensaver</string>
+         <string>Pause On Focus Loss</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QCheckBox" name="saveStateOnExit">
+      <item row="2" column="1">
+       <widget class="QCheckBox" name="pauseOnControllerDisconnection">
         <property name="text">
-         <string>Save State On Shutdown</string>
+         <string>Pause On Controller Disconnection</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QCheckBox" name="pauseOnStart">
+      <item row="3" column="0">
+       <widget class="QCheckBox" name="createSaveStateBackups">
         <property name="text">
-         <string>Pause On Start</string>
+         <string>Create Save State Backups</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="pauseOnFocusLoss">
+      <item row="3" column="1">
+       <widget class="QCheckBox" name="enableDiscordPresence">
         <property name="text">
-         <string>Pause On Focus Loss</string>
+         <string>Enable Discord Presence</string>
         </property>
        </widget>
       </item>
@@ -145,9 +145,6 @@
       <string>Appearance</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3" columnstretch="0,1,0,1">
-      <item row="0" column="3">
-       <widget class="QComboBox" name="theme"/>
-      </item>
       <item row="0" column="0">
        <widget class="QLabel" name="languageLabel">
         <property name="text">
@@ -155,6 +152,9 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="language"/>
+      </item>
       <item row="0" column="2">
        <widget class="QLabel" name="themeLabel">
         <property name="text">
@@ -162,8 +162,8 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="language"/>
+      <item row="0" column="3">
+       <widget class="QComboBox" name="theme"/>
       </item>
      </layout>
     </widget>
diff --git a/src/duckstation-qt/setupwizarddialog.ui b/src/duckstation-qt/setupwizarddialog.ui
index 737737b43..2d25e17d0 100644
--- a/src/duckstation-qt/setupwizarddialog.ui
+++ b/src/duckstation-qt/setupwizarddialog.ui
@@ -258,6 +258,13 @@
          <item row="1" column="1">
           <widget class="QComboBox" name="theme"/>
          </item>
+         <item row="2" column="0" colspan="2">
+          <widget class="QCheckBox" name="autoUpdateEnabled">
+           <property name="text">
+            <string>Enable Automatic Updates</string>
+           </property>
+          </widget>
+         </item>
          <item row="3" column="1">
           <spacer name="verticalSpacer_3">
            <property name="orientation">
@@ -271,13 +278,6 @@
            </property>
           </spacer>
          </item>
-         <item row="2" column="0" colspan="2">
-          <widget class="QCheckBox" name="autoUpdateEnabled">
-           <property name="text">
-            <string>Enable Automatic Updates</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
       </layout>
@@ -576,6 +576,13 @@
           <string>Controller Port 1</string>
          </property>
          <layout class="QFormLayout" name="formLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_11">
+            <property name="text">
+             <string>Controller Type:</string>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="1">
            <widget class="QComboBox" name="controller1Type"/>
           </item>
@@ -586,13 +593,6 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_11">
-            <property name="text">
-             <string>Controller Type:</string>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="1">
            <layout class="QHBoxLayout" name="horizontalLayout_5">
             <item>
@@ -881,6 +881,16 @@
            </property>
           </widget>
          </item>
+         <item row="7" column="0">
+          <widget class="QLabel" name="label_22">
+           <property name="text">
+            <string>FMV Scaling:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="1">
+          <widget class="QComboBox" name="displayScaling24Bit"/>
+         </item>
          <item row="8" column="0" colspan="2">
           <layout class="QGridLayout" name="gridLayout_2">
            <item row="0" column="0">
@@ -905,16 +915,6 @@
            </item>
           </layout>
          </item>
-         <item row="7" column="0">
-          <widget class="QLabel" name="label_22">
-           <property name="text">
-            <string>FMV Scaling:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="1">
-          <widget class="QComboBox" name="displayScaling24Bit"/>
-         </item>
         </layout>
        </item>
        <item>