diff --git a/src/blackgui/components/loginadvcomponent.cpp b/src/blackgui/components/loginadvcomponent.cpp
index 41ec07fcc..4d1bd469b 100644
--- a/src/blackgui/components/loginadvcomponent.cpp
+++ b/src/blackgui/components/loginadvcomponent.cpp
@@ -101,8 +101,6 @@ namespace BlackGui
             // Stored data
             this->loadRememberedUserData();
 
-            // Remark: The validators affect the signals such as returnPressed, editingFinished
-            // So I use no ranges in the CUpperCaseValidators, as this disables the signals for invalid values
             if (sGui && sGui->getIContextSimulator())
             {
                 connect(sGui->getIContextSimulator(), &IContextSimulator::vitalityLost, this, &CLoginAdvComponent::autoLogoffDetection, Qt::QueuedConnection);
@@ -283,13 +281,6 @@ namespace BlackGui
             return user;
         }
 
-//        const bool changedOwnAircraftCallsignPilot = this->updateOwnAircraftCallsignAndPilotFromGuiValues();
-//        const bool changedOwnAircraftIcaoValues = this->updateOwnAircaftIcaoValuesFromGuiValues();
-//        if (changedOwnAircraftIcaoValues || changedOwnAircraftCallsignPilot)
-//        {
-//            m_changedLoginDataDigestSignal.inputSignal();
-//        }
-
         void CLoginAdvComponent::setGuiLoginAsValues(const CSimulatedAircraft &ownAircraft)
         {
             const QString ac(
diff --git a/src/blackgui/components/loginadvcomponent.h b/src/blackgui/components/loginadvcomponent.h
index 53bb5705e..6bb5ffb86 100644
--- a/src/blackgui/components/loginadvcomponent.h
+++ b/src/blackgui/components/loginadvcomponent.h
@@ -8,8 +8,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_LOGINADVCOMPONENT_H
-#define BLACKGUI_LOGINADVCOMPONENT_H
+#ifndef BLACKGUI_COMPONENTS_LOGINADVCOMPONENT_H
+#define BLACKGUI_COMPONENTS_LOGINADVCOMPONENT_H
 
 #include "blackcore/vatsim/vatsimsettings.h"
 #include "blackcore/data/networksetup.h"
@@ -70,9 +70,6 @@ namespace BlackGui
             //! Set auto logoff
             void setAutoLogoff(bool autoLogoff);
 
-            //! Main info area changed
-            // void mainInfoAreaChanged(const QWidget *currentWidget);
-
             //! Login requested
             void toggleNetworkConnection();
 
@@ -98,9 +95,6 @@ namespace BlackGui
             //! User from VATSIM data
             BlackMisc::Network::CUser getUserFromPilotGuiValues() const;
 
-            //! Callsign from GUI
-            // BlackMisc::Aviation::CCallsign getCallsignFromGui() const;
-
             //! Update own callsign (own aircraft from what is set in the GUI)
             //! \return changed?
             bool updateOwnAircraftCallsignAndPilotFromGuiValues();
diff --git a/src/blackgui/components/ownaircraftcomponent.ui b/src/blackgui/components/ownaircraftcomponent.ui
index 457ddbec2..596bfd0ac 100644
--- a/src/blackgui/components/ownaircraftcomponent.ui
+++ b/src/blackgui/components/ownaircraftcomponent.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>261</width>
+    <width>282</width>
     <height>132</height>
    </rect>
   </property>
@@ -195,7 +195,7 @@
    <item row="3" column="1">
     <widget class="QLabel" name="lbl_LiverySend">
      <property name="text">
-      <string>Livery send</string>
+      <string>Send livery</string>
      </property>
     </widget>
    </item>
@@ -240,7 +240,7 @@
    <item row="1" column="1">
     <widget class="QLabel" name="lbl_ModelSent">
      <property name="text">
-      <string>Model send</string>
+      <string>Send model</string>
      </property>
     </widget>
    </item>