diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 4962231656..30c602019a 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -753,41 +753,11 @@ Manage Authors. You can use the values {author} and
       <attribute name="title">
        <string>Tag Browser</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_10">
-       <item row="3" column="2" colspan="3">
-        <widget class="EditWithComplete" name="opt_categories_using_hierarchy">
-         <property name="toolTip">
-          <string>A comma-separated list of categories in which items containing
-periods are displayed in the tag browser trees. For example, if
-this box contains 'tags' then tags of the form 'Mystery.English'
-and 'Mystery.Thriller' will be displayed with English and Thriller
-both under 'Mystery'. If 'tags' is not in this box,
-then the tags will be displayed each on their own line.</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0" colspan="2">
-        <widget class="QLabel" name="label_9">
-         <property name="text">
-          <string>Tags browser category &amp;partitioning method:</string>
-         </property>
-         <property name="buddy">
-          <cstring>opt_tags_browser_partition_method</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="2">
-        <widget class="QComboBox" name="opt_tags_browser_partition_method">
-         <property name="toolTip">
-          <string>Choose how tag browser subcategories are displayed when
-there are more items than the limit. Select by first
-letter to see an A, B, C list. Choose partitioned to
-have a list of fixed-sized groups. Set to disabled
-if you never want subcategories</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="3">
+      <layout class="QFormLayout" name="formLayout">
+       <property name="fieldGrowthPolicy">
+        <enum>QFormLayout::ExpandingFieldsGrow</enum>
+       </property>
+       <item row="2" column="0">
         <widget class="QLabel" name="label_10">
          <property name="text">
           <string>&amp;Collapse when more items than:</string>
@@ -797,7 +767,7 @@ if you never want subcategories</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="4">
+       <item row="2" column="1">
         <widget class="QSpinBox" name="opt_tags_browser_collapse_at">
          <property name="toolTip">
           <string>If a Tag Browser category has more than this number of items, it is divided
@@ -808,20 +778,7 @@ up into subcategories. If the partition method is set to disable, this value is
          </property>
         </widget>
        </item>
-       <item row="5" column="0" colspan="5">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>690</width>
-           <height>252</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="1" column="2">
+       <item row="3" column="0">
         <widget class="QLabel" name="label_8111">
          <property name="text">
           <string>Categories not to partition:</string>
@@ -831,8 +788,14 @@ up into subcategories. If the partition method is set to disable, this value is
          </property>
         </widget>
        </item>
-       <item row="1" column="3" colspan="2">
+       <item row="3" column="1">
         <widget class="EditWithComplete" name="opt_tag_browser_dont_collapse">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="toolTip">
           <string>A comma-separated list of categories that are not to
 be partitioned even if the number of items is larger than
@@ -842,17 +805,7 @@ a few top-level elements.</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="5">
-        <widget class="QCheckBox" name="opt_show_avg_rating">
-         <property name="text">
-          <string>Show &amp;average ratings in the tags browser</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
+       <item row="5" column="0">
         <widget class="QLabel" name="label_81">
          <property name="text">
           <string>Categories with &amp;hierarchical items:</string>
@@ -862,13 +815,62 @@ a few top-level elements.</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="5">
+       <item row="5" column="1">
+        <widget class="EditWithComplete" name="opt_categories_using_hierarchy">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>A comma-separated list of categories in which items containing
+periods are displayed in the tag browser trees. For example, if
+this box contains 'tags' then tags of the form 'Mystery.English'
+and 'Mystery.Thriller' will be displayed with English and Thriller
+both under 'Mystery'. If 'tags' is not in this box,
+then the tags will be displayed each on their own line.</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0" colspan="2">
         <widget class="QCheckBox" name="opt_tag_browser_old_look">
          <property name="text">
           <string>Use &amp;alternating row colors in the Tag Browser</string>
          </property>
         </widget>
        </item>
+       <item row="1" column="1">
+        <widget class="QComboBox" name="opt_tags_browser_partition_method">
+         <property name="toolTip">
+          <string>Choose how tag browser subcategories are displayed when
+there are more items than the limit. Select by first
+letter to see an A, B, C list. Choose partitioned to
+have a list of fixed-sized groups. Set to disabled
+if you never want subcategories</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>Tags browser category &amp;partitioning method:</string>
+         </property>
+         <property name="buddy">
+          <cstring>opt_tags_browser_partition_method</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0">
+        <widget class="QCheckBox" name="opt_show_avg_rating">
+         <property name="text">
+          <string>Show &amp;average ratings in the tags browser</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_3">