diff --git a/src/blackgui/components/logincomponent.ui b/src/blackgui/components/logincomponent.ui
index c603bba37..e0ecf56e3 100644
--- a/src/blackgui/components/logincomponent.ui
+++ b/src/blackgui/components/logincomponent.ui
@@ -89,7 +89,7 @@
          <enum>QTabWidget::North</enum>
         </property>
         <property name="currentIndex">
-         <number>2</number>
+         <number>0</number>
         </property>
         <widget class="QWidget" name="pg_NetworkVatsim">
          <property name="toolTip">
diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp
index c81a74c71..569e71769 100644
--- a/src/blackgui/components/mappingcomponent.cpp
+++ b/src/blackgui/components/mappingcomponent.cpp
@@ -388,14 +388,14 @@ namespace BlackGui
 
         void CMappingComponent::onResetAircraft()
         {
-            if (!sGui->getIContextSimulator()->isSimulatorSimulating()) { return; }
+            if (!sGui || !sGui->getIContextSimulator() || !sGui->getIContextSimulator()->isSimulatorSimulating()) { return; }
             const CCallsign callsign(this->validateRenderedCallsign());
             if (callsign.isEmpty()) { return; }
             const bool reset = sGui->getIContextSimulator()->resetToModelMatchingAircraft(callsign);
             const CStatusMessage msg = reset ?
                                        CStatusMessage(this).info("Model reset for '%1'") << callsign.toQString() :
                                        CStatusMessage(this).info("Reset failed for '%1'") << callsign.toQString();
-            this->showOverlayMessage(msg, 5000);
+            this->showOverlayMessage(msg, 3000);
         }
 
         void CMappingComponent::onModelPreviewChanged(int state)
diff --git a/src/blackgui/editors/matchingform.ui b/src/blackgui/editors/matchingform.ui
index 16a4ae4d6..df9c339c4 100644
--- a/src/blackgui/editors/matchingform.ui
+++ b/src/blackgui/editors/matchingform.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>293</width>
-    <height>438</height>
+    <height>453</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -98,7 +98,7 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>125</height>
+       <height>130</height>
       </size>
      </property>
      <property name="title">
diff --git a/src/blackgui/editors/voicesetupform.ui b/src/blackgui/editors/voicesetupform.ui
index e800c9bd7..06449f778 100644
--- a/src/blackgui/editors/voicesetupform.ui
+++ b/src/blackgui/editors/voicesetupform.ui
@@ -71,7 +71,7 @@
       <item alignment="Qt::AlignLeft">
        <widget class="QPushButton" name="pb_SetDefaults">
         <property name="text">
-         <string>set defaults</string>
+         <string> set defaults </string>
         </property>
        </widget>
       </item>
@@ -80,6 +80,11 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>cb_Override</tabstop>
+  <tabstop>pb_SetDefaults</tabstop>
+  <tabstop>le_VatsimUdpPort</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>