diff --git a/forms/tileseteditor.ui b/forms/tileseteditor.ui
index 1d6d6d7c..df04f720 100644
--- a/forms/tileseteditor.ui
+++ b/forms/tileseteditor.ui
@@ -168,6 +168,9 @@
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_4">
+          <property name="sizeConstraint">
+           <enum>QLayout::SetFixedSize</enum>
+          </property>
           <property name="leftMargin">
            <number>0</number>
           </property>
@@ -198,35 +201,61 @@
              <bool>false</bool>
             </property>
             <layout class="QGridLayout" name="gridLayout_3">
-             <item row="1" column="2">
-              <widget class="QComboBox" name="comboBox_layerType"/>
+             <item row="13" column="3">
+              <widget class="QToolButton" name="copyButton_metatileLabel">
+               <property name="toolTip">
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copies the full metatile label to the clipboard.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               </property>
+               <property name="text">
+                <string>...</string>
+               </property>
+               <property name="icon">
+                <iconset resource="../resources/images.qrc">
+                 <normaloff>:/icons/clipboard.ico</normaloff>:/icons/clipboard.ico</iconset>
+               </property>
+              </widget>
              </item>
-             <item row="9" column="0">
+             <item row="13" column="0" colspan="3">
+              <widget class="QLineEdit" name="lineEdit_metatileLabel">
+               <property name="clearButtonEnabled">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="12" column="0" colspan="3">
+              <widget class="QLabel" name="label_metatileLabel">
+               <property name="text">
+                <string>Metatile Label (Optional)</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_BottomTop">
+               <property name="text">
+                <string>Bottom/Top</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <spacer name="horizontalSpacer_5">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item row="8" column="0">
               <widget class="QLabel" name="label_encounterType">
                <property name="text">
                 <string>Encounter Type</string>
                </property>
               </widget>
              </item>
-             <item row="10" column="0">
-              <widget class="QComboBox" name="comboBox_encounterType"/>
-             </item>
-             <item row="2" column="0">
-              <spacer name="verticalSpacer_5">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>40</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item row="12" column="0">
-              <widget class="QComboBox" name="comboBox_terrainType"/>
-             </item>
              <item row="1" column="0">
               <widget class="QGraphicsView" name="graphicsView_metatileLayers">
                <property name="minimumSize">
@@ -249,6 +278,9 @@
                </property>
               </widget>
              </item>
+             <item row="7" column="0" colspan="3">
+              <widget class="NoScrollComboBox" name="comboBox_metatileBehaviors"/>
+             </item>
              <item row="0" column="2">
               <widget class="QLabel" name="label_layerType">
                <property name="text">
@@ -256,81 +288,26 @@
                </property>
               </widget>
              </item>
-             <item row="0" column="0">
-              <widget class="QLabel" name="label_BottomTop">
-               <property name="text">
-                <string>Bottom/Top</string>
-               </property>
-              </widget>
+             <item row="9" column="0">
+              <widget class="QComboBox" name="comboBox_encounterType"/>
              </item>
-             <item row="13" column="0" colspan="3">
-              <widget class="QLabel" name="label_metatileLabel">
-               <property name="text">
-                <string>Metatile Label (Optional)</string>
-               </property>
-              </widget>
-             </item>
-             <item row="8" column="0" colspan="3">
-              <widget class="NoScrollComboBox" name="comboBox_metatileBehaviors"/>
-             </item>
-             <item row="11" column="0">
-              <widget class="QLabel" name="label_terrainType">
-               <property name="text">
-                <string>Terrain Type</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <spacer name="horizontalSpacer_5">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item row="3" column="0" colspan="3">
+             <item row="2" column="0" colspan="3">
               <widget class="QLabel" name="label_metatileBehavior">
                <property name="text">
                 <string>Metatile Behavior</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="3">
-              <spacer name="horizontalSpacer_6">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
+             <item row="11" column="0">
+              <widget class="QComboBox" name="comboBox_terrainType"/>
              </item>
-             <item row="14" column="3">
-              <widget class="QToolButton" name="copyButton_metatileLabel">
-               <property name="toolTip">
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copies the full metatile label to the clipboard.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-               </property>
+             <item row="1" column="2">
+              <widget class="QComboBox" name="comboBox_layerType"/>
+             </item>
+             <item row="10" column="0">
+              <widget class="QLabel" name="label_terrainType">
                <property name="text">
-                <string>...</string>
-               </property>
-               <property name="icon">
-                <iconset resource="../resources/images.qrc">
-                 <normaloff>:/icons/clipboard.ico</normaloff>:/icons/clipboard.ico</iconset>
-               </property>
-              </widget>
-             </item>
-             <item row="14" column="0" colspan="3">
-              <widget class="QLineEdit" name="lineEdit_metatileLabel">
-               <property name="clearButtonEnabled">
-                <bool>true</bool>
+                <string>Terrain Type</string>
                </property>
               </widget>
              </item>