diff --git a/companion/src/firmwares/boards.h b/companion/src/firmwares/boards.h
index a4b91e687c4..d4901fb7697 100644
--- a/companion/src/firmwares/boards.h
+++ b/companion/src/firmwares/boards.h
@@ -430,7 +430,7 @@ inline bool HAS_LARGE_LCD(Board::Type board)
 
 inline bool HAS_EXTERNAL_ANTENNA(Board::Type board)
 {
-  return (board == Board::BOARD_X10 || board == Board::BOARD_HORUS_X12S || (IS_TARANIS_XLITE(board) && !IS_TARANIS_XLITES(board)));
+  return (IS_FAMILY_HORUS(board) || IS_FAMILY_T16(board) || (IS_TARANIS_XLITE(board) && !IS_TARANIS_XLITES(board)));
 }
 
 inline bool IS_TARANIS_X9DP_2019(Board::Type board)
diff --git a/companion/src/firmwares/eeprominterface.h b/companion/src/firmwares/eeprominterface.h
index e6cc8be0142..1027428f31b 100644
--- a/companion/src/firmwares/eeprominterface.h
+++ b/companion/src/firmwares/eeprominterface.h
@@ -162,7 +162,6 @@ enum Capability {
   HasAux2SerialMode,
   HasVCPSerialMode,
   HasBluetooth,
-  HasAntennaChoice,
   HasADCJitterFilter,
   HasTelemetryBaudrate,
   TopBarZones,
diff --git a/companion/src/firmwares/generalsettings.cpp b/companion/src/firmwares/generalsettings.cpp
index 744350bf2bc..59257c7499a 100644
--- a/companion/src/firmwares/generalsettings.cpp
+++ b/companion/src/firmwares/generalsettings.cpp
@@ -544,13 +544,13 @@ FieldRange GeneralSettings::getTxCurrentCalibration()
 }
 
 //  static
-AbstractStaticItemModel * GeneralSettings::antennaModeItemModel()
+AbstractStaticItemModel * GeneralSettings::antennaModeItemModel(bool model_setup)
 {
   AbstractStaticItemModel * mdl = new AbstractStaticItemModel();
   mdl->setName(AIM_GS_ANTENNAMODE);
 
   for (int i = ANTENNA_MODE_FIRST; i <= ANTENNA_MODE_LAST; i++) {
-    mdl->appendToItemList(antennaModeToString(i), i);
+    mdl->appendToItemList(antennaModeToString(i), i, model_setup ? i != ANTENNA_MODE_PER_MODEL : true);
   }
 
   mdl->loadItemList();
diff --git a/companion/src/firmwares/generalsettings.h b/companion/src/firmwares/generalsettings.h
index 0a991e930d9..62d8ee7be07 100644
--- a/companion/src/firmwares/generalsettings.h
+++ b/companion/src/firmwares/generalsettings.h
@@ -293,7 +293,7 @@ class GeneralSettings {
     static FieldRange getTxCurrentCalibration();
     static QString uartSampleModeToString(int value);
 
-    static AbstractStaticItemModel * antennaModeItemModel();
+    static AbstractStaticItemModel * antennaModeItemModel(bool model_setup = false);
     static AbstractStaticItemModel * bluetoothModeItemModel();
     static AbstractStaticItemModel * serialModeItemModel(int port_nr);
     static AbstractStaticItemModel * internalModuleBaudrateItemModel();
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 8269b5c7db9..6812d81d8a5 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -767,8 +767,6 @@ int OpenTxFirmware::getCapability(::Capability capability)
              IS_JUMPER_TPRO(board) || IS_RADIOMASTER_TX12_MK2(board);
     case HasBluetooth:
       return (IS_FAMILY_HORUS_OR_T16(board) || IS_TARANIS_X7(board) || IS_TARANIS_XLITE(board)|| IS_TARANIS_X9E(board) || IS_TARANIS_X9DP_2019(board) || IS_FLYSKY_NV14(board)) ? true : false;
-    case HasAntennaChoice:
-      return ((IS_FAMILY_HORUS_OR_T16(board) && board != Board::BOARD_X10_EXPRESS) || (IS_TARANIS_XLITE(board) && !IS_TARANIS_XLITES(board))) ? true : false;
     case HasADCJitterFilter:
       return IS_HORUS_OR_TARANIS(board);
     case HasTelemetryBaudrate:
diff --git a/companion/src/generaledit/hardware.cpp b/companion/src/generaledit/hardware.cpp
index f90bc896cbe..ab9ebb2aee4 100644
--- a/companion/src/generaledit/hardware.cpp
+++ b/companion/src/generaledit/hardware.cpp
@@ -83,7 +83,9 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
   GeneralPanel(parent, generalSettings, firmware),
   board(firmware->getBoard()),
   editorItemModels(sharedItemModels),
-  serialPortUSBVCP(nullptr)
+  serialPortUSBVCP(nullptr),
+  params(new QList<QWidget *>),
+  row(0)
 {
   editorItemModels->registerItemModel(Boards::potTypeItemModel());
   editorItemModels->registerItemModel(Boards::sliderTypeItemModel());
@@ -105,121 +107,137 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
 
   grid = new QGridLayout(this);
   int count;
-  int row = 0;
 
-  addSection(tr("Sticks"), row);
+  addSection(tr("Sticks"));
 
   count = Boards::getCapability(board, Board::Sticks);
   if (count) {
     for (int i = 0; i < count; i++) {
-      addStick(i, row);
+      addStick(i);
     }
   }
 
   if (IS_FLYSKY_NV14(board)) {
-    addLabel(tr("Dead zone"), row, 0);
+    addLabel(tr("Dead zone"));
     AutoComboBox *spnStickDeadZone = new AutoComboBox(this);
     spnStickDeadZone->setModel(GeneralSettings::stickDeadZoneItemModel());
     spnStickDeadZone->setField(generalSettings.stickDeadZone, this);
-    addParams(row, spnStickDeadZone);
+    params->append(spnStickDeadZone);
+    addParams();
   }
 
   count = Boards::getCapability(board, Board::Pots);
   count -= firmware->getCapability(HasFlySkyGimbals) ? 2 : 0;
   if (count > 0) {
-    addSection(tr("Pots"), row);
+    addSection(tr("Pots"));
     for (int i = 0; i < count; i++) {
-      addPot(i, row);
+      addPot(i);
     }
   }
 
   count = Boards::getCapability(board, Board::Sliders);
   if (count) {
-    addSection(tr("Sliders"), row);
+    addSection(tr("Sliders"));
     for (int i = 0; i < count; i++) {
-      addSlider(i, row);
+      addSlider(i);
     }
   }
 
   count = Boards::getCapability(board, Board::Switches);
   if (count) {
-    addSection(tr("Switches"), row);
+    addSection(tr("Switches"));
     for (int i = 0; i < count; i++) {
-      addSwitch(i, row);
+      addSwitch(i);
     }
   }
 
-  addLine(row);
+  addLine();
 
   if (Boards::getCapability(board, Board::HasRTC)) {
-    addLabel(tr("RTC Battery Check"), row, 0);
+    addLabel(tr("RTC Battery Check"));
     AutoCheckBox *rtcCheckDisable = new AutoCheckBox(this);
     rtcCheckDisable->setField(generalSettings.rtcCheckDisable, this, true);
-    addParams(row, rtcCheckDisable);
+    params->append(rtcCheckDisable);
+    addParams();
   }
 
-  if (firmware->getCapability(HasBluetooth)) {
-    addLabel(tr("Bluetooth"), row, 0);
+  if (firmware->getCapability(HasADCJitterFilter)) {
+    addLabel(tr("ADC Filter"));
+    AutoCheckBox *filterEnable = new AutoCheckBox(this);
+    filterEnable->setField(generalSettings.noJitterFilter, this, true);
+    params->append(filterEnable);
+    addParams();
+  }
 
-    QGridLayout *btlayout = new QGridLayout();
+  if (firmware->getCapability(HasBluetooth)) {
+    addLabel(tr("Bluetooth"));
 
     AutoComboBox *bluetoothMode = new AutoComboBox(this);
     bluetoothMode->setModel(editorItemModels->getItemModel(btmodelid));
     bluetoothMode->setField(generalSettings.bluetoothMode, this);
-    btlayout->addWidget(bluetoothMode, 0, 0);
-
-    QSpacerItem * spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
-    btlayout->addItem(spacer, 0, 1);
+    params->append(bluetoothMode);
 
     QLabel *btnamelabel = new QLabel(this);
     btnamelabel->setText(tr("Device Name:"));
-    btlayout->addWidget(btnamelabel, 0, 2);
+    params->append(btnamelabel);
 
     AutoLineEdit *bluetoothName = new AutoLineEdit(this);
     bluetoothName->setField(generalSettings.bluetoothName, BLUETOOTH_NAME_LEN, this);
-    btlayout->addWidget(bluetoothName, 0, 3);
+    params->append(bluetoothName);
 
-    grid->addLayout(btlayout, row, 1);
-    row++;
-  }
-
-  if (firmware->getCapability(HasAntennaChoice)) {
-    addLabel(tr("Antenna"), row, 0);
-    AutoComboBox *antennaMode = new AutoComboBox(this);
-    antennaMode->setModel(editorItemModels->getItemModel(antmodelid));
-    antennaMode->setField(generalSettings.antennaMode, this);
-    addParams(row, antennaMode);
+    addParams();
   }
 
   if (Boards::getCapability(board, Board::HasInternalModuleSupport)) {
     m_internalModule = generalSettings.internalModule; // to permit undo
-    addLabel(tr("Internal module"), row, 0);
+    addSection(tr("Internal RF"));
+    addLabel(tr("Type"));
     internalModule = new AutoComboBox(this);
     internalModule->setModel(tabFilteredModels->getItemModel(FIM_INTERNALMODULES));
     internalModule->setField(generalSettings.internalModule, this);
+    params->append(internalModule);
 
     connect(internalModule, &AutoComboBox::currentDataChanged, this,
             &HardwarePanel::on_internalModuleChanged);
 
+    internalModuleBaudRateLabel = new QLabel(tr("Baudrate:"));
+    params->append(internalModuleBaudRateLabel);
+
     internalModuleBaudRate = new AutoComboBox(this);
     internalModuleBaudRate->setModel(editorItemModels->getItemModel(baudmodelid));
     internalModuleBaudRate->setField(generalSettings.internalModuleBaudrate, this);
+    params->append(internalModuleBaudRate);
 
     if (m_internalModule != MODULE_TYPE_GHOST && m_internalModule != MODULE_TYPE_CROSSFIRE) {
       generalSettings.internalModuleBaudrate = 0;
+      internalModuleBaudRateLabel->setVisible(false);
       internalModuleBaudRate->setVisible(false);
     }
 
-    addParams(row, internalModule, internalModuleBaudRate);
-    row++;
+    antennaLabel = new QLabel(tr("Antenna:"));
+    params->append(antennaLabel);
+
+    antennaMode = new AutoComboBox(this);
+    antennaMode->setModel(editorItemModels->getItemModel(antmodelid));
+    antennaMode->setField(generalSettings.antennaMode, this);
+    params->append(antennaMode);
+
+    if (!(m_internalModule == MODULE_TYPE_XJT_PXX1 && HAS_EXTERNAL_ANTENNA(board))) {
+      antennaLabel->setVisible(false);
+      antennaMode->setVisible(false);
+    }
+
+    addParams();
   }
 
   if (Boards::getCapability(board, Board::HasExternalModuleSupport)) {
-    addLabel(tr("Sample Mode"), row, 0);
+    addSection(tr("External RF"));
+    addLabel(tr("Sample Mode"));
     AutoComboBox *uartSampleMode = new AutoComboBox(this);
     uartSampleMode->setModel(editorItemModels->getItemModel(uartmodelid));
     uartSampleMode->setField(generalSettings.uartSampleMode);
-    addParams(row, uartSampleMode);
+    params->append(uartSampleMode);
+    addParams();
   }
 
   // All values except 0 are mutually exclusive
@@ -227,76 +245,74 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
       this, [=](const QVariant &value) { return value == 0; });
 
   if (firmware->getCapability(HasAuxSerialMode) || firmware->getCapability(HasAux2SerialMode) || firmware->getCapability(HasVCPSerialMode))
-    addSection(tr("Serial ports"), row);
+    addSection(tr("Serial ports"));
 
   if (firmware->getCapability(HasAuxSerialMode)) {
-    QString lbl = "AUX1";
-    addLabel(tr("%1").arg(lbl), row, 0);
+    addLabel(tr("AUX1"));
     AutoComboBox *serialPortMode = new AutoComboBox(this);
     serialPortMode->setModel(editorItemModels->getItemModel(auxmodelid));
     serialPortMode->setField(generalSettings.serialPort[GeneralSettings::SP_AUX1], this);
     exclGroup->addCombo(serialPortMode);
+    params->append(serialPortMode);
 
     AutoCheckBox *serialPortPower = new AutoCheckBox(this);
     serialPortPower->setField(generalSettings.serialPower[GeneralSettings::SP_AUX1], this);
     serialPortPower->setText(tr("Power"));
+    params->append(serialPortPower);
 
-    addParams(row, serialPortMode, serialPortPower);
+    addParams();
 
     if (!firmware->getCapability(HasSoftwareSerialPower))
       serialPortPower->setVisible(false);
   }
 
   if (firmware->getCapability(HasAux2SerialMode)) {
-    QString lbl = "AUX2";
-    addLabel(tr("%1").arg(lbl), row, 0);
+    addLabel(tr("AUX2"));
     AutoComboBox *serialPortMode = new AutoComboBox(this);
     serialPortMode->setModel(editorItemModels->getItemModel(auxmodelid));
     serialPortMode->setField(generalSettings.serialPort[GeneralSettings::SP_AUX2], this);
     exclGroup->addCombo(serialPortMode);
+    params->append(serialPortMode);
 
     AutoCheckBox *serialPortPower = new AutoCheckBox(this);
     serialPortPower->setField(generalSettings.serialPower[GeneralSettings::SP_AUX2], this);
     serialPortPower->setText(tr("Power"));
+    params->append(serialPortPower);
 
-    addParams(row, serialPortMode, serialPortPower);
+    addParams();
 
     if (!firmware->getCapability(HasSoftwareSerialPower))
       serialPortPower->setVisible(false);
   }
 
   if (firmware->getCapability(HasVCPSerialMode)) {
-    addLabel(tr("USB-VCP"), row, 0);
+    addLabel(tr("USB-VCP"));
     serialPortUSBVCP = new AutoComboBox(this);
     serialPortUSBVCP->setModel(editorItemModels->getItemModel(vcpmodelid));
     serialPortUSBVCP->setField(generalSettings.serialPort[GeneralSettings::SP_VCP], this);
     exclGroup->addCombo(serialPortUSBVCP);
-    addParams(row, serialPortUSBVCP);
+    params->append(serialPortUSBVCP);
+    addParams();
     connect(this, &HardwarePanel::internalModuleChanged, this, &HardwarePanel::updateSerialPortUSBVCP);
     updateSerialPortUSBVCP();
   }
 
-  if (firmware->getCapability(HasADCJitterFilter)) {
-    addLabel(tr("ADC Filter"), row, 0);
-    AutoCheckBox *filterEnable = new AutoCheckBox(this);
-    filterEnable->setField(generalSettings.noJitterFilter, this, true);
-    addParams(row, filterEnable);
-  }
-
   if (firmware->getCapability(HasSportConnector)) {
-    addLabel(tr("S.Port Power"), row, 0);
+    addLabel(tr("S.Port Power"));
     AutoCheckBox *sportPower = new AutoCheckBox(this);
     sportPower->setField(generalSettings.sportPower, this);
-    addParams(row, sportPower);
+    params->append(sportPower);
+    addParams();
   }
 
   if (firmware->getCapability(HastxCurrentCalibration)) {
-    addLabel(tr("Current Offset"), row, 0);
+    addLabel(tr("Current Offset"));
     AutoSpinBox *txCurrentCalibration = new AutoSpinBox(this);
     FieldRange txCCRng = GeneralSettings::getTxCurrentCalibration();
     txCurrentCalibration->setSuffix(txCCRng.unit);
     txCurrentCalibration->setField(generalSettings.txCurrentCalibration);
-    addParams(row, txCurrentCalibration);
+    params->append(txCurrentCalibration);
+    addParams();
   }
 
   addVSpring(grid, 0, grid->rowCount());
@@ -331,106 +347,122 @@ void HardwarePanel::on_internalModuleChanged()
         internalModuleBaudRate->setCurrentIndex(1);
       }
 
+      internalModuleBaudRateLabel->setVisible(true);
       internalModuleBaudRate->setVisible(true);
     } else {
       generalSettings.internalModuleBaudrate = 0;
+      internalModuleBaudRateLabel->setVisible(false);
       internalModuleBaudRate->setVisible(false);
     }
 
+    if (m_internalModule == MODULE_TYPE_XJT_PXX1 && HAS_EXTERNAL_ANTENNA(board)) {
+        antennaLabel->setVisible(true);
+        antennaMode->setVisible(true);
+    }
+    else {
+      antennaLabel->setVisible(false);
+      antennaMode->setVisible(false);
+    }
+
     emit internalModuleChanged();
   }
 }
 
-void HardwarePanel::addStick(int index, int & row)
+void HardwarePanel::addStick(int index)
 {
-  int col = 0;
-  addLabel(Boards::getAnalogInputName(board, index), row, col++);
+  addLabel(Boards::getAnalogInputName(board, index));
 
   AutoLineEdit *name = new AutoLineEdit(this);
   name->setField(generalSettings.stickName[index], HARDWARE_NAME_LEN, this);
-
-  addParams(row, name);
+  params->append(name);
+  addParams();
 }
 
-void HardwarePanel::addPot(int index, int & row)
+void HardwarePanel::addPot(int index)
 {
-  addLabel(Boards::getAnalogInputName(board, Boards::getCapability(board, Board::Sticks) + index), row, 0);
+  addLabel(Boards::getAnalogInputName(board, Boards::getCapability(board, Board::Sticks) + index));
 
   AutoLineEdit *name = new AutoLineEdit(this);
   name->setField(generalSettings.potName[index], HARDWARE_NAME_LEN, this);
+  params->append(name);
 
   AutoComboBox *type = new AutoComboBox(this);
   type->setModel(editorItemModels->getItemModel(AIM_BOARDS_POT_TYPE));
   type->setField(generalSettings.potConfig[index], this);
+  params->append(type);
 
-  addParams(row, name, type);
+  addParams();
 }
 
-void HardwarePanel::addSlider(int index, int & row)
+void HardwarePanel::addSlider(int index)
 {
   addLabel(Boards::getAnalogInputName(board, Boards::getCapability(board, Board::Sticks) +
-                                             Boards::getCapability(board, Board::Pots) + index), row, 0);
+                                             Boards::getCapability(board, Board::Pots) + index));
 
   AutoLineEdit *name = new AutoLineEdit(this);
   name->setField(generalSettings.sliderName[index], HARDWARE_NAME_LEN, this);
+  params->append(name);
 
   AutoComboBox *type = new AutoComboBox(this);
   type->setModel(editorItemModels->getItemModel(AIM_BOARDS_SLIDER_TYPE));
   type->setField(generalSettings.sliderConfig[index], this);
+  params->append(type);
 
-  addParams(row, name, type);
+  addParams();
 }
 
-void HardwarePanel::addSwitch(int index, int & row)
+void HardwarePanel::addSwitch(int index)
 {
-  addLabel(Boards::getSwitchInfo(board, index).name, row, 0);
+  addLabel(Boards::getSwitchInfo(board, index).name);
 
   AutoLineEdit *name = new AutoLineEdit(this);
   name->setField(generalSettings.switchName[index], HARDWARE_NAME_LEN, this);
+  params->append(name);
 
   AutoComboBox *type = new AutoComboBox(this);
   Board::SwitchInfo switchInfo = Boards::getSwitchInfo(board, index);
   type->setModel(switchInfo.config < Board::SWITCH_3POS ? tabFilteredModels->getItemModel(FIM_SWITCHTYPE2POS) :
                                                           tabFilteredModels->getItemModel(FIM_SWITCHTYPE3POS));
   type->setField(generalSettings.switchConfig[index], this);
+  params->append(type);
 
-  addParams(row, name, type);
+  addParams();
 }
 
-void HardwarePanel::addLabel(QString text, int row, int col)
+void HardwarePanel::addLabel(QString text)
 {
   QLabel *label = new QLabel(this);
   label->setText(text);
-  grid->addWidget(label, row, col);
+  grid->addWidget(label, row, 0);
 }
 
-void HardwarePanel::addLine(int & row)
+void HardwarePanel::addLine()
 {
   QFrame *line = new QFrame(this);
   line->setFrameShape(QFrame::HLine);
   line->setFrameShadow(QFrame::Sunken);
   line->setLineWidth(1);
   line->setMidLineWidth(0);
-  grid->addWidget(line, row, 0, 1, grid->columnCount());
-  row++;
+  grid->addWidget(line, row++, 0, 1, grid->columnCount());
 }
 
-void HardwarePanel::addParams(int & row, QWidget * widget1, QWidget * widget2)
+void HardwarePanel::addParams()
 {
+  int col = 0;
   QGridLayout *subgrid = new QGridLayout();
-  subgrid->addWidget(widget1, 0, 0);
-  if (widget2)
-    subgrid->addWidget(widget2, 0, 1);
-  else
-    addHSpring(subgrid, 1, 0);
-  addHSpring(subgrid, 2, 0);
-  grid->addLayout(subgrid, row, 1);
-  row++;
+
+  for (int i = 0; i < params->size(); i++) {
+    subgrid->addWidget(params->at(i), 0, col++);
+  }
+
+  addHSpring(subgrid, col, 0);
+  grid->addLayout(subgrid, row++, 1);
+  params->clear();
 }
 
-void HardwarePanel::addSection(QString text, int & row)
+void HardwarePanel::addSection(QString text)
 {
-  addLabel(QString("<b>%1</b>").arg(text), row, 0);
+  addLabel(QString("<b>%1</b>").arg(text));
   row++;
 }
 
diff --git a/companion/src/generaledit/hardware.h b/companion/src/generaledit/hardware.h
index 0e5eda8c6b9..5493a831cdd 100644
--- a/companion/src/generaledit/hardware.h
+++ b/companion/src/generaledit/hardware.h
@@ -48,17 +48,22 @@ class HardwarePanel : public GeneralPanel
     QGridLayout *grid;
     AutoComboBox *internalModule;
     unsigned int m_internalModule = 0;
+    QLabel *internalModuleBaudRateLabel;
     AutoComboBox *internalModuleBaudRate;
     AutoComboBox *serialPortUSBVCP;
+    QLabel *antennaLabel;
+    AutoComboBox *antennaMode;
+    QList<QWidget *> *params;
+    int row;
 
-    void addStick(int index, int & row);
-    void addPot(int index, int & row);
-    void addSlider(int index, int & row);
-    void addSwitch(int index, int & row);
-    void addLabel(QString text, int row, int col);
-    void addLine(int & row);
-    void addParams(int & row, QWidget * widget1, QWidget * widget2 = nullptr);
-    void addSection(QString text, int & row);
+    void addStick(int index);
+    void addPot(int index);
+    void addSlider(int index);
+    void addSwitch(int index);
+    void addLabel(QString text);
+    void addLine();
+    void addParams();
+    void addSection(QString text);
 
     void updateSerialPortUSBVCP();
 };
diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index 27fdaf1554e..05f5bbfe9f4 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -35,6 +35,7 @@
 constexpr char FIM_TIMERSWITCH[] {"Timer Switch"};
 constexpr char FIM_THRSOURCE[]   {"Throttle Source"};
 constexpr char FIM_TRAINERMODE[] {"Trainer Mode"};
+constexpr char FIM_ANTENNAMODE[] {"Antenna Mode"};
 
 TimerPanel::TimerPanel(QWidget * parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, Firmware * firmware,
                        QWidget * prevFocus, FilteredItemModelFactory * panelFilteredModels, CompoundItemModelFactory * panelItemModels):
@@ -258,27 +259,34 @@ ModulePanel::ModulePanel(QWidget * parent, ModelData & model, ModuleData & modul
     ui->trainerMode->hide();
   }
 
-  if (panelFilteredItemModels && moduleIdx >= 0) {
-    int id = panelFilteredItemModels->registerItemModel(new FilteredItemModel(ModuleData::protocolItemModel(generalSettings), moduleIdx + 1/*flag cannot be 0*/), QString("Module Protocol %1").arg(moduleIdx));
-    ui->protocol->setModel(panelFilteredItemModels->getItemModel(id));
+  if (panelFilteredItemModels) {
+    if (moduleIdx >= 0) {
+      int id = panelFilteredItemModels->registerItemModel(new FilteredItemModel(ModuleData::protocolItemModel(generalSettings), moduleIdx + 1/*flag cannot be 0*/), QString("Module Protocol %1").arg(moduleIdx));
+      ui->protocol->setModel(panelFilteredItemModels->getItemModel(id));
 
-    if (ui->protocol->findData(module.protocol) < 0) {
-      QString msg = tr("Warning: The internal module protocol <b>%1</b> is incompatible with the hardware internal module <b>%2</b> and has been set to <b>OFF</b>!");
-      msg = msg.arg(module.protocolToString(module.protocol)).arg(ModuleData::typeToString(generalSettings.internalModule));
+      if (ui->protocol->findData(module.protocol) < 0) {
+        QString msg = tr("Warning: The internal module protocol <b>%1</b> is incompatible with the hardware internal module <b>%2</b> and has been set to <b>OFF</b>!");
+        msg = msg.arg(module.protocolToString(module.protocol)).arg(ModuleData::typeToString(generalSettings.internalModule));
 
-      QMessageBox *msgBox = new QMessageBox(this);
-      msgBox->setIcon( QMessageBox::Warning );
-      msgBox->setText(msg);
-      msgBox->addButton( "Ok", QMessageBox::AcceptRole );
-      msgBox->setWindowFlag(Qt::WindowStaysOnTopHint);
-      msgBox->setAttribute(Qt::WA_DeleteOnClose); // delete pointer after close
-      msgBox->setModal(false);
-      msgBox->show();
+        QMessageBox *msgBox = new QMessageBox(this);
+        msgBox->setIcon( QMessageBox::Warning );
+        msgBox->setText(msg);
+        msgBox->addButton( "Ok", QMessageBox::AcceptRole );
+        msgBox->setWindowFlag(Qt::WindowStaysOnTopHint);
+        msgBox->setAttribute(Qt::WA_DeleteOnClose); // delete pointer after close
+        msgBox->setModal(false);
+        msgBox->show();
 
-      module.clear();
+        module.clear();
+      }
+
+      ui->protocol->setField(module.protocol, this);
     }
 
-    ui->protocol->setField(module.protocol, this);
+    if (moduleIdx == 0) {
+      int id = panelFilteredItemModels->registerItemModel(new FilteredItemModel(GeneralSettings::antennaModeItemModel(true)), FIM_ANTENNAMODE);
+      ui->antennaMode->setModel(panelFilteredItemModels->getItemModel(id));
+    }
   }
 
   for (int i = 0; i <= MODULE_SUBTYPE_MULTI_LAST; i++) {
@@ -452,7 +460,10 @@ void ModulePanel::update()
         else if (protocol==PULSES_ACCESS_ISRM || protocol==PULSES_ACCESS_R9M ||
                  protocol==PULSES_ACCESS_R9M_LITE || protocol==PULSES_ACCESS_R9M_LITE_PRO)
           mask |= MASK_RX_NUMBER | MASK_ACCESS;
-        if (moduleIdx == 0 && HAS_EXTERNAL_ANTENNA(board) && generalSettings.antennaMode == GeneralSettings::ANTENNA_MODE_PER_MODEL)
+        if (moduleIdx == 0 &&
+            (protocol==PULSES_PXX_XJT_X16 ||
+             protocol==PULSES_PXX_XJT_D8 || protocol==PULSES_PXX_XJT_LR12) &&
+            HAS_EXTERNAL_ANTENNA(board) && generalSettings.antennaMode == GeneralSettings::ANTENNA_MODE_PER_MODEL)
           mask |= MASK_ANTENNA;
         if (protocol == PULSES_ACCESS_ISRM && module.channelsCount == 8)
           mask |= MASK_RF_RACING_MODE;
@@ -565,15 +576,12 @@ void ModulePanel::update()
   ui->ppmFrameLength->setMaximum(firmware->getCapability(PPMFrameLength));
   ui->ppmFrameLength->setValue(22.5 + ((double)module.ppm.frameLength) * 0.5);
 
-  // Antenna mode on Horus and XLite
   if (mask & MASK_ANTENNA) {
+    if (module.pxx.antennaMode == GeneralSettings::ANTENNA_MODE_PER_MODEL)
+      module.pxx.antennaMode = GeneralSettings::ANTENNA_MODE_INTERNAL;
+    ui->antennaMode->setField(module.pxx.antennaMode, this);
     ui->antennaLabel->show();
     ui->antennaMode->show();
-    ui->antennaMode->clear();
-    ui->antennaMode->addItem(tr("Ask"), -1);
-    ui->antennaMode->addItem(tr("Internal"), 0);
-    ui->antennaMode->addItem(IS_HORUS_X12S(board) ? tr("Internal + External") : tr("External"), 1);
-    ui->antennaMode->setField(module.pxx.antennaMode, this);
   }
   else {
     ui->antennaLabel->hide();