diff --git a/launcher/ui/pages/global/APIPage.ui b/launcher/ui/pages/global/APIPage.ui
index 3280558ab..0b9dde764 100644
--- a/launcher/ui/pages/global/APIPage.ui
+++ b/launcher/ui/pages/global/APIPage.ui
@@ -20,9 +20,9 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>-270</y>
-        <width>807</width>
-        <height>870</height>
+        <y>0</y>
+        <width>804</width>
+        <height>832</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
@@ -84,19 +84,6 @@
           <string>Meta&amp;data Server</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_5">
-          <item>
-           <widget class="QLabel" name="metaURLLabel">
-            <property name="text">
-             <string>Base URL</string>
-            </property>
-            <property name="textFormat">
-             <enum>Qt::RichText</enum>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
           <item>
            <widget class="QLineEdit" name="metaURL">
             <property name="placeholderText">
@@ -202,6 +189,9 @@
           </item>
           <item>
            <spacer name="verticalSpacer">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
             <property name="sizeType">
              <enum>QSizePolicy::Fixed</enum>
             </property>
@@ -257,6 +247,9 @@
           </item>
           <item>
            <spacer name="verticalSpacer_4">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
             <property name="sizeType">
              <enum>QSizePolicy::Fixed</enum>
             </property>
@@ -309,6 +302,9 @@
           </item>
           <item>
            <spacer name="verticalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
             <property name="sizeType">
              <enum>QSizePolicy::Fixed</enum>
             </property>
diff --git a/launcher/ui/widgets/CustomCommands.ui b/launcher/ui/widgets/CustomCommands.ui
index 53fca9419..cabd1372d 100644
--- a/launcher/ui/widgets/CustomCommands.ui
+++ b/launcher/ui/widgets/CustomCommands.ui
@@ -51,42 +51,71 @@
       <item row="0" column="0">
        <widget class="QLabel" name="labelPreLaunchCmd">
         <property name="text">
-         <string>&amp;Pre-launch command:</string>
+         <string>&amp;Pre-launch Command</string>
         </property>
         <property name="buddy">
          <cstring>preLaunchCmdTextBox</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="wrapperCmdTextBox"/>
+      <item row="5" column="0">
+       <spacer name="verticalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>0</width>
+          <height>6</height>
+         </size>
+        </property>
+       </spacer>
       </item>
-      <item row="0" column="1">
+      <item row="1" column="0">
        <widget class="QLineEdit" name="preLaunchCmdTextBox"/>
       </item>
-      <item row="2" column="0">
+      <item row="4" column="0">
+       <widget class="QLineEdit" name="wrapperCmdTextBox"/>
+      </item>
+      <item row="6" column="0">
        <widget class="QLabel" name="labelPostExitCmd">
         <property name="text">
-         <string>P&amp;ost-exit command:</string>
+         <string>P&amp;ost-exit Command</string>
         </property>
         <property name="buddy">
          <cstring>labelPostExitCmd</cstring>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
+      <item row="7" column="0">
        <widget class="QLineEdit" name="postExitCmdTextBox"/>
       </item>
-      <item row="1" column="0">
+      <item row="3" column="0">
        <widget class="QLabel" name="labelWrapperCmd">
         <property name="text">
-         <string>&amp;Wrapper command:</string>
+         <string>&amp;Wrapper Command</string>
         </property>
         <property name="buddy">
          <cstring>wrapperCmdTextBox</cstring>
         </property>
        </widget>
       </item>
+      <item row="2" column="0">
+       <spacer name="verticalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>0</width>
+          <height>6</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/launcher/ui/widgets/JavaSettingsWidget.ui b/launcher/ui/widgets/JavaSettingsWidget.ui
index 3094aadc8..366b8d6fc 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.ui
+++ b/launcher/ui/widgets/JavaSettingsWidget.ui
@@ -202,6 +202,22 @@
         </property>
        </widget>
       </item>
+      <item>
+       <spacer name="verticalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>0</width>
+          <height>6</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item>
        <widget class="QLabel" name="labelMaxMem">
         <property name="text">
@@ -240,6 +256,22 @@
         </property>
        </widget>
       </item>
+      <item>
+       <spacer name="verticalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>0</width>
+          <height>6</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item>
        <widget class="QLabel" name="label_11">
         <property name="text">
@@ -278,10 +310,26 @@
         </property>
        </widget>
       </item>
+      <item>
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>0</width>
+          <height>6</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item>
        <widget class="QLabel" name="labelMaxMemNotice">
         <property name="text">
-         <string>TextLabel</string>
+         <string>Memory Notice</string>
         </property>
        </widget>
       </item>
diff --git a/launcher/ui/widgets/MinecraftSettingsWidget.cpp b/launcher/ui/widgets/MinecraftSettingsWidget.cpp
index 07761207a..c3d342d42 100644
--- a/launcher/ui/widgets/MinecraftSettingsWidget.cpp
+++ b/launcher/ui/widgets/MinecraftSettingsWidget.cpp
@@ -137,7 +137,6 @@ void MinecraftSettingsWidget::loadSettings()
     // Game Window
     m_ui->windowSizeGroupBox->setChecked(m_instance == nullptr || settings->get("OverrideWindow").toBool() ||
                                          settings->get("OverrideMiscellaneous").toBool());
-    m_ui->windowSizeGroupBox->setChecked(settings->get("OverrideWindow").toBool());
     m_ui->maximizedCheckBox->setChecked(settings->get("LaunchMaximized").toBool());
     m_ui->windowWidthSpinBox->setValue(settings->get("MinecraftWinWidth").toInt());
     m_ui->windowHeightSpinBox->setValue(settings->get("MinecraftWinHeight").toInt());
diff --git a/launcher/ui/widgets/MinecraftSettingsWidget.ui b/launcher/ui/widgets/MinecraftSettingsWidget.ui
index b71250c47..4c317c15d 100644
--- a/launcher/ui/widgets/MinecraftSettingsWidget.ui
+++ b/launcher/ui/widgets/MinecraftSettingsWidget.ui
@@ -58,9 +58,9 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>0</y>
+            <y>-130</y>
             <width>603</width>
-            <height>744</height>
+            <height>812</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -200,17 +200,33 @@
                 </item>
                </layout>
               </item>
+              <item>
+               <spacer name="verticalSpacer_3">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeType">
+                 <enum>QSizePolicy::Fixed</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>0</width>
+                  <height>6</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
               <item>
                <widget class="QCheckBox" name="closeAfterLaunchCheck">
                 <property name="text">
-                 <string>Close the launcher after the game window opens</string>
+                 <string>When the game window opens, hide the launcher</string>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QCheckBox" name="quitAfterGameStopCheck">
                 <property name="text">
-                 <string>Quit the launcher after the game window closes</string>
+                 <string>When the game window closes, quit the launcher</string>
                 </property>
                </widget>
               </item>
@@ -235,97 +251,24 @@
               <item>
                <widget class="QCheckBox" name="showConsoleCheck">
                 <property name="text">
-                 <string>Show console window while the game is running</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="autoCloseConsoleCheck">
-                <property name="text">
-                 <string>Automatically close console window when the game quits</string>
+                 <string>When the game is launched, show the console window</string>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QCheckBox" name="showConsoleErrorCheck">
                 <property name="text">
-                 <string>Show console window when the game crashes</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="instanceAccountGroupBox">
-             <property name="title">
-              <string>&amp;Override Default Account</string>
-             </property>
-             <property name="checkable">
-              <bool>true</bool>
-             </property>
-             <property name="checked">
-              <bool>false</bool>
-             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_15">
-              <item>
-               <widget class="QLabel" name="instanceAccountNameLabel">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string>Account</string>
+                 <string>When the game crashes, show the console window</string>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QComboBox" name="instanceAccountSelector">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="serverJoinGroupBox">
-             <property name="title">
-              <string>Enable &amp;Auto-join</string>
-             </property>
-             <property name="checkable">
-              <bool>true</bool>
-             </property>
-             <property name="checked">
-              <bool>false</bool>
-             </property>
-             <layout class="QGridLayout" name="gridLayout_4">
-              <item row="2" column="0">
-               <widget class="QRadioButton" name="worldJoinButton">
+               <widget class="QCheckBox" name="autoCloseConsoleCheck">
                 <property name="text">
-                 <string>Singleplayer world</string>
+                 <string>When the game quits, hide the console window</string>
                 </property>
                </widget>
               </item>
-              <item row="0" column="0">
-               <widget class="QRadioButton" name="serverJoinAddressButton">
-                <property name="text">
-                 <string>Server address</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="2">
-               <widget class="QLineEdit" name="serverJoinAddress"/>
-              </item>
-              <item row="2" column="2">
-               <widget class="QComboBox" name="worldsCb"/>
-              </item>
              </layout>
             </widget>
            </item>
@@ -375,6 +318,93 @@
              </layout>
             </widget>
            </item>
+           <item>
+            <widget class="QGroupBox" name="instanceAccountGroupBox">
+             <property name="title">
+              <string>Override &amp;Default Account</string>
+             </property>
+             <property name="checkable">
+              <bool>true</bool>
+             </property>
+             <property name="checked">
+              <bool>false</bool>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_15">
+              <item>
+               <widget class="QLabel" name="instanceAccountNameLabel">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Account</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QComboBox" name="instanceAccountSelector">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="serverJoinGroupBox">
+             <property name="title">
+              <string>Enable Auto-&amp;join</string>
+             </property>
+             <property name="checkable">
+              <bool>true</bool>
+             </property>
+             <property name="checked">
+              <bool>false</bool>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_9">
+              <item>
+               <widget class="QRadioButton" name="serverJoinAddressButton">
+                <property name="text">
+                 <string>Server address</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLineEdit" name="serverJoinAddress">
+                <property name="maximumSize">
+                 <size>
+                  <width>200</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="worldJoinButton">
+                <property name="text">
+                 <string>Singleplayer world</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QComboBox" name="worldsCb">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
            <item>
             <spacer name="verticalSpacer_2">
              <property name="orientation">
@@ -682,7 +712,6 @@
   <tabstop>showGameTimeWithoutDays</tabstop>
   <tabstop>showConsoleCheck</tabstop>
   <tabstop>autoCloseConsoleCheck</tabstop>
-  <tabstop>showConsoleErrorCheck</tabstop>
   <tabstop>javaScrollArea</tabstop>
   <tabstop>scrollArea_2</tabstop>
   <tabstop>onlineFixes</tabstop>
@@ -694,9 +723,7 @@
   <tabstop>useDiscreteGpuCheck</tabstop>
   <tabstop>useZink</tabstop>
   <tabstop>serverJoinAddressButton</tabstop>
-  <tabstop>serverJoinAddress</tabstop>
   <tabstop>worldJoinButton</tabstop>
-  <tabstop>worldsCb</tabstop>
  </tabstops>
  <resources/>
  <connections/>