diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp
index 00c074cf9..d32ee2a21 100644
--- a/src/blackgui/components/dbownmodelscomponent.cpp
+++ b/src/blackgui/components/dbownmodelscomponent.cpp
@@ -43,7 +43,7 @@ namespace BlackGui
         {
             ui->setupUi(this);
             ui->comp_SimulatorSelector->setMode(CSimulatorSelector::RadioButtons);
-            ui->tvp_OwnAircraftModels->setAircraftModelMode(CAircraftModelListModel::OwnSimulatorModelMapping);
+            ui->tvp_OwnAircraftModels->setAircraftModelMode(CAircraftModelListModel::OwnAircraftModelMappingTool);
             ui->tvp_OwnAircraftModels->addFilterDialog();
             ui->tvp_OwnAircraftModels->setDisplayAutomatically(true);
             ui->tvp_OwnAircraftModels->setCustomMenu(new CLoadModelsMenu(this, true));
diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp
index f1eadf4d3..568813b80 100644
--- a/src/blackgui/components/mappingcomponent.cpp
+++ b/src/blackgui/components/mappingcomponent.cpp
@@ -62,7 +62,7 @@ namespace BlackGui
             ui(new Ui::CMappingComponent)
         {
             ui->setupUi(this);
-            ui->tvp_AircraftModels->setAircraftModelMode(CAircraftModelListModel::OwnSimulatorModel);
+            ui->tvp_AircraftModels->setAircraftModelMode(CAircraftModelListModel::OwnAircraftModelClient);
             ui->tvp_AircraftModels->setResizeMode(CAircraftModelView::ResizingOff);
             ui->tvp_AircraftModels->addFilterDialog();
             ui->tvp_AircraftModels->menuRemoveItems(CViewBaseNonTemplate::MenuBackend);
diff --git a/src/blackgui/models/aircraftmodellistmodel.cpp b/src/blackgui/models/aircraftmodellistmodel.cpp
index 1d947396e..894536203 100644
--- a/src/blackgui/models/aircraftmodellistmodel.cpp
+++ b/src/blackgui/models/aircraftmodellistmodel.cpp
@@ -50,8 +50,7 @@ namespace BlackGui
             switch (mode)
             {
             case NotSet:
-            case OwnSimulatorModel:
-            case StashModel:
+            case OwnAircraftModelClient:
                 this->m_columns.addColumn(CColumn::standardString("model", { CAircraftModel::IndexModelString}));
                 this->m_columns.addColumn(CColumn("DB", "DB metadata", CAircraftModel::IndexDatabaseIcon, new CPixmapFormatter()));
                 this->m_columns.addColumn(CColumn::standardString("DB", "parts from DB", { CAircraftModel::IndexMembersDbStatus}));
@@ -77,11 +76,15 @@ namespace BlackGui
                 // intentional fall thru
                 this->m_columns.addColumn(CColumn::orderColumn());
 
-            case OwnSimulatorModelMapping:
+            case OwnAircraftModelMappingTool:
+            case StashModel:
                 this->m_columns.addColumn(CColumn::standardString("model", CAircraftModel::IndexModelString));
                 this->m_columns.addColumn(CColumn("DB", "DB metadata", CAircraftModel::IndexDatabaseIcon, new CPixmapFormatter()));
+                if (mode == StashModel)
+                {
+                    this->m_columns.addColumn(CColumn::standardString("flags", "parts from DB", { CAircraftModel::IndexMembersDbStatus}));
+                }
                 this->m_columns.addColumn(CColumn("mode", "model mode(include, exclude)", CAircraftModel::IndexModelModeAsIcon, new CPixmapFormatter()));
-                // this->m_columns.addColumn(CColumn::standardValueObject("call", "callsign", CAircraftModel::IndexCallsign));
                 this->m_columns.addColumn(CColumn::standardString("dist.", "distributor", { CAircraftModel::IndexDistributor, CDistributor::IndexDbStringKey}));
                 if (mode == OwnModelSet)
                 {
@@ -89,9 +92,11 @@ namespace BlackGui
                 }
                 this->m_columns.addColumn(CColumn::standardString("ac", "aircraft ICAO", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexAircraftDesignator}));
                 this->m_columns.addColumn(CColumn::standardString("fam.", "aircraft family", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexFamily}));
+                this->m_columns.addColumn(CColumn::standardString("livery", { CAircraftModel::IndexLivery, CLivery::IndexCombinedCode}));
                 this->m_columns.addColumn(CColumn::standardString("al", "airline ICAO", { CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineDesignator}));
                 this->m_columns.addColumn(CColumn::standardString("description",  CAircraftModel::IndexDescription));
                 this->m_columns.addColumn(CColumn::standardString("filename",  CAircraftModel::IndexFileName));
+                this->m_columns.addColumn(CColumn::standardString("file ts.", "file timestamp", CAircraftModel::IndexFileTimestampFormattedYmdhms));
                 this->m_columns.addColumn(CColumn::standardString("icon",  CAircraftModel::IndexIconPath));
                 this->m_columns.addColumn(CColumn::standardString("changed", CAircraftModel::IndexUtcTimestampFormattedYmdhms));
 
diff --git a/src/blackgui/models/aircraftmodellistmodel.h b/src/blackgui/models/aircraftmodellistmodel.h
index 1e1746712..ba13e3319 100644
--- a/src/blackgui/models/aircraftmodellistmodel.h
+++ b/src/blackgui/models/aircraftmodellistmodel.h
@@ -40,12 +40,12 @@ namespace BlackGui
             enum AircraftModelMode
             {
                 NotSet,
-                OwnSimulatorModel,         //!< models existing for my simulator
-                OwnModelSet,               //!< own model set
-                OwnSimulatorModelMapping,  //!< models of my simulator, but in mapping mode
-                Database,                  //!< Database entry
-                VPilotRuleModel,           //!< vPilot rule turned into model
-                StashModel                 //!< stashed models
+                OwnAircraftModelClient,      //!< models existing for my simulator
+                OwnAircraftModelMappingTool, //!< models of my simulator, but in mapping mode
+                OwnModelSet,                 //!< own model set
+                StashModel,                  //!< stashed models
+                Database,                    //!< Database entry
+                VPilotRuleModel              //!< vPilot rule turned into model
             };
 
             //! Constructor
diff --git a/src/blackgui/views/aircraftmodelview.cpp b/src/blackgui/views/aircraftmodelview.cpp
index 961bfa086..b69b4508c 100644
--- a/src/blackgui/views/aircraftmodelview.cpp
+++ b/src/blackgui/views/aircraftmodelview.cpp
@@ -48,7 +48,7 @@ namespace BlackGui
         CAircraftModelView::CAircraftModelView(QWidget *parent) : COrderableViewWithDbObjects(parent)
         {
             // default
-            this->standardInit(new CAircraftModelListModel(CAircraftModelListModel::OwnSimulatorModel, this));
+            this->standardInit(new CAircraftModelListModel(CAircraftModelListModel::OwnAircraftModelClient, this));
 
             // shortcut
             new QShortcut(CShortcut::keyStash(), this, SLOT(ps_requestStash()), nullptr, Qt::WidgetShortcut);
@@ -75,10 +75,10 @@ namespace BlackGui
             case CAircraftModelListModel::VPilotRuleModel:
                 this->m_menus = MenuDefaultNoClear | MenuStashing;
                 break;
-            case CAircraftModelListModel::OwnSimulatorModelMapping:
+            case CAircraftModelListModel::OwnAircraftModelMappingTool:
                 this->m_menus = MenuDefaultNoClear | MenuStashing | MenuLoadAndSave;
                 break;
-            case CAircraftModelListModel::OwnSimulatorModel:
+            case CAircraftModelListModel::OwnAircraftModelClient:
             default:
                 this->m_menus = MenuDefaultNoClear | MenuBackend;
                 break;