diff --git a/src/blackgui/components/setuploadingdialog.ui b/src/blackgui/components/setuploadingdialog.ui
index 08575c465..ab8dce351 100644
--- a/src/blackgui/components/setuploadingdialog.ui
+++ b/src/blackgui/components/setuploadingdialog.ui
@@ -40,7 +40,7 @@
      <property name="title">
       <string>Setup and caches</string>
      </property>
-     <layout class="QGridLayout" name="gl_Details" columnstretch="0,3,0,0,0">
+     <layout class="QGridLayout" name="gl_Details" columnstretch="0,0,0,0">
       <property name="topMargin">
        <number>6</number>
       </property>
@@ -50,7 +50,24 @@
       <property name="bottomMargin">
        <number>6</number>
       </property>
-      <item row="3" column="1">
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="le_BootstrapMode">
+        <property name="whatsThis">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The mode: 'implicit' means no URL is provided and the value is obtained from an existing setup. 'explicit' means an URL is provided via command line arguments.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="lbl_BootstrapMode">
+        <property name="text">
+         <string>Mode:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
        <widget class="QLineEdit" name="le_SetupCache">
         <property name="whatsThis">
          <string>Timestamp of the setup cache.</string>
@@ -67,14 +84,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="3">
-       <widget class="QLabel" name="lbl_BootstrapMode">
-        <property name="text">
-         <string>Mode:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
+      <item row="3" column="0">
        <widget class="QLabel" name="lbl_BootstrapUrl">
         <property name="toolTip">
          <string>Where the bootstrap file is located</string>
@@ -84,17 +94,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="4">
-       <widget class="QLineEdit" name="le_BootstrapMode">
-        <property name="whatsThis">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The mode: 'implicit' means no URL is provided and the value is obtained from an existing setup. 'explicit' means an URL is provided via command line arguments.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
+      <item row="3" column="1">
        <widget class="QLineEdit" name="le_BootstrapUrl">
         <property name="whatsThis">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bootstrap URL provided by command line options. This is where the setup data are loaded from.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -104,7 +104,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="4">
+      <item row="1" column="1" colspan="3">
        <widget class="QLineEdit" name="le_CmdLine">
         <property name="whatsThis">
          <string>The command line.</string>
@@ -114,7 +114,31 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="5">
+      <item row="4" column="0">
+       <widget class="QLabel" name="lbl_SetupCache">
+        <property name="text">
+         <string>Setup cache:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="lbl_CopyOver">
+        <property name="text">
+         <string>Copy over:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="2">
+       <widget class="QPushButton" name="pb_LoadFromDisk">
+        <property name="whatsThis">
+         <string>load the cache data from disk, i.e. from the file which came with the installer</string>
+        </property>
+        <property name="text">
+         <string>from disk</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="4">
        <widget class="QLabel" name="lbl_Info">
         <property name="text">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:9pt; font-weight:600;&quot;&gt;Loading the setup (aka &amp;quot;bootstrap file&amp;quot;) has failed!&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; This file is required for &lt;/span&gt;&lt;span style=&quot; font-size:9pt; font-style:italic;&quot;&gt;swift&lt;/span&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt; to work properly. You can try to load the file again (&amp;quot;Retry&amp;quot;) or give up (&amp;quot;Cancel&amp;quot;). If you have set an explicit bootstrap URL, you can also ignore this URL and use cached setup data (if there are any). If all goes wrong, you can try to load the setup cache from disk.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -127,31 +151,7 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="lbl_CopyOver">
-        <property name="text">
-         <string>Copy over:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="lbl_SetupCache">
-        <property name="text">
-         <string>Setup cache:</string>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="2">
-       <widget class="QPushButton" name="pb_LoadFromDisk">
-        <property name="whatsThis">
-         <string>load the cache data from disk, i.e. from the file which came with the installer</string>
-        </property>
-        <property name="text">
-         <string>from disk</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
        <widget class="QPushButton" name="pb_IgnoreExplicitBootstrapUrl">
         <property name="whatsThis">
          <string>ignore the bootstrap URL and try to read from cache</string>
@@ -161,17 +161,21 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="2">
-       <widget class="QPushButton" name="pb_CopyFromSwift">
-        <property name="whatsThis">
-         <string>copy cache data from another swift version</string>
-        </property>
+      <item row="5" column="3">
+       <widget class="QPushButton" name="pb_OpemDirectory">
         <property name="text">
-         <string>copy over</string>
+         <string>open dir.</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1">
+      <item row="4" column="3">
+       <widget class="QPushButton" name="pb_Help">
+        <property name="text">
+         <string>help page</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
        <widget class="QLineEdit" name="le_OtherSwiftVersions">
         <property name="whatsThis">
          <string>Info about other swift versions installed</string>
@@ -181,17 +185,13 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="4">
-       <widget class="QPushButton" name="pb_OpemDirectory">
-        <property name="text">
-         <string>open dir.</string>
+      <item row="5" column="2">
+       <widget class="QPushButton" name="pb_CopyFromSwift">
+        <property name="whatsThis">
+         <string>copy cache data from another swift version</string>
         </property>
-       </widget>
-      </item>
-      <item row="3" column="4">
-       <widget class="QPushButton" name="pb_Help">
         <property name="text">
-         <string>help page</string>
+         <string>copy over</string>
         </property>
        </widget>
       </item>
@@ -243,6 +243,18 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>le_CmdLine</tabstop>
+  <tabstop>le_BootstrapMode</tabstop>
+  <tabstop>le_BootstrapUrl</tabstop>
+  <tabstop>pb_IgnoreExplicitBootstrapUrl</tabstop>
+  <tabstop>le_SetupCache</tabstop>
+  <tabstop>pb_LoadFromDisk</tabstop>
+  <tabstop>pb_Help</tabstop>
+  <tabstop>le_OtherSwiftVersions</tabstop>
+  <tabstop>pb_CopyFromSwift</tabstop>
+  <tabstop>pb_OpemDirectory</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>