diff --git a/src/blackgui/components/cockpitcomcomponent.cpp b/src/blackgui/components/cockpitcomcomponent.cpp
index 8905f5bfc..6c69780e6 100644
--- a/src/blackgui/components/cockpitcomcomponent.cpp
+++ b/src/blackgui/components/cockpitcomcomponent.cpp
@@ -37,6 +37,7 @@
 #include <QtGlobal>
 
 using namespace BlackGui;
+using namespace BlackGui::Editors;
 using namespace BlackCore;
 using namespace BlackCore::Context;
 using namespace BlackMisc;
@@ -55,43 +56,34 @@ namespace BlackGui
             ui(new Ui::CCockpitComComponent)
         {
             ui->setupUi(this);
-            this->initLeds();
-            connect(ui->cbp_ComPanelTransponderMode, &CTransponderModeSelector::transponderModeChanged, this, &CCockpitComComponent::transponderModeChanged);
-            connect(ui->cbp_ComPanelTransponderMode, &CTransponderModeSelector::transponderStateIdentEnded, this, &CCockpitComComponent::transponderStateIdentEnded);
 
             // init from aircraft
             const CSimulatedAircraft ownAircraft = this->getOwnAircraft();
-            this->ps_updateCockpitFromContext(ownAircraft, CIdentifier("dummyInitialValues")); // intentionally different name here
+            this->updateCockpitFromContext(ownAircraft, CIdentifier("dummyInitialValues")); // intentionally different name here
 
-            // SELCAL pairs in cockpit
-            ui->frp_ComPanelSelcalBottom->clear();
-            connect(ui->tb_ComPanelSelcalTest, &QPushButton::clicked, this, &CCockpitComComponent::ps_testSelcal);
+            // COM form
+            connect(ui->editor_Com, &CCockpitComForm::testSelcal, this, &CCockpitComComponent::testSelcal);
+            connect(ui->editor_Com, &CCockpitComForm::changedCockpitValues, this, &CCockpitComComponent::updateOwnCockpitInContext);
+            connect(ui->editor_Com, &CCockpitComForm::selcalChanged, this, &CCockpitComComponent::updateSelcalInContext);
 
-            // COM GUI events
-            connect(ui->tb_ComPanelCom1Toggle, &QPushButton::clicked, this, &CCockpitComComponent::ps_guiChangedCockpitValues);
-            connect(ui->tb_ComPanelCom2Toggle, &QPushButton::clicked, this, &CCockpitComComponent::ps_guiChangedCockpitValues);
-            connect(ui->ds_ComPanelCom1Active, &QDoubleSpinBox::editingFinished, this, &CCockpitComComponent::ps_guiChangedCockpitValues);
-            connect(ui->ds_ComPanelCom2Active, &QDoubleSpinBox::editingFinished, this, &CCockpitComComponent::ps_guiChangedCockpitValues);
-            connect(ui->ds_ComPanelCom1Standby, &QDoubleSpinBox::editingFinished, this, &CCockpitComComponent::ps_guiChangedCockpitValues);
-            connect(ui->ds_ComPanelCom2Standby, &QDoubleSpinBox::editingFinished, this, &CCockpitComComponent::ps_guiChangedCockpitValues);
-            connect(ui->sbp_ComPanelTransponder, &QDoubleSpinBox::editingFinished, this, &CCockpitComComponent::ps_guiChangedCockpitValues);
-            connect(ui->cbp_ComPanelTransponderMode, &CTransponderModeSelector::transponderModeChanged, this, &CCockpitComComponent::ps_guiChangedCockpitValues);
-            connect(ui->frp_ComPanelSelcalBottom, &CSelcalCodeSelector::valueChanged, this, &CCockpitComComponent::ps_guiChangedSelcal);
+            // Relay COM form signals
+            connect(ui->editor_Com, &CCockpitComForm::transponderModeChanged, this, &CCockpitComComponent::transponderModeChanged);
+            connect(ui->editor_Com, &CCockpitComForm::transponderStateIdentEnded, this, &CCockpitComComponent::transponderStateIdentEnded);
 
             // hook up with changes from own aircraft context
-            this->connect(sGui->getIContextOwnAircraft(), &IContextOwnAircraft::changedAircraftCockpit, this, &CCockpitComComponent::ps_updateCockpitFromContext);
-            this->connect(sGui->getIContextOwnAircraft(), &IContextOwnAircraft::changedSelcal, this, &CCockpitComComponent::ps_onChangedSelcal);
+            connect(sGui->getIContextOwnAircraft(), &IContextOwnAircraft::changedAircraftCockpit, this, &CCockpitComComponent::updateCockpitFromContext);
+            connect(sGui->getIContextOwnAircraft(), &IContextOwnAircraft::changedSelcal, this, &CCockpitComComponent::updateSelcalFromContext);
 
             // hook up with audio context
-            this->connect(sGui->getIContextAudio(), &IContextAudio::changedVoiceRooms, this, &CCockpitComComponent::ps_onChangedVoiceRoomStatus);
+            connect(sGui->getIContextAudio(), &IContextAudio::changedVoiceRooms, this, &CCockpitComComponent::updateVoiceRoomStatusFromContext);
         }
 
         CCockpitComComponent::~CCockpitComComponent()
         { }
 
-        void CCockpitComComponent::setSelectedTransponderModeStateIdent()
+        void CCockpitComComponent::setTransponderModeStateIdent()
         {
-            ui->cbp_ComPanelTransponderMode->setSelectedTransponderModeStateIdent();
+            ui->editor_Com->setTransponderModeStateIdent();
         }
 
         void CCockpitComComponent::paintEvent(QPaintEvent *event)
@@ -100,34 +92,7 @@ namespace BlackGui
             CStyleSheetUtility::useStyleSheetInDerivedWidget(this);
         }
 
-        void CCockpitComComponent::ps_guiChangedCockpitValues()
-        {
-            const QObject *sender = QObject::sender();
-            if (sender == ui->tb_ComPanelCom1Toggle)
-            {
-                if (ui->ds_ComPanelCom1Standby->value() == ui->ds_ComPanelCom1Active->value()) { return; }
-                const double f = ui->ds_ComPanelCom1Active->value();
-                ui->ds_ComPanelCom1Active->setValue(ui->ds_ComPanelCom1Standby->value());
-                ui->ds_ComPanelCom1Standby->setValue(f);
-            }
-            else if (sender == ui->tb_ComPanelCom2Toggle)
-            {
-                if (ui->ds_ComPanelCom2Standby->value() == ui->ds_ComPanelCom2Active->value()) { return; }
-                const double f = ui->ds_ComPanelCom2Active->value();
-                ui->ds_ComPanelCom2Active->setValue(ui->ds_ComPanelCom2Standby->value());
-                ui->ds_ComPanelCom2Standby->setValue(f);
-            }
-
-            const CSimulatedAircraft ownAircraft = this->cockpitValuesToAircraftObject();
-            this->updateOwnCockpitInContext(ownAircraft);
-        }
-
-        void CCockpitComComponent::ps_guiChangedSelcal()
-        {
-            sGui->getIContextOwnAircraft()->updateSelcal(this->getSelcal(), identifier());
-        }
-
-        void CCockpitComComponent::ps_updateCockpitFromContext(const CSimulatedAircraft &ownAircraft, const CIdentifier &originator)
+        void CCockpitComComponent::updateCockpitFromContext(const CSimulatedAircraft &ownAircraft, const CIdentifier &originator)
         {
             if (isMyIdentifier(originator)) { return; } // comes from myself
 
@@ -138,49 +103,23 @@ namespace BlackGui
             const CTransponder transponder = ownAircraft.getTransponder();
 
             // update the frequencies
-            this->updateFrequencyDisplaysFromComSystems(com1, com2);
+            ui->editor_Com->setFrequencyDisplays(com1, com2);
 
             // update transponder
-            const int tc = transponder.getTransponderCode();
-            if (tc != ui->sbp_ComPanelTransponder->value())
-            {
-                ui->sbp_ComPanelTransponder->setValue(tc);
-            }
-
-            ui->cbp_ComPanelTransponderMode->setSelectedTransponderMode(transponder.getTransponderMode());
+            ui->editor_Com->setTransponder(transponder);
 
+            // selected stations
             if (sGui->getIContextNetwork())
             {
                 const CAtcStationList selectedStations = sGui->getIContextNetwork()->getSelectedAtcStations();
-                const CAtcStation com1Station = selectedStations.size() > 0 ? selectedStations[0] : CAtcStation();
-                const CAtcStation com2Station = selectedStations.size() > 1 ? selectedStations[1] : CAtcStation();
-                if (com1Station.getCallsign().isEmpty())
-                {
-                    ui->lbl_ComPanelCom1Active->setToolTip("");
-                    ui->led_ComPanelCom1->setOn(false);
-                }
-                else
-                {
-                    ui->lbl_ComPanelCom1Active->setToolTip(com1Station.getCallsign().getStringAsSet());
-                    ui->led_ComPanelCom1->setOn(true);
-
-                }
-                if (com2Station.getCallsign().isEmpty())
-                {
-                    ui->lbl_ComPanelCom2Active->setToolTip("");
-                    ui->led_ComPanelCom2->setOn(false);
-                }
-                else
-                {
-                    ui->lbl_ComPanelCom2Active->setToolTip(com2Station.getCallsign().getStringAsSet());
-                    ui->led_ComPanelCom2->setOn(true);
-                }
+                ui->editor_Com->setSelectedAtcStations(selectedStations);
             }
         }
 
-        void CCockpitComComponent::ps_testSelcal()
+        void CCockpitComComponent::testSelcal()
         {
-            const CSelcal selcal = this->getSelcal();
+            Q_ASSERT_X(sGui, Q_FUNC_INFO, "Need sGui");
+            const CSelcal selcal = ui->editor_Com->getSelcal();
             if (!selcal.isValid())
             {
                 CLogMessage().validationWarning("Invalid SELCAL code");
@@ -195,59 +134,10 @@ namespace BlackGui
             }
         }
 
-        void CCockpitComComponent::ps_onChangedSelcal(const CSelcal &selcal, const CIdentifier &originator)
+        void CCockpitComComponent::updateSelcalFromContext(const CSelcal &selcal, const CIdentifier &originator)
         {
             if (isMyIdentifier(originator)) { return; } // comes from myself
-            ui->frp_ComPanelSelcalBottom->setSelcalCode(selcal);
-        }
-
-        CSelcal CCockpitComComponent::getSelcal() const
-        {
-            return ui->frp_ComPanelSelcalBottom->getSelcal();
-        }
-
-        void CCockpitComComponent::initLeds()
-        {
-            const CLedWidget::LedShape shape = CLedWidget::Rounded;
-            ui->led_ComPanelCom1->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM1 connected", "COM1 disconnected", 14);
-            ui->led_ComPanelCom2->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM2 connected", "COM2 disconnected", 14);
-        }
-
-        CSimulatedAircraft CCockpitComComponent::cockpitValuesToAircraftObject()
-        {
-            CSimulatedAircraft ownAircraft = this->getOwnAircraft();
-            CTransponder transponder = ownAircraft.getTransponder();
-            CComSystem com1 = ownAircraft.getCom1System();
-            CComSystem com2 = ownAircraft.getCom2System();
-
-            //
-            // Transponder
-            //
-            const QString transponderCode = QString::number(ui->sbp_ComPanelTransponder->value());
-            if (CTransponder::isValidTransponderCode(transponderCode))
-            {
-                transponder.setTransponderCode(transponderCode);
-            }
-            else
-            {
-                CLogMessage().validationWarning("Wrong transponder code, reset");
-                ui->sbp_ComPanelTransponder->setValue(transponder.getTransponderCode());
-            }
-            transponder.setTransponderMode(ui->cbp_ComPanelTransponderMode->getSelectedTransponderMode());
-
-            //
-            // COM units
-            //
-            com1.setFrequencyActiveMHz(ui->ds_ComPanelCom1Active->value());
-            com1.setFrequencyStandbyMHz(ui->ds_ComPanelCom1Standby->value());
-            com2.setFrequencyActiveMHz(ui->ds_ComPanelCom2Active->value());
-            com2.setFrequencyStandbyMHz(ui->ds_ComPanelCom2Standby->value());
-            this->updateFrequencyDisplaysFromComSystems(com1, com2); // back annotation after rounding
-
-            ownAircraft.setCom1System(com1);
-            ownAircraft.setCom2System(com2);
-            ownAircraft.setTransponder(transponder);
-            return ownAircraft;
+            ui->editor_Com->setSelcal(selcal);
         }
 
         CSimulatedAircraft CCockpitComComponent::getOwnAircraft() const
@@ -266,41 +156,17 @@ namespace BlackGui
             return sGui->getIContextOwnAircraft()->updateCockpit(ownAircraft.getCom1System(), ownAircraft.getCom2System(), ownAircraft.getTransponder(), identifier());
         }
 
-        void CCockpitComComponent::updateFrequencyDisplaysFromComSystems(const CComSystem &com1, const CComSystem &com2)
-        {
-            double freq = com1.getFrequencyActive().valueRounded(CFrequencyUnit::MHz(), 3);
-            if (freq != ui->ds_ComPanelCom1Active->value())
-            {
-                ui->ds_ComPanelCom1Active->setValue(freq);
-            }
-
-            freq = com2.getFrequencyActive().valueRounded(CFrequencyUnit::MHz(), 3);
-            if (freq != ui->ds_ComPanelCom2Active->value())
-            {
-                ui->ds_ComPanelCom2Active->setValue(freq);
-            }
-
-            freq = com1.getFrequencyStandby().valueRounded(CFrequencyUnit::MHz(), 3);
-            if (freq != ui->ds_ComPanelCom1Standby->value())
-            {
-                ui->ds_ComPanelCom1Standby->setValue(freq);
-            }
-
-            freq = com2.getFrequencyStandby().valueRounded(CFrequencyUnit::MHz(), 3);
-            if (freq != ui->ds_ComPanelCom2Standby->value())
-            {
-                ui->ds_ComPanelCom2Standby->setValue(freq);
-            }
-        }
-
-        void CCockpitComComponent::ps_onChangedVoiceRoomStatus(const CVoiceRoomList &selectedVoiceRooms, bool connected)
+        void CCockpitComComponent::updateVoiceRoomStatusFromContext(const CVoiceRoomList &selectedVoiceRooms, bool connected)
         {
             Q_ASSERT(selectedVoiceRooms.size() == 2);
-            const CVoiceRoom room1 = selectedVoiceRooms[0];
-            const CVoiceRoom room2 = selectedVoiceRooms[1];
-            ui->led_ComPanelCom1->setOn(room1.isConnected());
-            ui->led_ComPanelCom2->setOn(room2.isConnected());
             Q_UNUSED(connected);
+            ui->editor_Com->setVoiceRoomStatus(selectedVoiceRooms);
+        }
+
+        void CCockpitComComponent::updateSelcalInContext(const CSelcal &selcal)
+        {
+            if (!sGui || sGui->isShuttingDown() || !sGui->getIContextOwnAircraft()) { return; }
+            sGui->getIContextOwnAircraft()->updateSelcal(selcal, identifier());
         }
     } // namespace
 } // namespace
diff --git a/src/blackgui/components/cockpitcomcomponent.h b/src/blackgui/components/cockpitcomcomponent.h
index f08fa576d..3a14e2765 100644
--- a/src/blackgui/components/cockpitcomcomponent.h
+++ b/src/blackgui/components/cockpitcomcomponent.h
@@ -49,6 +49,9 @@ namespace BlackGui
             //! Destructor
             virtual ~CCockpitComComponent();
 
+            //! Set to BlackMisc::Aviation::CTransponder::StateIdent
+            void setTransponderModeStateIdent();
+
         signals:
             //! \copydoc BlackGui::Components::CTransponderModeSelector::transponderModeChanged
             void transponderModeChanged(BlackMisc::Aviation::CTransponder::TransponderMode newMode);
@@ -56,55 +59,34 @@ namespace BlackGui
             //! \copydoc BlackGui::Components::CTransponderModeSelector::transponderStateIdentEnded
             void transponderStateIdentEnded();
 
-        public slots:
-            //!\ Set to ident
-            void setSelectedTransponderModeStateIdent();
-
         protected:
             //! \copydoc QWidget::paintEvent
             virtual void paintEvent(QPaintEvent *event) override;
 
-        private slots:
-            //! Cockpit values have been changed in GUI
-            void ps_guiChangedCockpitValues();
-
-            //! SELCAL changed in GUI
-            void ps_guiChangedSelcal();
-
-            //! Update cockpit from context
-            void ps_updateCockpitFromContext(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft, const BlackMisc::CIdentifier &originator);
-
-            //! Cockpit values have been changed in GUI
-            void ps_testSelcal();
-
-            //! SELCAL was changed
-            void ps_onChangedSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator);
-
-            //! Update voice room related information
-            void ps_onChangedVoiceRoomStatus(const BlackMisc::Audio::CVoiceRoomList &selectedVoiceRooms, bool connected);
-
         private:
-            //! Init LEDs
-            void initLeds();
-
-            //! Cockpit values to aircraft
-            BlackMisc::Simulation::CSimulatedAircraft cockpitValuesToAircraftObject();
+            //! Cockpit values have been changed in GUI
+            void testSelcal();
 
             //! Get own aircraft
             BlackMisc::Simulation::CSimulatedAircraft getOwnAircraft() const;
 
-            //! Current SELCAL code
-            BlackMisc::Aviation::CSelcal getSelcal() const;
-
             //! Cockpit updates
             bool updateOwnCockpitInContext(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft);
 
-            //! COM frequencies displayed
-            void updateFrequencyDisplaysFromComSystems(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2);
+            //! SELCAL changed in GUI
+            void updateSelcalInContext(const BlackMisc::Aviation::CSelcal &selcal);
+
+            //! SELCAL was changed
+            void updateSelcalFromContext(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator);
+
+            //! Update cockpit from context
+            void updateCockpitFromContext(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft, const BlackMisc::CIdentifier &originator);
+
+            //! Update voice room related information
+            void updateVoiceRoomStatusFromContext(const BlackMisc::Audio::CVoiceRoomList &selectedVoiceRooms, bool connected);
 
             QScopedPointer<Ui::CCockpitComComponent> ui;
         };
-
     } // namespace
 } // namespace
 
diff --git a/src/blackgui/components/cockpitcomcomponent.ui b/src/blackgui/components/cockpitcomcomponent.ui
index 6a1847f99..7fd5529b6 100644
--- a/src/blackgui/components/cockpitcomcomponent.ui
+++ b/src/blackgui/components/cockpitcomcomponent.ui
@@ -13,528 +13,39 @@
   <property name="windowTitle">
    <string>Cockpit COM</string>
   </property>
-  <property name="lineWidth">
-   <number>0</number>
-  </property>
-  <layout class="QHBoxLayout" name="hl_Cockpit" stretch="1,2">
+  <layout class="QVBoxLayout" name="vl_CockpitCom" stretch="0">
    <property name="leftMargin">
-    <number>2</number>
+    <number>0</number>
    </property>
    <property name="topMargin">
-    <number>2</number>
+    <number>0</number>
    </property>
    <property name="rightMargin">
-    <number>2</number>
+    <number>0</number>
    </property>
    <property name="bottomMargin">
-    <number>2</number>
+    <number>0</number>
    </property>
    <item>
-    <widget class="QFrame" name="fr_Com">
+    <widget class="BlackGui::Editors::CCockpitComForm" name="editor_Com">
      <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
+      <enum>QFrame::Raised</enum>
      </property>
-     <property name="lineWidth">
-      <number>0</number>
-     </property>
-     <layout class="QGridLayout" name="gl_Com">
-      <property name="leftMargin">
-       <number>2</number>
-      </property>
-      <property name="topMargin">
-       <number>2</number>
-      </property>
-      <property name="rightMargin">
-       <number>2</number>
-      </property>
-      <property name="bottomMargin">
-       <number>2</number>
-      </property>
-      <property name="spacing">
-       <number>4</number>
-      </property>
-      <item row="0" column="1">
-       <widget class="QWidget" name="qw_ComPanelCom2Active" native="true">
-        <layout class="QGridLayout" name="gl_ComPanelCom2Active">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="lbl_ComPanelCom2Active">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>COM2:</string>
-           </property>
-           <property name="buddy">
-            <cstring>qw_ComPanelCom2Active</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0" colspan="2">
-          <widget class="QDoubleSpinBox" name="ds_ComPanelCom2Active">
-           <property name="decimals">
-            <number>3</number>
-           </property>
-           <property name="minimum">
-            <double>118.000000000000000</double>
-           </property>
-           <property name="maximum">
-            <double>136.974999999999994</double>
-           </property>
-           <property name="singleStep">
-            <double>0.025000000000000</double>
-           </property>
-           <property name="value">
-            <double>119.000000000000000</double>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1" alignment="Qt::AlignHCenter">
-          <widget class="BlackGui::CLedWidget" name="led_ComPanelCom2" native="true"/>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QWidget" name="qw_ComPanelCom1Standby" native="true">
-        <layout class="QGridLayout" name="gl_ComPanelCom1Standby">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="lbl_ComPanelCom1Standby">
-           <property name="text">
-            <string>standby:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0" colspan="2">
-          <widget class="QDoubleSpinBox" name="ds_ComPanelCom1Standby">
-           <property name="decimals">
-            <number>3</number>
-           </property>
-           <property name="minimum">
-            <double>118.000000000000000</double>
-           </property>
-           <property name="maximum">
-            <double>136.974999999999994</double>
-           </property>
-           <property name="singleStep">
-            <double>0.025000000000000</double>
-           </property>
-           <property name="value">
-            <double>119.000000000000000</double>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QToolButton" name="tb_ComPanelCom1Toggle">
-           <property name="toolTip">
-            <string>Toggle COM 1 standby/active</string>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="icon">
-            <iconset resource="../../blackmisc/blackmisc.qrc">
-             <normaloff>:/diagona/icons/diagona/icons/arrow-circle-double-135.png</normaloff>:/diagona/icons/diagona/icons/arrow-circle-double-135.png</iconset>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QWidget" name="qw_ComPanelCom1Active" native="true">
-        <layout class="QGridLayout" name="gl_ComPanelCom1Active">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="lbl_ComPanelCom1Active">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>COM1:</string>
-           </property>
-           <property name="buddy">
-            <cstring>qw_ComPanelCom1Active</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0" colspan="2">
-          <widget class="QDoubleSpinBox" name="ds_ComPanelCom1Active">
-           <property name="decimals">
-            <number>3</number>
-           </property>
-           <property name="minimum">
-            <double>118.000000000000000</double>
-           </property>
-           <property name="maximum">
-            <double>136.974999999999994</double>
-           </property>
-           <property name="singleStep">
-            <double>0.025000000000000</double>
-           </property>
-           <property name="value">
-            <double>119.000000000000000</double>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1" alignment="Qt::AlignHCenter">
-          <widget class="BlackGui::CLedWidget" name="led_ComPanelCom1" native="true"/>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QWidget" name="qw_ComPanelCom2Standby" native="true">
-        <layout class="QGridLayout" name="gl_ComPanelCom2Standby">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="lbl_ComPanelCom2Standby">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>standby:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0" colspan="2">
-          <widget class="QDoubleSpinBox" name="ds_ComPanelCom2Standby">
-           <property name="decimals">
-            <number>3</number>
-           </property>
-           <property name="minimum">
-            <double>118.000000000000000</double>
-           </property>
-           <property name="maximum">
-            <double>136.974999999999994</double>
-           </property>
-           <property name="singleStep">
-            <double>0.025000000000000</double>
-           </property>
-           <property name="value">
-            <double>119.000000000000000</double>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QToolButton" name="tb_ComPanelCom2Toggle">
-           <property name="toolTip">
-            <string>Toggle COM 2 standby/active</string>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="icon">
-            <iconset resource="../../blackmisc/blackmisc.qrc">
-             <normaloff>:/diagona/icons/diagona/icons/arrow-circle-double-135.png</normaloff>:/diagona/icons/diagona/icons/arrow-circle-double-135.png</iconset>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="fr_Xpdr">
-     <property name="lineWidth">
-      <number>0</number>
-     </property>
-     <layout class="QGridLayout" name="gl_Xpdr">
-      <property name="leftMargin">
-       <number>2</number>
-      </property>
-      <property name="topMargin">
-       <number>2</number>
-      </property>
-      <property name="rightMargin">
-       <number>2</number>
-      </property>
-      <property name="bottomMargin">
-       <number>2</number>
-      </property>
-      <property name="spacing">
-       <number>4</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QWidget" name="qw_ComPanelTransponder" native="true">
-        <layout class="QGridLayout" name="gl_ComPanelTransponderTop">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="lbl_ComPanelTransponder">
-           <property name="frameShape">
-            <enum>QFrame::NoFrame</enum>
-           </property>
-           <property name="text">
-            <string>XPDR:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="BlackGui::Components::CCockpitTransponderModeLedsComponent" name="comp_TransponderLeds"/>
-         </item>
-         <item row="1" column="0" colspan="2">
-          <widget class="QFrame" name="fr_ComPanelTransponder">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="frameShape">
-            <enum>QFrame::StyledPanel</enum>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Raised</enum>
-           </property>
-           <layout class="QHBoxLayout" name="hl_ComPanelTransponder">
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="BlackGui::Components::CTransponderCodeSpinBox" name="sbp_ComPanelTransponder">
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>18</height>
-               </size>
-              </property>
-              <property name="maximum">
-               <number>7777</number>
-              </property>
-              <property name="value">
-               <number>7000</number>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="BlackGui::Components::CTransponderModeSelector" name="cbp_ComPanelTransponderMode"/>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QWidget" name="qw_ComPanelSelcal" native="true">
-        <layout class="QGridLayout" name="gl_ComPanelSelect">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <property name="verticalSpacing">
-          <number>0</number>
-         </property>
-         <item row="1" column="0" colspan="2">
-          <widget class="BlackGui::Components::CSelcalCodeSelector" name="frp_ComPanelSelcalBottom"/>
-         </item>
-         <item row="0" column="0" colspan="2" alignment="Qt::AlignLeft">
-          <widget class="QFrame" name="fr_ComPanelSelcalTop">
-           <layout class="QHBoxLayout" name="hl_ComPanelSelcalTop">
-            <property name="spacing">
-             <number>0</number>
-            </property>
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="lbl_ComSelcalSelcal">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>SELCAL:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QToolButton" name="tb_ComPanelSelcalTest">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="toolTip">
-               <string>test SELCAL</string>
-              </property>
-              <property name="text">
-               <string>test SELCAL</string>
-              </property>
-              <property name="icon">
-               <iconset resource="../../blackmisc/blackmisc.qrc">
-                <normaloff>:/diagona/icons/diagona/icons/speaker-volume.png</normaloff>:/diagona/icons/diagona/icons/speaker-volume.png</iconset>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BlackGui::Components::CSelcalCodeSelector</class>
+   <class>BlackGui::Editors::CCockpitComForm</class>
    <extends>QFrame</extends>
-   <header>blackgui/components/selcalcodeselector.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>BlackGui::CLedWidget</class>
-   <extends>QWidget</extends>
-   <header>blackgui/led.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>BlackGui::Components::CTransponderModeSelector</class>
-   <extends>QComboBox</extends>
-   <header>blackgui/components/transpondermodeselector.h</header>
-  </customwidget>
-  <customwidget>
-   <class>BlackGui::Components::CTransponderCodeSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>blackgui/components/transpondercodespinbox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>BlackGui::Components::CCockpitTransponderModeLedsComponent</class>
-   <extends>QFrame</extends>
-   <header>blackgui/components/cockpittranspondermodeledscomponent.h</header>
+   <header>blackgui/editors/cockpitcomform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
- <tabstops>
-  <tabstop>ds_ComPanelCom1Active</tabstop>
-  <tabstop>ds_ComPanelCom2Active</tabstop>
-  <tabstop>sbp_ComPanelTransponder</tabstop>
-  <tabstop>cbp_ComPanelTransponderMode</tabstop>
-  <tabstop>ds_ComPanelCom1Standby</tabstop>
-  <tabstop>ds_ComPanelCom2Standby</tabstop>
-  <tabstop>tb_ComPanelCom1Toggle</tabstop>
-  <tabstop>tb_ComPanelCom2Toggle</tabstop>
-  <tabstop>tb_ComPanelSelcalTest</tabstop>
- </tabstops>
- <resources>
-  <include location="../../blackmisc/blackmisc.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/src/blackgui/components/cockpitcomponent.cpp b/src/blackgui/components/cockpitcomponent.cpp
index 3e4afda1c..8e798d9fa 100644
--- a/src/blackgui/components/cockpitcomponent.cpp
+++ b/src/blackgui/components/cockpitcomponent.cpp
@@ -52,7 +52,7 @@ namespace BlackGui
 
         void CCockpitComponent::setSelectedTransponderModeStateIdent()
         {
-            ui->comp_CockpitComComponent->setSelectedTransponderModeStateIdent();
+            ui->comp_CockpitComComponent->setTransponderModeStateIdent();
         }
 
         void CCockpitComponent::showAudio()