diff --git a/src/blackgui/components/logincomponent.h b/src/blackgui/components/logincomponent.h
index f7cce3149..04b36936b 100644
--- a/src/blackgui/components/logincomponent.h
+++ b/src/blackgui/components/logincomponent.h
@@ -217,7 +217,13 @@ namespace BlackGui
             void onServerTabWidgetChanged(int index);
 
             //! Has contexts?
-            bool hasValidContexts();
+            bool hasValidContexts() const;
+
+            //! Set the server buttons visible
+            void setServerButtonsVisible(bool visible);
+
+            //! Tab index changed
+            void onDetailsTabChanged(int index);
 
             static constexpr int OverlayMessageMs = 5000;
             static constexpr int LogoffIntervalSeconds = 20; //!< time before logoff
diff --git a/src/blackgui/components/logincomponent.ui b/src/blackgui/components/logincomponent.ui
index e2f405722..2fc8f2189 100644
--- a/src/blackgui/components/logincomponent.ui
+++ b/src/blackgui/components/logincomponent.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>289</width>
-    <height>750</height>
+    <width>272</width>
+    <height>748</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -46,18 +46,12 @@
       </property>
       <item>
        <widget class="QGroupBox" name="gb_Network">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>100</height>
-         </size>
-        </property>
         <property name="title">
          <string>Network</string>
         </property>
         <layout class="QVBoxLayout" name="vl_Network">
          <property name="spacing">
-          <number>6</number>
+          <number>3</number>
          </property>
          <property name="leftMargin">
           <number>3</number>
@@ -71,14 +65,8 @@
          <property name="bottomMargin">
           <number>3</number>
          </property>
-         <item>
+         <item alignment="Qt::AlignTop">
           <widget class="QTabWidget" name="tw_Network">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>40</height>
-            </size>
-           </property>
            <property name="tabPosition">
             <enum>QTabWidget::North</enum>
            </property>
@@ -92,18 +80,23 @@
             <attribute name="title">
              <string>VATSIM</string>
             </attribute>
-            <layout class="QFormLayout" name="fl_VatsimServers">
-             <item row="0" column="0">
-              <widget class="QLabel" name="lbl_VatsimServer">
-               <property name="text">
-                <string>Server</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="BlackGui::Components::CServerListSelector" name="comp_VatsimServers"/>
-             </item>
-             <item row="1" column="1">
+            <layout class="QGridLayout" name="gl_NetworkVATSIM">
+             <property name="leftMargin">
+              <number>3</number>
+             </property>
+             <property name="topMargin">
+              <number>3</number>
+             </property>
+             <property name="rightMargin">
+              <number>3</number>
+             </property>
+             <property name="bottomMargin">
+              <number>3</number>
+             </property>
+             <property name="horizontalSpacing">
+              <number>3</number>
+             </property>
+             <item row="1" column="0">
               <widget class="QWidget" name="wi_VatsimButtons" native="true">
                <layout class="QHBoxLayout" name="hl_VatsimButtons">
                 <property name="leftMargin">
@@ -150,24 +143,35 @@
                </layout>
               </widget>
              </item>
+             <item row="0" column="0">
+              <widget class="BlackGui::Components::CServerListSelector" name="comp_VatsimServers"/>
+             </item>
             </layout>
            </widget>
            <widget class="QWidget" name="tb_OtherServers">
             <attribute name="title">
              <string>Other servers</string>
             </attribute>
-            <layout class="QFormLayout" name="fl_OtherServers">
+            <layout class="QGridLayout" name="gl_OtherServers">
+             <property name="leftMargin">
+              <number>3</number>
+             </property>
+             <property name="topMargin">
+              <number>3</number>
+             </property>
+             <property name="rightMargin">
+              <number>3</number>
+             </property>
+             <property name="bottomMargin">
+              <number>3</number>
+             </property>
+             <property name="horizontalSpacing">
+              <number>3</number>
+             </property>
              <item row="0" column="0">
-              <widget class="QLabel" name="lbl_OtherServers">
-               <property name="text">
-                <string>Server</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
               <widget class="BlackGui::Components::CServerListSelector" name="comp_OtherServers"/>
              </item>
-             <item row="1" column="1">
+             <item row="1" column="0">
               <widget class="QWidget" name="wi_OtherServersButtons" native="true">
                <layout class="QHBoxLayout" name="hl_OtherServersButtons">
                 <property name="leftMargin">
@@ -219,33 +223,6 @@
            </widget>
           </widget>
          </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QGroupBox" name="gb_Details">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>75</height>
-         </size>
-        </property>
-        <property name="title">
-         <string>Details</string>
-        </property>
-        <layout class="QVBoxLayout" name="vl_Details">
-         <property name="leftMargin">
-          <number>3</number>
-         </property>
-         <property name="topMargin">
-          <number>3</number>
-         </property>
-         <property name="rightMargin">
-          <number>3</number>
-         </property>
-         <property name="bottomMargin">
-          <number>3</number>
-         </property>
          <item alignment="Qt::AlignTop">
           <widget class="QTabWidget" name="tw_Details">
            <property name="currentIndex">
@@ -268,22 +245,9 @@
              <property name="bottomMargin">
               <number>3</number>
              </property>
-             <item>
+             <item alignment="Qt::AlignTop">
               <widget class="BlackGui::CLoginModeButtons" name="frp_LoginMode"/>
              </item>
-             <item>
-              <spacer name="vs_LoginMode">
-               <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>
            <widget class="QWidget" name="tb_FsdDetails">
@@ -313,32 +277,25 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>253</width>
-                  <height>45</height>
+                  <width>236</width>
+                  <height>55</height>
                  </rect>
                 </property>
                 <layout class="QVBoxLayout" name="vl_ScrollAreaFsdDetails">
                  <property name="leftMargin">
-                  <number>1</number>
+                  <number>2</number>
                  </property>
                  <property name="topMargin">
-                  <number>1</number>
+                  <number>2</number>
                  </property>
                  <property name="rightMargin">
-                  <number>1</number>
+                  <number>2</number>
                  </property>
                  <property name="bottomMargin">
-                  <number>1</number>
+                  <number>2</number>
                  </property>
                  <item>
-                  <widget class="BlackGui::Editors::CFsdSetupForm" name="form_FsdDetails">
-                   <property name="frameShape">
-                    <enum>QFrame::StyledPanel</enum>
-                   </property>
-                   <property name="frameShadow">
-                    <enum>QFrame::Raised</enum>
-                   </property>
-                  </widget>
+                  <widget class="BlackGui::Editors::CFsdSetupForm" name="form_FsdDetails"/>
                  </item>
                 </layout>
                </widget>
@@ -363,28 +320,8 @@
              <property name="bottomMargin">
               <number>3</number>
              </property>
-             <item>
-              <widget class="BlackGui::Editors::CVoiceSetupForm" name="form_Voice">
-               <property name="frameShape">
-                <enum>QFrame::StyledPanel</enum>
-               </property>
-               <property name="frameShadow">
-                <enum>QFrame::Raised</enum>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="vs_Voice">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>40</height>
-                </size>
-               </property>
-              </spacer>
+             <item alignment="Qt::AlignTop">
+              <widget class="BlackGui::Editors::CVoiceSetupForm" name="form_Voice"/>
              </item>
             </layout>
            </widget>
@@ -405,22 +342,9 @@
              <property name="bottomMargin">
               <number>3</number>
              </property>
-             <item>
+             <item alignment="Qt::AlignTop">
               <widget class="BlackGui::Components::CModelMatcherLogEnable" name="comp_MatchingLogEnabled"/>
              </item>
-             <item>
-              <spacer name="vs_MatchingLog">
-               <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>
           </widget>
@@ -754,7 +678,7 @@
          </item>
          <item>
           <widget class="QFrame" name="fr_CurrentLoginAddInfo">
-           <layout class="QGridLayout" name="gl_AddInfo" columnstretch="1,2,1">
+           <layout class="QGridLayout" name="gl_AddInfo" columnstretch="0,2,1">
             <item row="2" column="0">
              <widget class="QLabel" name="lbl_LoginSince">
               <property name="text">
@@ -977,7 +901,6 @@
   <tabstop>comp_OtherServers</tabstop>
   <tabstop>pb_OtherServersGotoSettings</tabstop>
   <tabstop>pb_OverrideCredentialsOtherServers</tabstop>
-  <tabstop>tw_Details</tabstop>
   <tabstop>sa_FsdDetails</tabstop>
   <tabstop>le_SimulatorModel</tabstop>
   <tabstop>tb_SimulatorIcaoReverseLookup</tabstop>
diff --git a/src/blackgui/editors/fsdsetupform.ui b/src/blackgui/editors/fsdsetupform.ui
index a9545d256..0895b99aa 100644
--- a/src/blackgui/editors/fsdsetupform.ui
+++ b/src/blackgui/editors/fsdsetupform.ui
@@ -31,8 +31,11 @@
    </property>
    <item row="4" column="1">
     <widget class="QLabel" name="lbl_AircraftParts">
+     <property name="toolTip">
+      <string>aircraft parts</string>
+     </property>
      <property name="text">
-      <string>Aircraft parts</string>
+      <string>Parts</string>
      </property>
     </widget>
    </item>
@@ -74,7 +77,7 @@
    <item row="4" column="3">
     <widget class="QLabel" name="lbl_FastPositions">
      <property name="text">
-      <string>Fast positions</string>
+      <string>Fast pos.</string>
      </property>
     </widget>
    </item>
diff --git a/src/blackgui/editors/voicesetupform.ui b/src/blackgui/editors/voicesetupform.ui
index c88ce6dd8..516fcabed 100644
--- a/src/blackgui/editors/voicesetupform.ui
+++ b/src/blackgui/editors/voicesetupform.ui
@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>217</width>
+    <width>236</width>
     <height>45</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Frame</string>
   </property>
-  <layout class="QGridLayout" name="gl_VoiceSetup">
+  <layout class="QGridLayout" name="gl_VoiceSetup" columnstretch="1,1,1">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -29,6 +29,13 @@
    <property name="horizontalSpacing">
     <number>4</number>
    </property>
+   <item row="0" column="1">
+    <widget class="QCheckBox" name="cb_Override">
+     <property name="text">
+      <string>override</string>
+     </property>
+    </widget>
+   </item>
    <item row="2" column="0">
     <widget class="QLabel" name="lbl_VatsimUdpPort">
      <property name="text">
@@ -36,6 +43,9 @@
      </property>
     </widget>
    </item>
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="le_VatsimUdpPort"/>
+   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="lbl_VoiceSetup">
      <property name="text">
@@ -43,39 +53,11 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QLineEdit" name="le_VatsimUdpPort"/>
-   </item>
-   <item row="0" column="1">
-    <widget class="QWidget" name="wi_Override" native="true">
-     <layout class="QHBoxLayout" name="hl_Override">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="cb_Override">
-        <property name="text">
-         <string>override</string>
-        </property>
-       </widget>
-      </item>
-      <item alignment="Qt::AlignRight">
-       <widget class="QPushButton" name="pb_SetDefaults">
-        <property name="text">
-         <string>set defaults</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
+   <item row="0" column="2">
+    <widget class="QPushButton" name="pb_SetDefaults">
+     <property name="text">
+      <string>set defaults</string>
+     </property>
     </widget>
    </item>
   </layout>