diff --git a/src/blackgui/components/datasettingscomponent.ui b/src/blackgui/components/datasettingscomponent.ui
index 69969aaa6..78fe41b26 100644
--- a/src/blackgui/components/datasettingscomponent.ui
+++ b/src/blackgui/components/datasettingscomponent.ui
@@ -119,7 +119,27 @@
        <number>4</number>
       </property>
       <item>
-       <widget class="BlackGui::Components::CSettingsGuiComponent" name="comp_GuiSettings"/>
+       <widget class="BlackGui::Components::CSettingsGuiComponent" name="comp_GuiSettings">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>100</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="vs_GuiSetup">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
       </item>
      </layout>
     </widget>
@@ -130,6 +150,16 @@
       <string>swift DB</string>
      </property>
      <layout class="QGridLayout" name="gl_SwiftDB">
+      <item row="0" column="0">
+       <widget class="BlackGui::Components::CDbLoginComponent" name="comp_LoginComponent">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>150</height>
+         </size>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0">
        <widget class="BlackGui::Components::CDbDebugDatabaseSetup" name="comp_DebugDb">
         <property name="minimumSize">
@@ -146,15 +176,18 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="BlackGui::Components::CDbLoginComponent" name="comp_LoginComponent">
-        <property name="minimumSize">
+      <item row="2" column="0">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
          <size>
-          <width>0</width>
-          <height>150</height>
+          <width>20</width>
+          <height>40</height>
          </size>
         </property>
-       </widget>
+       </spacer>
       </item>
      </layout>
     </widget>
diff --git a/src/blackgui/components/dblogincomponent.ui b/src/blackgui/components/dblogincomponent.ui
index 1d0586868..bd9e5ef5c 100644
--- a/src/blackgui/components/dblogincomponent.ui
+++ b/src/blackgui/components/dblogincomponent.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>345</width>
-    <height>325</height>
+    <height>279</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -280,19 +280,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <resources>