diff --git a/src/blackgui/components/dbstashcomponent.cpp b/src/blackgui/components/dbstashcomponent.cpp
index 01ac2ee55..b1bf64eca 100644
--- a/src/blackgui/components/dbstashcomponent.cpp
+++ b/src/blackgui/components/dbstashcomponent.cpp
@@ -62,7 +62,7 @@ namespace BlackGui
 
             connect(ui->pb_Unstash, &QPushButton::pressed, this, &CDbStashComponent::ps_onUnstashPressed);
             connect(ui->pb_Validate, &QPushButton::pressed, this, &CDbStashComponent::ps_onValidatePressed);
-            connect(ui->pb_RemoveInvald, &QPushButton::pressed, this, &CDbStashComponent::ps_onRemoveInvalidPressed);
+            connect(ui->pb_RemoveInvalid, &QPushButton::pressed, this, &CDbStashComponent::ps_onRemoveInvalidPressed);
             connect(ui->pb_Publish, &QPushButton::pressed, this, &CDbStashComponent::ps_onPublishPressed);
             connect(ui->tvp_StashAircraftModels, &CAircraftModelView::modelChanged, this, &CDbStashComponent::stashedModelsChanged);
             connect(ui->tvp_StashAircraftModels, &CAircraftModelView::modelDataChanged, this, &CDbStashComponent::ps_onRowCountChanged);
@@ -359,13 +359,15 @@ namespace BlackGui
 
         void CDbStashComponent::enableButtonRow()
         {
-            bool e = !ui->tvp_StashAircraftModels->isEmpty();
+            const bool e = !ui->tvp_StashAircraftModels->isEmpty();
             ui->pb_AircraftIcao->setEnabled(e);
             ui->pb_AirlineIcao->setEnabled(e);
             ui->pb_Distributor->setEnabled(e);
             ui->pb_Livery->setEnabled(e);
             ui->pb_Unstash->setEnabled(e);
             ui->pb_Validate->setEnabled(e);
+            ui->pb_RemoveInvalid->setEnabled(e);
+            ui->pb_Model->setEnabled(e);
             this->ps_userChanged();
         }
 
@@ -377,7 +379,7 @@ namespace BlackGui
 
         CAircraftModelList CDbStashComponent::getSelectedOrAllModels() const
         {
-            bool selectedOnly = ui->cb_SelectedOnly->isChecked();
+            const bool selectedOnly = ui->cb_SelectedOnly->isChecked();
             const CAircraftModelList models(selectedOnly ? ui->tvp_StashAircraftModels->selectedObjects() : ui->tvp_StashAircraftModels->containerOrFilteredContainer());
             return models;
         }
@@ -406,7 +408,7 @@ namespace BlackGui
         CAircraftModel CDbStashComponent::consolidateModel(const CAircraftModel &model) const
         {
             CAircraftModel stashModel(model);
-            bool ownModel = stashModel.getModelType() == CAircraftModel::TypeOwnSimulatorModel;
+            const bool ownModel = stashModel.getModelType() == CAircraftModel::TypeOwnSimulatorModel;
 
             // merge with DB data if any
             if (!stashModel.hasValidDbKey())
diff --git a/src/blackgui/components/dbstashcomponent.ui b/src/blackgui/components/dbstashcomponent.ui
index d906f1a7c..ee5238eee 100644
--- a/src/blackgui/components/dbstashcomponent.ui
+++ b/src/blackgui/components/dbstashcomponent.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>773</width>
+    <width>859</width>
     <height>221</height>
    </rect>
   </property>
@@ -91,7 +91,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="pb_RemoveInvald">
+       <widget class="QPushButton" name="pb_RemoveInvalid">
         <property name="toolTip">
          <string>Remove invalid models</string>
         </property>
@@ -175,7 +175,7 @@
   <tabstop>tvp_StashAircraftModels</tabstop>
   <tabstop>pb_Unstash</tabstop>
   <tabstop>pb_Validate</tabstop>
-  <tabstop>pb_RemoveInvald</tabstop>
+  <tabstop>pb_RemoveInvalid</tabstop>
   <tabstop>pb_Publish</tabstop>
   <tabstop>cb_SelectedOnly</tabstop>
   <tabstop>pb_Model</tabstop>
diff --git a/src/blackgui/components/modelmodeselector.ui b/src/blackgui/components/modelmodeselector.ui
index e75fd5630..df0cf64e3 100644
--- a/src/blackgui/components/modelmodeselector.ui
+++ b/src/blackgui/components/modelmodeselector.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>107</width>
+    <width>153</width>
     <height>26</height>
    </rect>
   </property>
@@ -52,6 +52,19 @@
      </property>
     </widget>
    </item>
+   <item>
+    <spacer name="hs_ModeSelector">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/blackgui/filters/aircraftmodelfilterbar.ui b/src/blackgui/filters/aircraftmodelfilterbar.ui
index 2cc2419fb..888c072f0 100644
--- a/src/blackgui/filters/aircraftmodelfilterbar.ui
+++ b/src/blackgui/filters/aircraftmodelfilterbar.ui
@@ -203,7 +203,7 @@
     </widget>
    </item>
    <item row="2" column="10">
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="lbl_Distributor">
      <property name="text">
       <string>Distributor:</string>
      </property>