diff --git a/src/blackgui/components/dbstashcomponent.ui b/src/blackgui/components/dbstashcomponent.ui
index 1ca9ecbce..ed8b957f5 100644
--- a/src/blackgui/components/dbstashcomponent.ui
+++ b/src/blackgui/components/dbstashcomponent.ui
@@ -72,7 +72,7 @@
       <item>
        <widget class="QPushButton" name="pb_Unstash">
         <property name="text">
-         <string>unstash</string>
+         <string>Unstash</string>
         </property>
        </widget>
       </item>
@@ -86,14 +86,14 @@
       <item>
        <widget class="QPushButton" name="pb_Validate">
         <property name="text">
-         <string>validate</string>
+         <string>Validate</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="pb_Save">
+       <widget class="QPushButton" name="pb_Publish">
         <property name="text">
-         <string>save</string>
+         <string>Publish</string>
         </property>
        </widget>
       </item>
@@ -107,28 +107,28 @@
       <item>
        <widget class="QPushButton" name="pb_Distributor">
         <property name="text">
-         <string>distributor</string>
+         <string>Distributor</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QPushButton" name="pb_AircraftIcao">
         <property name="text">
-         <string>aircraft ICAO</string>
+         <string>Aircraft ICAO</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QPushButton" name="pb_Livery">
         <property name="text">
-         <string>livery</string>
+         <string>Livery</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QPushButton" name="pb_AirlineIcao">
         <property name="text">
-         <string>airline ICAO</string>
+         <string>Airline ICAO</string>
         </property>
        </widget>
       </item>
@@ -147,7 +147,7 @@
  <tabstops>
   <tabstop>pb_Unstash</tabstop>
   <tabstop>pb_Validate</tabstop>
-  <tabstop>pb_Save</tabstop>
+  <tabstop>pb_Publish</tabstop>
   <tabstop>tvp_StashAircraftModels</tabstop>
  </tabstops>
  <resources/>
diff --git a/src/blackgui/editors/distributorform.ui b/src/blackgui/editors/distributorform.ui
index 91eb5c5ee..6f86ed7b3 100644
--- a/src/blackgui/editors/distributorform.ui
+++ b/src/blackgui/editors/distributorform.ui
@@ -200,6 +200,12 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>le_Description</tabstop>
+  <tabstop>le_Alias1</tabstop>
+  <tabstop>le_Alias2</tabstop>
+  <tabstop>le_Updated</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/blackgui/editors/modelmappingform.cpp b/src/blackgui/editors/modelmappingform.cpp
index a74734c9f..6f26d37a6 100644
--- a/src/blackgui/editors/modelmappingform.cpp
+++ b/src/blackgui/editors/modelmappingform.cpp
@@ -25,7 +25,8 @@ namespace BlackGui
             ui->le_LastUpdated->setReadOnly(true);
             ui->le_Id->setReadOnly(true);
             ui->lai_Id->set(CIcons::appMappings16(), "Id:");
-            connect(ui->pb_Save, &QPushButton::clicked, this, &CModelMappingForm::requestSave);
+            connect(ui->pb_Publish, &QPushButton::clicked, this, &CModelMappingForm::requestPublish);
+            connect(ui->pb_Stash, &QPushButton::clicked, this, &CModelMappingForm::requestStash);
         }
 
         CModelMappingForm::~CModelMappingForm()
diff --git a/src/blackgui/editors/modelmappingform.h b/src/blackgui/editors/modelmappingform.h
index 51ecf1da6..5b432461c 100644
--- a/src/blackgui/editors/modelmappingform.h
+++ b/src/blackgui/editors/modelmappingform.h
@@ -53,8 +53,14 @@ namespace BlackGui
             //! Request validation
             void requestValidation();
 
-            //! Save
-            void requestSave();
+            //! Request to publish (DB)
+            void requestPublish();
+
+            //! Request stashing for model
+            void requestStash();
+
+        private slots:
+            //!
 
         private:
             QScopedPointer<Ui::CModelMappingForm> ui;
diff --git a/src/blackgui/editors/modelmappingform.ui b/src/blackgui/editors/modelmappingform.ui
index 25029312b..2b11ad6f5 100644
--- a/src/blackgui/editors/modelmappingform.ui
+++ b/src/blackgui/editors/modelmappingform.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>592</width>
-    <height>87</height>
+    <height>93</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -62,7 +62,7 @@
        </widget>
       </item>
       <item row="0" column="6">
-       <widget class="QPushButton" name="ph_Stash">
+       <widget class="QPushButton" name="pb_Stash">
         <property name="text">
          <string>Stash</string>
         </property>
@@ -79,9 +79,9 @@
        </widget>
       </item>
       <item row="1" column="6">
-       <widget class="QPushButton" name="pb_Save">
+       <widget class="QPushButton" name="pb_Publish">
         <property name="text">
-         <string>Save</string>
+         <string>Publish</string>
         </property>
        </widget>
       </item>
@@ -198,8 +198,8 @@
   <tabstop>le_ModelKey</tabstop>
   <tabstop>le_Name</tabstop>
   <tabstop>le_Description</tabstop>
-  <tabstop>ph_Stash</tabstop>
-  <tabstop>pb_Save</tabstop>
+  <tabstop>pb_Stash</tabstop>
+  <tabstop>pb_Publish</tabstop>
   <tabstop>le_LastUpdated</tabstop>
  </tabstops>
  <resources/>