diff --git a/src/blackgui/editors/modelmappingform.cpp b/src/blackgui/editors/modelmappingform.cpp
index a70af94a4..5120b08e4 100644
--- a/src/blackgui/editors/modelmappingform.cpp
+++ b/src/blackgui/editors/modelmappingform.cpp
@@ -41,7 +41,7 @@ namespace BlackGui
             model.setDescription(this->ui->le_Description->text());
             model.setModelString(this->ui->le_ModelKey->text());
             model.setName(this->ui->le_Name->text());
-            model.setModelModeAsString(this->ui->cb_Include->currentText());
+            model.setModelMode(this->ui->selector_ModelMode->getMode());
             return model;
         }
 
@@ -72,7 +72,7 @@ namespace BlackGui
             ui->le_Id->setText(model.getDbKeyAsString());
             ui->le_Description->setText(model.getDescription());
             ui->le_Name->setText(model.getName());
-            ui->cb_Include->setCurrentText(model.getModelModeAsString());
+            ui->selector_ModelMode->setValue(model.getModelMode());
             ui->selector_Simulator->setValue(model.getSimulatorInfo());
             m_originalModel = model;
         }
@@ -82,11 +82,12 @@ namespace BlackGui
             const CAuthenticatedUser user(this->getUser());
             if (user.isAdmin())
             {
-                ui->cb_Include->setEnabled(true);
+                ui->selector_ModelMode->setValue(CAircraftModel::Include);
+                ui->selector_ModelMode->setReadOnly(false);
             }
             else
             {
-                ui->cb_Include->setEnabled(false);
+                ui->selector_ModelMode->setReadOnly(true);
             }
 
             CForm::ps_userChanged();
diff --git a/src/blackgui/editors/modelmappingform.ui b/src/blackgui/editors/modelmappingform.ui
index de30f2595..cca393347 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>93</height>
+    <height>95</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -41,6 +41,18 @@
       <string>Simulator model</string>
      </property>
      <layout class="QGridLayout" name="gl_ModelMappingForm">
+      <property name="leftMargin">
+       <number>3</number>
+      </property>
+      <property name="topMargin">
+       <number>3</number>
+      </property>
+      <property name="rightMargin">
+       <number>3</number>
+      </property>
+      <property name="bottomMargin">
+       <number>3</number>
+      </property>
       <item row="0" column="0">
        <widget class="BlackGui::CLabelAndIcon" name="lai_Id">
         <property name="frameShape">
@@ -162,25 +174,13 @@
        </widget>
       </item>
       <item row="1" column="6">
-       <widget class="QComboBox" name="cb_Include">
-        <item>
-         <property name="text">
-          <string>Include</string>
-         </property>
-         <property name="icon">
-          <iconset resource="../../blackmisc/blackmisc.qrc">
-           <normaloff>:/diagona/icons/diagona/icons/paper-plane--plus.png</normaloff>:/diagona/icons/diagona/icons/paper-plane--plus.png</iconset>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Exclude</string>
-         </property>
-         <property name="icon">
-          <iconset resource="../../blackmisc/blackmisc.qrc">
-           <normaloff>:/diagona/icons/diagona/icons/paper-plane--minus.png</normaloff>:/diagona/icons/diagona/icons/paper-plane--minus.png</iconset>
-         </property>
-        </item>
+       <widget class="BlackGui::CModelModeSelector" name="selector_ModelMode">
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
        </widget>
       </item>
      </layout>
@@ -189,6 +189,18 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>BlackGui::CSimulatorSelector</class>
+   <extends>QFrame</extends>
+   <header>blackgui/simulatorselector.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>BlackGui::CModelModeSelector</class>
+   <extends>QFrame</extends>
+   <header>blackgui/modelmodeselector.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>BlackGui::CLabelAndIcon</class>
    <extends>QFrame</extends>
@@ -201,12 +213,6 @@
    <header>blackgui/editors/validationindicator.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>BlackGui::CSimulatorSelector</class>
-   <extends>QFrame</extends>
-   <header>blackgui/simulatorselector.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>le_Id</tabstop>
@@ -216,8 +222,6 @@
   <tabstop>pb_Stash</tabstop>
   <tabstop>le_LastUpdated</tabstop>
  </tabstops>
- <resources>
-  <include location="../../blackmisc/blackmisc.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>