diff --git a/forms/tileseteditor.ui b/forms/tileseteditor.ui
index 7d9f3405..291640e3 100644
--- a/forms/tileseteditor.ui
+++ b/forms/tileseteditor.ui
@@ -6,17 +6,35 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
+    <width>700</width>
     <height>600</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>Tileset Editor</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
     <item>
      <widget class="QScrollArea" name="scrollArea_Metatiles">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+        <horstretch>1</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>274</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>274</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="widgetResizable">
        <bool>true</bool>
       </property>
@@ -25,7 +43,7 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>386</width>
+         <width>272</width>
          <height>538</height>
         </rect>
        </property>
@@ -134,6 +152,12 @@
        </property>
        <item alignment="Qt::AlignTop">
         <widget class="QFrame" name="frame_4">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>166</height>
+          </size>
+         </property>
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
@@ -155,6 +179,12 @@
           </property>
           <item>
            <widget class="QGroupBox" name="groupBox_2">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>1</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="title">
              <string>Metatile Properties</string>
             </property>
@@ -164,34 +194,24 @@
             <property name="checkable">
              <bool>false</bool>
             </property>
-            <layout class="QFormLayout" name="formLayout_2">
-             <item row="0" column="0">
-              <widget class="QLabel" name="label_4">
-               <property name="text">
-                <string>Bottom/Top</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="0">
+            <layout class="QGridLayout" name="gridLayout_3">
+             <item row="2" column="0" colspan="3">
               <widget class="QLabel" name="label_5">
                <property name="text">
                 <string>Metatile Behavior</string>
                </property>
               </widget>
              </item>
-             <item row="3" column="0">
+             <item row="3" column="0" colspan="3">
               <widget class="QComboBox" name="comboBox_metatileBehaviors"/>
              </item>
-             <item row="4" column="0">
-              <widget class="QLabel" name="label_6">
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_4">
                <property name="text">
-                <string>Layer Type</string>
+                <string>Bottom/Top</string>
                </property>
               </widget>
              </item>
-             <item row="5" column="0">
-              <widget class="QComboBox" name="comboBox_layerType"/>
-             </item>
              <item row="1" column="0">
               <widget class="QGraphicsView" name="graphicsView_metatileLayers">
                <property name="minimumSize">
@@ -214,6 +234,29 @@
                </property>
               </widget>
              </item>
+             <item row="0" column="2">
+              <widget class="QLabel" name="label_6">
+               <property name="text">
+                <string>Layer Type</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="2">
+              <widget class="QComboBox" name="comboBox_layerType"/>
+             </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>
             </layout>
            </widget>
           </item>
@@ -321,8 +364,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>386</width>
-            <height>344</height>
+            <width>400</width>
+            <height>366</height>
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_2">
@@ -414,7 +457,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>800</width>
+     <width>700</width>
      <height>20</height>
     </rect>
    </property>