diff --git a/ui/psetup.ui b/ui/psetup.ui
index 4a2f147..793cbaa 100644
--- a/ui/psetup.ui
+++ b/ui/psetup.ui
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>210</width>
-    <height>334</height>
+    <width>173</width>
+    <height>306</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -33,12 +33,52 @@
     <number>6</number>
    </property>
    <item>
-    <layout class="QGridLayout" name="gridLayout" columnstretch="0,0">
+    <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,0,0,0" columnstretch="0,0">
      <property name="spacing">
       <number>6</number>
      </property>
-     <item row="12" column="0">
-      <widget class="QLabel" name="beatWidthLabel">
+     <item row="6" column="0" colspan="2">
+      <widget class="QFontComboBox" name="fontComboBox">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="editable">
+        <bool>false</bool>
+       </property>
+       <property name="maxVisibleItems">
+        <number>12</number>
+       </property>
+       <property name="sizeAdjustPolicy">
+        <enum>QComboBox::AdjustToContents</enum>
+       </property>
+       <property name="frame">
+        <bool>true</bool>
+       </property>
+       <property name="writingSystem">
+        <enum>QFontDatabase::Any</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <widget class="QCheckBox" name="includedFontCheckBox">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -46,12 +86,15 @@
         </size>
        </property>
        <property name="text">
-        <string>Beat width</string>
+        <string>FreeSans</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
-      <widget class="QLineEdit" name="leftMarginLineEdit">
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="rightMarginLineEdit">
        <property name="maximumSize">
         <size>
          <width>60</width>
@@ -70,32 +113,16 @@
        </property>
       </widget>
      </item>
-     <item row="11" column="0">
-      <widget class="QLabel" name="lineSpacingLabel">
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Line spacing</string>
-       </property>
-      </widget>
-     </item>
-     <item row="10" column="1">
-      <widget class="QCheckBox" name="includedFontCheckBox">
-       <property name="minimumSize">
+     <item row="7" column="0">
+      <widget class="QLabel" name="fontLabel">
+       <property name="maximumSize">
         <size>
-         <width>0</width>
-         <height>0</height>
+         <width>40</width>
+         <height>16777215</height>
         </size>
        </property>
        <property name="text">
-        <string>FreeSans</string>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
+        <string>Font</string>
        </property>
       </widget>
      </item>
@@ -115,68 +142,59 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="documentUnitsLabel">
-       <property name="text">
-        <string>Units</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="QLineEdit" name="topMarginLineEdit">
-       <property name="maximumSize">
+     <item row="9" column="0">
+      <widget class="QLabel" name="beatWidthLabel">
+       <property name="minimumSize">
         <size>
-         <width>60</width>
-         <height>16777215</height>
+         <width>0</width>
+         <height>0</height>
         </size>
        </property>
+       <property name="text">
+        <string>Beat width</string>
+       </property>
       </widget>
      </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="bottomMarginLabel">
+     <item row="4" column="0">
+      <widget class="QLabel" name="topMarginLabel">
        <property name="minimumSize">
         <size>
          <width>0</width>
          <height>0</height>
         </size>
        </property>
-       <property name="text">
-        <string>Bottom margin</string>
-       </property>
-      </widget>
-     </item>
-     <item row="12" column="1">
-      <widget class="QLineEdit" name="beatWidthLineEdit">
        <property name="maximumSize">
         <size>
-         <width>60</width>
+         <width>16777215</width>
          <height>16777215</height>
         </size>
        </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="pageSizeLabel">
        <property name="text">
-        <string>Page size</string>
+        <string>Top margin</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="rightMarginLabel">
-       <property name="minimumSize">
+     <item row="1" column="1">
+      <widget class="QComboBox" name="documentUnitsComboBox">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="maximumSize">
         <size>
-         <width>0</width>
-         <height>0</height>
+         <width>70</width>
+         <height>26</height>
         </size>
        </property>
-       <property name="text">
-        <string>Right margin</string>
+       <property name="editable">
+        <bool>true</bool>
+       </property>
+       <property name="frame">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
-      <widget class="QLineEdit" name="rightMarginLineEdit">
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="leftMarginLineEdit">
        <property name="maximumSize">
         <size>
          <width>60</width>
@@ -185,17 +203,28 @@
        </property>
       </widget>
      </item>
-     <item row="11" column="1">
-      <widget class="QDoubleSpinBox" name="lineSpacingDoubleSpinBox">
-       <property name="minimumSize">
+     <item row="4" column="1">
+      <widget class="QLineEdit" name="topMarginLineEdit">
+       <property name="maximumSize">
         <size>
-         <width>70</width>
-         <height>0</height>
+         <width>60</width>
+         <height>16777215</height>
         </size>
        </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="pageSizeLabel">
+       <property name="text">
+        <string>Page size</string>
+       </property>
+      </widget>
+     </item>
+     <item row="9" column="1">
+      <widget class="QLineEdit" name="beatWidthLineEdit">
        <property name="maximumSize">
         <size>
-         <width>70</width>
+         <width>60</width>
          <height>16777215</height>
         </size>
        </property>
@@ -214,80 +243,66 @@
        </property>
       </widget>
      </item>
-     <item row="10" column="0">
-      <widget class="QLabel" name="fontLabel">
-       <property name="maximumSize">
+     <item row="5" column="0">
+      <widget class="QLabel" name="bottomMarginLabel">
+       <property name="minimumSize">
         <size>
-         <width>40</width>
-         <height>16777215</height>
+         <width>0</width>
+         <height>0</height>
         </size>
        </property>
        <property name="text">
-        <string>Font</string>
+        <string>Bottom margin</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="topMarginLabel">
+     <item row="8" column="0">
+      <widget class="QLabel" name="lineSpacingLabel">
        <property name="minimumSize">
         <size>
          <width>0</width>
          <height>0</height>
         </size>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>16777194</height>
-        </size>
-       </property>
        <property name="text">
-        <string>Top margin</string>
+        <string>Line spacing</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
-      <widget class="QComboBox" name="documentUnitsComboBox">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="maximumSize">
+     <item row="3" column="0">
+      <widget class="QLabel" name="rightMarginLabel">
+       <property name="minimumSize">
         <size>
-         <width>70</width>
-         <height>26</height>
+         <width>0</width>
+         <height>0</height>
         </size>
        </property>
-       <property name="editable">
-        <bool>true</bool>
+       <property name="text">
+        <string>Right margin</string>
        </property>
-       <property name="frame">
-        <bool>true</bool>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="documentUnitsLabel">
+       <property name="text">
+        <string>Units</string>
        </property>
       </widget>
      </item>
-     <item row="6" column="0" colspan="2">
-      <widget class="QFontComboBox" name="fontComboBox">
+     <item row="8" column="1">
+      <widget class="QDoubleSpinBox" name="lineSpacingDoubleSpinBox">
        <property name="minimumSize">
         <size>
-         <width>150</width>
+         <width>70</width>
          <height>0</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
-         <width>16777215</width>
-         <height>26</height>
+         <width>70</width>
+         <height>16777215</height>
         </size>
        </property>
-       <property name="maxVisibleItems">
-        <number>12</number>
-       </property>
-       <property name="sizeAdjustPolicy">
-        <enum>QComboBox::AdjustToContents</enum>
-       </property>
-       <property name="frame">
-        <bool>true</bool>
-       </property>
       </widget>
      </item>
     </layout>