diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp
index 631d9f969..7fbe96b83 100644
--- a/src/blackgui/components/dbmappingcomponent.cpp
+++ b/src/blackgui/components/dbmappingcomponent.cpp
@@ -11,7 +11,7 @@
 #include "blackgui/components/dbautostashingcomponent.h"
 #include "blackgui/components/dbautosimulatorstashingcomponent.h"
 #include "blackgui/components/dbmappingcomponent.h"
-#include "blackgui/components/dbmodelmappingmodifycomponent.h"
+#include "blackgui/components/dbmodelmappingmodifydialog.h"
 #include "blackgui/components/dbownmodelscomponent.h"
 #include "blackgui/components/dbownmodelsetcomponent.h"
 #include "blackgui/components/dbstashcomponent.h"
@@ -74,7 +74,7 @@ namespace BlackGui
             ui(new Ui::CDbMappingComponent),
             m_autoStashDialog(new CDbAutoStashingComponent(this)),
             m_autoSimulatorDialog(new CDbAutoSimulatorStashingComponent(this)),
-            m_modelModifyDialog(new CDbModelMappingModifyComponent(this))
+            m_modelModifyDialog(new CDbModelMappingModifyDialog(this))
         {
             ui->setupUi(this);
             ui->comp_StashAircraft->setMappingComponent(this);
diff --git a/src/blackgui/components/dbmappingcomponent.h b/src/blackgui/components/dbmappingcomponent.h
index 3c177cdbe..383e32fc0 100644
--- a/src/blackgui/components/dbmappingcomponent.h
+++ b/src/blackgui/components/dbmappingcomponent.h
@@ -57,7 +57,7 @@ namespace BlackGui
     {
         class CDbAutoStashingComponent;
         class CDbAutoSimulatorStashingComponent;
-        class CDbModelMappingModifyComponent;
+        class CDbModelMappingModifyDialog;
 
         /*!
          * Mapping component
@@ -323,7 +323,7 @@ namespace BlackGui
             QScopedPointer<Ui::CDbMappingComponent>             ui;
             QScopedPointer<CDbAutoStashingComponent>            m_autoStashDialog;     //!< dialog auto stashing
             QScopedPointer<CDbAutoSimulatorStashingComponent>   m_autoSimulatorDialog; //!< dialog auto simulator update
-            QScopedPointer<CDbModelMappingModifyComponent>      m_modelModifyDialog;   //!< dialog when modifying models
+            QScopedPointer<CDbModelMappingModifyDialog>      m_modelModifyDialog;   //!< dialog when modifying models
             BlackMisc::Simulation::FsCommon::CVPilotRulesReader m_vPilotReader;        //!< read vPilot rules
             BlackMisc::CDigestSignal                            m_dsStashedModelsChanged { this, &CDbMappingComponent::onStashedModelsChangedDigest, 750, 25 };
             BlackMisc::CDataReadOnly<BlackCore::Data::TAuthenticatedDbUser> m_swiftDbUser { this, &CDbMappingComponent::onUserChanged };
diff --git a/src/blackgui/components/dbmodelmappingmodifycomponent.cpp b/src/blackgui/components/dbmodelmappingmodifydialog.cpp
similarity index 63%
rename from src/blackgui/components/dbmodelmappingmodifycomponent.cpp
rename to src/blackgui/components/dbmodelmappingmodifydialog.cpp
index 212b92da4..045bf4a44 100644
--- a/src/blackgui/components/dbmodelmappingmodifycomponent.cpp
+++ b/src/blackgui/components/dbmodelmappingmodifydialog.cpp
@@ -7,9 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "blackgui/components/dbmodelmappingmodifycomponent.h"
+#include "blackgui/components/dbmodelmappingmodifydialog.h"
 #include "blackgui/editors/modelmappingmodifyform.h"
-#include "ui_dbmodelmappingmodifycomponent.h"
+#include "ui_dbmodelmappingmodifydialog.h"
 
 #include <QWidget>
 
@@ -20,25 +20,26 @@ namespace BlackGui
 {
     namespace Components
     {
-        CDbModelMappingModifyComponent::CDbModelMappingModifyComponent(QWidget *parent) :
+        CDbModelMappingModifyDialog::CDbModelMappingModifyDialog(QWidget *parent) :
             QDialog(parent),
             CDbMappingComponentAware(parent),
-            ui(new Ui::CDbModelMappingModifyComponent)
+            ui(new Ui::CDbModelMappingModifyDialog)
         {
             ui->setupUi(this);
+            this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
         }
 
-        CDbModelMappingModifyComponent::~CDbModelMappingModifyComponent()
+        CDbModelMappingModifyDialog::~CDbModelMappingModifyDialog()
         {
             // void
         }
 
-        CPropertyIndexVariantMap CDbModelMappingModifyComponent::getValues() const
+        CPropertyIndexVariantMap CDbModelMappingModifyDialog::getValues() const
         {
             return (ui->editor_ModelMappingModify->getValues());
         }
 
-        void CDbModelMappingModifyComponent::setValue(const CAircraftModel &model)
+        void CDbModelMappingModifyDialog::setValue(const CAircraftModel &model)
         {
             ui->editor_ModelMappingModify->setValue(model);
         }
diff --git a/src/blackgui/components/dbmodelmappingmodifycomponent.h b/src/blackgui/components/dbmodelmappingmodifydialog.h
similarity index 74%
rename from src/blackgui/components/dbmodelmappingmodifycomponent.h
rename to src/blackgui/components/dbmodelmappingmodifydialog.h
index b7fb73862..4b84c85de 100644
--- a/src/blackgui/components/dbmodelmappingmodifycomponent.h
+++ b/src/blackgui/components/dbmodelmappingmodifydialog.h
@@ -9,8 +9,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_COMPONENTS_DBMODELMAPPINGMODIFYCOMPONENT_H
-#define BLACKGUI_COMPONENTS_DBMODELMAPPINGMODIFYCOMPONENT_H
+#ifndef BLACKGUI_COMPONENTS_DBMODELMAPPINGMODIFYDIALOG_H
+#define BLACKGUI_COMPONENTS_DBMODELMAPPINGMODIFYDIALOG_H
 
 #include "blackgui/blackguiexport.h"
 #include "blackgui/components/dbmappingcomponentaware.h"
@@ -20,11 +20,8 @@
 #include <QObject>
 #include <QScopedPointer>
 
-class QWidget;
-
 namespace BlackMisc { namespace Simulation { class CAircraftModel; } }
-namespace Ui { class CDbModelMappingModifyComponent; }
-
+namespace Ui { class CDbModelMappingModifyDialog; }
 namespace BlackGui
 {
     namespace Components
@@ -32,7 +29,7 @@ namespace BlackGui
         /*!
          * Modify model fields as dialog
          */
-        class BLACKGUI_EXPORT CDbModelMappingModifyComponent :
+        class BLACKGUI_EXPORT CDbModelMappingModifyDialog :
             public QDialog,
             public CDbMappingComponentAware
         {
@@ -40,10 +37,10 @@ namespace BlackGui
 
         public:
             //! Constructor
-            explicit CDbModelMappingModifyComponent(QWidget *parent = nullptr);
+            explicit CDbModelMappingModifyDialog(QWidget *parent = nullptr);
 
             //! Destructor
-            ~CDbModelMappingModifyComponent();
+            virtual ~CDbModelMappingModifyDialog();
 
             //! Get the values
             BlackMisc::CPropertyIndexVariantMap getValues() const;
@@ -52,7 +49,7 @@ namespace BlackGui
             void setValue(const BlackMisc::Simulation::CAircraftModel &model);
 
         private:
-            QScopedPointer<Ui::CDbModelMappingModifyComponent> ui;
+            QScopedPointer<Ui::CDbModelMappingModifyDialog> ui;
         };
     } // ns
 } // ns
diff --git a/src/blackgui/components/dbmodelmappingmodifycomponent.ui b/src/blackgui/components/dbmodelmappingmodifydialog.ui
similarity index 80%
rename from src/blackgui/components/dbmodelmappingmodifycomponent.ui
rename to src/blackgui/components/dbmodelmappingmodifydialog.ui
index 8dc44ea1b..080f189f7 100644
--- a/src/blackgui/components/dbmodelmappingmodifycomponent.ui
+++ b/src/blackgui/components/dbmodelmappingmodifydialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CDbModelMappingModifyComponent</class>
- <widget class="QDialog" name="CDbModelMappingModifyComponent">
+ <class>CDbModelMappingModifyDialog</class>
+ <widget class="QDialog" name="CDbModelMappingModifyDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -20,7 +20,7 @@
    <string>Model modify form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+   <item alignment="Qt::AlignTop">
     <widget class="BlackGui::Editors::CModelMappingModifyForm" name="editor_ModelMappingModify">
      <property name="minimumSize">
       <size>
@@ -36,19 +36,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <spacer name="vs_ModelMappingModify">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item>
     <widget class="QDialogButtonBox" name="bb_ModelMappingModiyForm">
      <property name="orientation">
@@ -74,7 +61,7 @@
   <connection>
    <sender>bb_ModelMappingModiyForm</sender>
    <signal>accepted()</signal>
-   <receiver>CDbModelMappingModifyComponent</receiver>
+   <receiver>CDbModelMappingModifyDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -90,7 +77,7 @@
   <connection>
    <sender>bb_ModelMappingModiyForm</sender>
    <signal>rejected()</signal>
-   <receiver>CDbModelMappingModifyComponent</receiver>
+   <receiver>CDbModelMappingModifyDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">