diff --git a/src/calibre/gui2/preferences/look_feel_tabs/bookshelf_view.ui b/src/calibre/gui2/preferences/look_feel_tabs/bookshelf_view.ui
index a8fccfa8c7..01122b207a 100644
--- a/src/calibre/gui2/preferences/look_feel_tabs/bookshelf_view.ui
+++ b/src/calibre/gui2/preferences/look_feel_tabs/bookshelf_view.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>607</width>
-    <height>429</height>
+    <height>493</height>
    </rect>
   </property>
   <property name="currentIndex">
@@ -18,15 +18,34 @@
     <string>&amp;Layout</string>
    </attribute>
    <layout class="QFormLayout" name="formLayout">
-    <property name="fieldGrowthPolicy">
-     <enum>QFormLayout::ExpandingFieldsGrow</enum>
-    </property>
-    <item row="0" column="0" colspan="2">
-     <layout class="QHBoxLayout" name="horizontalLayout">
+    <item row="0" column="0">
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>Shelf &amp;height:</string>
+      </property>
+      <property name="buddy">
+       <cstring>opt_bookshelf_height</cstring>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1">
+     <layout class="QHBoxLayout" name="horizontalLayout_5">
       <item>
-       <widget class="QCheckBox" name="opt_bookshelf_shadow">
-        <property name="text">
-         <string>Show &amp;shadow for hovered cover</string>
+       <widget class="QSpinBox" name="opt_bookshelf_height">
+        <property name="toolTip">
+         <string>Control the height of the book shelves, in pixels. The default is to choose a height automatically based on the size of the screen. Note that if you change the height, the cover thumbnail cache will need to be re-populated so scrolling might be a little slow to start with.</string>
+        </property>
+        <property name="specialValueText">
+         <string>Automatic</string>
+        </property>
+        <property name="suffix">
+         <string> px</string>
+        </property>
+        <property name="minimum">
+         <number>119</number>
+        </property>
+        <property name="maximum">
+         <number>1200</number>
         </property>
        </widget>
       </item>
@@ -37,48 +56,9 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="opt_bookshelf_up_to_down">
-        <property name="toolTip">
-         <string>Control whether the text shown on book spines goes upwards or downwards</string>
-        </property>
-        <property name="text">
-         <string>Spine text &amp;downwards</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </item>
     <item row="1" column="0">
-     <widget class="QLabel" name="label">
-      <property name="text">
-       <string>Shelf &amp;height:</string>
-      </property>
-      <property name="buddy">
-       <cstring>opt_bookshelf_height</cstring>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="QSpinBox" name="opt_bookshelf_height">
-      <property name="toolTip">
-       <string>Control the height of the book shelves, in pixels. The default is to choose a height automatically based on the size of the screen. Note that if you change the height, the cover thumbnail cache will need to be re-populated so scrolling might be a little slow to start with.</string>
-      </property>
-      <property name="specialValueText">
-       <string>Automatic</string>
-      </property>
-      <property name="suffix">
-       <string> px</string>
-      </property>
-      <property name="minimum">
-       <number>119</number>
-      </property>
-      <property name="maximum">
-       <number>1200</number>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="0">
      <widget class="QLabel" name="label_bookshelf_thumbnail">
       <property name="text">
        <string>Cover &amp;thumbnail on the spines:</string>
@@ -88,10 +68,10 @@
       </property>
      </widget>
     </item>
-    <item row="2" column="1">
+    <item row="1" column="1">
      <widget class="QComboBox" name="opt_bookshelf_thumbnail"/>
     </item>
-    <item row="3" column="0">
+    <item row="2" column="0">
      <widget class="QLabel" name="label_title">
       <property name="text">
        <string>Template for spine &amp;title:</string>
@@ -101,7 +81,7 @@
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
+    <item row="2" column="1">
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
        <widget class="QLineEdit" name="opt_bookshelf_title_template">
@@ -122,7 +102,7 @@
       </item>
      </layout>
     </item>
-    <item row="4" column="0">
+    <item row="3" column="0">
      <widget class="QLabel" name="label_2">
       <property name="text">
        <string>Template for spine a&amp;uthor:</string>
@@ -132,7 +112,7 @@
       </property>
      </widget>
     </item>
-    <item row="4" column="1">
+    <item row="3" column="1">
      <layout class="QHBoxLayout" name="horizontalLayout_4">
       <item>
        <widget class="QLineEdit" name="opt_bookshelf_author_template">
@@ -175,6 +155,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QPushButton" name="use_pages_button">
+        <property name="text">
+         <string>Use a custom &amp;pages column</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QPushButton" name="template_pages_button">
         <property name="text">
@@ -184,14 +171,7 @@
       </item>
      </layout>
     </item>
-    <item row="7" column="1">
-     <widget class="QPushButton" name="use_pages_button">
-      <property name="text">
-       <string>Use a custom &amp;pages column</string>
-      </property>
-     </widget>
-    </item>
-    <item row="8" column="0">
+    <item row="7" column="0">
      <widget class="QLabel" name="label_fade_time">
       <property name="text">
        <string>Duration of hover &amp;animation</string>
@@ -201,7 +181,7 @@
       </property>
      </widget>
     </item>
-    <item row="8" column="1">
+    <item row="7" column="1">
      <widget class="QSpinBox" name="opt_bookshelf_fade_time">
       <property name="specialValueText">
        <string>Disable</string>
@@ -220,7 +200,7 @@
       </property>
      </widget>
     </item>
-    <item row="9" column="0">
+    <item row="8" column="0">
      <widget class="QLabel" name="label_hover_interact">
       <property name="text">
        <string>&amp;Expand the hovered cover:</string>
@@ -230,14 +210,59 @@
       </property>
      </widget>
     </item>
-    <item row="9" column="1">
-     <widget class="QComboBox" name="opt_bookshelf_hover">
-      <property name="toolTip">
-       <string>Control what happens when the mouse hovers over the spine of a book.</string>
-      </property>
-     </widget>
+    <item row="8" column="1">
+     <layout class="QHBoxLayout" name="horizontalLayout_6">
+      <item>
+       <widget class="QComboBox" name="opt_bookshelf_hover">
+        <property name="toolTip">
+         <string>Control what happens when the mouse hovers over the spine of a book.</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="opt_bookshelf_shadow">
+        <property name="text">
+         <string>Show &amp;shadow for hovered cover</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </item>
-    <item row="12" column="0">
+    <item row="9" column="0" colspan="2">
+     <layout class="QHBoxLayout" name="horizontalLayout_7">
+      <item>
+       <widget class="QPushButton" name="recount_button">
+        <property name="toolTip">
+         <string>Have calibre re-count the pages in all books in the current library.</string>
+        </property>
+        <property name="text">
+         <string>&amp;Recount pages</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="show_log_button">
+        <property name="text">
+         <string>Show count &amp;failure log</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <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>
+    </item>
+    <item row="10" column="0">
      <spacer name="vertical_spacer_1">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
@@ -250,32 +275,29 @@
       </property>
      </spacer>
     </item>
-    <item row="10" column="0" colspan="2">
-     <widget class="QPushButton" name="recount_button">
-      <property name="toolTip">
-       <string>Have calibre re-count the pages in all books in the current library.</string>
-      </property>
-      <property name="text">
-       <string>&amp;Recount pages</string>
-      </property>
-     </widget>
-    </item>
-    <item row="11" column="0" colspan="2">
-     <widget class="QPushButton" name="show_log_button">
-      <property name="text">
-       <string>Show count &amp;failure log</string>
-      </property>
-     </widget>
-    </item>
     <item row="5" column="1">
-     <widget class="QCheckBox" name="opt_bookshelf_make_space_for_second_line">
-      <property name="toolTip">
-       <string>&lt;p&gt;When showing authors in spine, for very narrow books, artifically widen the book to make space for the author line. Without this, the authors wont be displayed for narrow books, with it, narrow books will appear artifically wider than they really are.</string>
-      </property>
-      <property name="text">
-       <string>Make &amp;space for author line</string>
-      </property>
-     </widget>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QCheckBox" name="opt_bookshelf_make_space_for_second_line">
+        <property name="toolTip">
+         <string>&lt;p&gt;When showing authors in spine, for very narrow books, artifically widen the book to make space for the author line. Without this, the authors wont be displayed for narrow books, with it, narrow books will appear artifically wider than they really are.</string>
+        </property>
+        <property name="text">
+         <string>Make &amp;space for author line</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="opt_bookshelf_up_to_down">
+        <property name="toolTip">
+         <string>Control whether the text shown on book spines goes upwards or downwards</string>
+        </property>
+        <property name="text">
+         <string>Spine text &amp;downwards</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </item>
    </layout>
   </widget>