diff --git a/companion/src/generaledit/CMakeLists.txt b/companion/src/generaledit/CMakeLists.txt
index 81415e5bd..471705b4a 100644
--- a/companion/src/generaledit/CMakeLists.txt
+++ b/companion/src/generaledit/CMakeLists.txt
@@ -4,13 +4,15 @@ set(generaledit_NAMES
   generaledit
   generalsetup
   trainer
-  calibration
+  hardware
 )
 
 set(generaledit_SRCS
+  calibration.cpp
 )
 
 set(generaledit_HDRS
+  calibration.h
 )
 
 set(generaledit_UIS
diff --git a/companion/src/generaledit/calibration.cpp b/companion/src/generaledit/calibration.cpp
index 1cc155b21..85366b633 100644
--- a/companion/src/generaledit/calibration.cpp
+++ b/companion/src/generaledit/calibration.cpp
@@ -1,429 +1,90 @@
+#include <QVBoxLayout>
+#include <QHeaderView>
+#include <QSpinBox>
 #include "calibration.h"
-#include "ui_calibration.h"
 
-void CalibrationPanel::setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type, bool threePos = true)
-{
-  bool enabled = false;
-
-  if (IS_TARANIS(firmware->getBoard())) {
-    if (IS_TARANIS_X9E(firmware->getBoard())) {
-      enabled = true;
-      type->addItem(tr("None"), GeneralSettings::SWITCH_NONE);
-    }
-    else if (index < 8) {
-      enabled = true;
-    }
-  }
-
-  if (enabled) {
-    type->addItem(tr("2 Positions Toggle"), GeneralSettings::SWITCH_TOGGLE);
-    type->addItem(tr("2 Positions"), GeneralSettings::SWITCH_2POS);
-    if (threePos) type->addItem(tr("3 Positions"), GeneralSettings::SWITCH_3POS);
-    name->setField(generalSettings.switchName[index], 3, this);
-    type->setField(generalSettings.switchConfig[index], this);
-  }
-  else {
-    label->hide();
-    name->hide();
-    type->hide();
-  }
-}
-
-void CalibrationPanel::setupPotConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
-{
-  bool enabled = false;
-
-  if (IS_TARANIS_X9E(firmware->getBoard()) && index < 4) {
-    label->setText(RawSource(SOURCE_TYPE_STICK, index+NUM_STICKS).toString());
-    enabled = true;
-  }
-  else if (IS_TARANIS_PLUS(firmware->getBoard()) && index < 3) {
-    enabled = true;
-  }
-  else if (IS_TARANIS(firmware->getBoard()) && index < 2) {
-    enabled = true;
-  }
-
-  if (enabled) {
-    type->addItem(tr("None"), GeneralSettings::POT_NONE);
-    type->addItem(tr("Pot with detent"), GeneralSettings::POT_WITH_DETENT);
-    type->addItem(tr("Multipos switch"), GeneralSettings::POT_MULTIPOS_SWITCH);
-    type->addItem(tr("Pot without detent"), GeneralSettings::POT_WITHOUT_DETENT);
-    name->setField(generalSettings.potName[index], 3, this);
-    type->setField(generalSettings.potConfig[index], this);
-  }
-  else {
-    label->hide();
-    name->hide();
-    type->hide();
-  }
-}
-
-void CalibrationPanel::setupSliderConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
-{
-  bool enabled = false;
-
-  if (IS_TARANIS(firmware->getBoard()) && index < 2) {
-    type->setEnabled(false);
-    enabled = true;
-  }
-  else if (IS_TARANIS_X9E(firmware->getBoard()) && index < 4) {
-    enabled = true;
-  }
-
-  if (IS_TARANIS_X9E(firmware->getBoard())) {
-    label->setText(RawSource(SOURCE_TYPE_STICK, index+NUM_STICKS+4).toString());
-  }
-
-  if (enabled) {
-    type->addItem(tr("None"), GeneralSettings::SLIDER_NONE);
-    type->addItem(tr("Slider with detent"), GeneralSettings::SLIDER_WITH_DETENT);
-    name->setField(generalSettings.sliderName[index], 3, this);
-    type->setField(generalSettings.sliderConfig[index], this);
-  }
-  else {
-    label->hide();
-    name->hide();
-    type->hide();
-  }
-}
 
 CalibrationPanel::CalibrationPanel(QWidget * parent, GeneralSettings & generalSettings, Firmware * firmware):
-  GeneralPanel(parent, generalSettings, firmware),
-  ui(new Ui::Calibration)
+  GeneralPanel(parent, generalSettings, firmware)
 {
-  ui->setupUi(this);
 
-  if (!firmware->getCapability(MultiposPots)) {
-    ui->potsTypeSeparator->hide();
+  tableWidget = new QTableWidget();
+  QVBoxLayout * layout = new QVBoxLayout();
+  layout->addWidget(tableWidget);
+  layout->setContentsMargins(0, 0, 0, 0);
+  this->setLayout(layout);
+
+  tableWidget->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+  tableWidget->setColumnCount(3);
+  tableWidget->setShowGrid(false);
+  tableWidget->setSelectionMode(QAbstractItemView::NoSelection);
+  tableWidget->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
+  tableWidget->setStyleSheet("QTableWidget {background-color: transparent;}");
+  QStringList headerLabels;
+  headerLabels << QObject::tr("Negative span") << QObject::tr("Mid value") << QObject::tr("Positive span"); 
+  tableWidget->setHorizontalHeaderLabels(headerLabels);
+
+  int rows = NUM_STICKS + GetCurrentFirmware()->getCapability(Pots) + GetCurrentFirmware()->getCapability(Sliders);
+  tableWidget->setRowCount(rows);
+
+  for(int i = 0; i < rows; ++i) {
+
+    QTableWidgetItem *newItem = new QTableWidgetItem(AnalogString(i));
+    newItem->setTextAlignment(Qt::AlignLeft);
+    tableWidget->setVerticalHeaderItem(i, newItem);
+
+    for(int j = 0; j < 3; ++j) {
+      QSpinBox * newItem = new QSpinBox();
+      newItem->setMinimum(-9999);
+      newItem->setMaximum(9999);
+      newItem->setSingleStep(1);
+      newItem->setValue(getCalibrationValue(i, j));
+      newItem->setProperty("row", i);
+      newItem->setProperty("column", j);
+      tableWidget->setCellWidget(i, j, newItem);
+      connect(newItem, SIGNAL(valueChanged(int)), this, SLOT(onCellChanged(int)));
+    }
   }
-
-  if (IS_TARANIS(firmware->getBoard())) {
-    ui->rudName->setField(generalSettings.stickName[0], 3, this);
-    ui->eleName->setField(generalSettings.stickName[1], 3, this);
-    ui->thrName->setField(generalSettings.stickName[2], 3, this);
-    ui->ailName->setField(generalSettings.stickName[3], 3, this);
-  }
-  else {
-    ui->rudLabel->hide();
-    ui->rudName->hide();
-    ui->eleLabel->hide();
-    ui->eleName->hide();
-    ui->thrLabel->hide();
-    ui->thrName->hide();
-    ui->ailLabel->hide();
-    ui->ailName->hide();
-  }
-
-  setupPotConfig(0, ui->pot1Label, ui->pot1Name, ui->pot1Type);
-  setupPotConfig(1, ui->pot2Label, ui->pot2Name, ui->pot2Type);
-  setupPotConfig(2, ui->pot3Label, ui->pot3Name, ui->pot3Type);
-  setupPotConfig(3, ui->pot4Label, ui->pot4Name, ui->pot4Type);
-
-  setupSliderConfig(0, ui->lsLabel, ui->lsName, ui->lsType);
-  setupSliderConfig(1, ui->rsLabel, ui->rsName, ui->rsType);
-  setupSliderConfig(2, ui->ls2Label, ui->ls2Name, ui->ls2Type);
-  setupSliderConfig(3, ui->rs2Label, ui->rs2Name, ui->rs2Type);
-
-  setupSwitchConfig(0, ui->saLabel, ui->saName, ui->saType);
-  setupSwitchConfig(1, ui->sbLabel, ui->sbName, ui->sbType);
-  setupSwitchConfig(2, ui->scLabel, ui->scName, ui->scType);
-  setupSwitchConfig(3, ui->sdLabel, ui->sdName, ui->sdType);
-  setupSwitchConfig(4, ui->seLabel, ui->seName, ui->seType);
-  setupSwitchConfig(5, ui->sfLabel, ui->sfName, ui->sfType, false);   //switch does not support 3POS
-  setupSwitchConfig(6, ui->sgLabel, ui->sgName, ui->sgType);
-  setupSwitchConfig(7, ui->shLabel, ui->shName, ui->shType, false);   //switch does not support 3POS
-  setupSwitchConfig(8, ui->siLabel, ui->siName, ui->siType);
-  setupSwitchConfig(9, ui->sjLabel, ui->sjName, ui->sjType);
-  setupSwitchConfig(10, ui->skLabel, ui->skName, ui->skType);
-  setupSwitchConfig(11, ui->slLabel, ui->slName, ui->slType);
-  setupSwitchConfig(12, ui->smLabel, ui->smName, ui->smType);
-  setupSwitchConfig(13, ui->snLabel, ui->snName, ui->snType);
-  setupSwitchConfig(14, ui->soLabel, ui->soName, ui->soType);
-  setupSwitchConfig(15, ui->spLabel, ui->spName, ui->spType);
-  setupSwitchConfig(16, ui->sqLabel, ui->sqName, ui->sqType);
-  setupSwitchConfig(17, ui->srLabel, ui->srName, ui->srType);
-
-  int potsCount = GetCurrentFirmware()->getCapability(Pots);
-  if (potsCount == 3) {
-    ui->ana8Neg->hide();
-    ui->ana8Mid->hide();
-    ui->ana8Pos->hide();
-  }
-
-  if (IS_TARANIS(firmware->getBoard())) {
-    ui->serialPortMode->setCurrentIndex(generalSettings.hw_uartMode);
-  }
-  else {
-    ui->serialPortMode->hide();
-    ui->serialPortLabel->hide();
-  }
-
-  if (!IS_SKY9X(firmware->getBoard())) {
-    ui->txCurrentCalibration->hide();
-    ui->txCurrentCalibrationLabel->hide();
-  }
-
-  if (IS_TARANIS_X9E(firmware->getBoard())) {
-    ui->bluetoothEnable->setChecked(generalSettings.bluetoothEnable);
-    ui->bluetoothName->setField(generalSettings.bluetoothName, 10, this);
-  }
-  else {
-    ui->bluetoothLabel->hide();
-    ui->bluetoothEnable->hide();
-    ui->bluetoothName->hide();
-  }
-
   disableMouseScrolling();
-
-  setValues();
 }
 
-CalibrationPanel::~CalibrationPanel()
+void CalibrationPanel::onCellChanged(int value)
 {
-  delete ui;
-}
+  QSpinBox * sb = qobject_cast<QSpinBox*>(sender());
+  int row = sb->property("row").toInt();
+  int column = sb->property("column").toInt();
 
-/*void CalibrationPanel::update()
+  if (value != getCalibrationValue(row, column)) {
+    setCalibrationValue(row,column, value);
+    qDebug() << "CalibrationPanel::onCellChanged" << row << column << "to" << value;
+    emit modified();
+  }
+}
+    
+int CalibrationPanel::getCalibrationValue(int row, int column)
 {
+  switch(column) {
+    case 0:
+      return generalSettings.calibSpanNeg[row];
+    case 1:
+      return generalSettings.calibMid[row];
+    case 2:
+      return generalSettings.calibSpanPos[row];
+  }
+  return 0;
 }
-*/
-void CalibrationPanel::on_PPM_MultiplierDSB_editingFinished()
+
+void CalibrationPanel::setCalibrationValue(int row, int column, int value)
 {
-  generalSettings.PPM_Multiplier = (int)(ui->PPM_MultiplierDSB->value()*10)-10;
-  emit modified();
-}
-
-void CalibrationPanel::on_PPM1_editingFinished()
-{
-  generalSettings.trainer.calib[0] = ui->PPM1->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_PPM2_editingFinished()
-{
-  generalSettings.trainer.calib[1] = ui->PPM2->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_PPM3_editingFinished()
-{
-  generalSettings.trainer.calib[2] = ui->PPM3->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_PPM4_editingFinished()
-{
-  generalSettings.trainer.calib[3] = ui->PPM4->value();
-  emit modified();
-}
-
-
-void CalibrationPanel::on_txCurrentCalibration_editingFinished()
-{
-  generalSettings.txCurrentCalibration = ui->txCurrentCalibration->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_bluetoothEnable_stateChanged(int)
-{
-  generalSettings.bluetoothEnable = ui->bluetoothEnable->isChecked();
-  emit modified();
-}
-
-void CalibrationPanel::setValues()
-{
-  ui->txVoltageCalibration->setValue((double)generalSettings.txVoltageCalibration/10);
-  ui->txCurrentCalibration->setValue((double)generalSettings.txCurrentCalibration);
-
-  ui->ana1Neg->setValue(generalSettings.calibSpanNeg[0]);
-  ui->ana2Neg->setValue(generalSettings.calibSpanNeg[1]);
-  ui->ana3Neg->setValue(generalSettings.calibSpanNeg[2]);
-  ui->ana4Neg->setValue(generalSettings.calibSpanNeg[3]);
-  ui->ana5Neg->setValue(generalSettings.calibSpanNeg[4]);
-  ui->ana6Neg->setValue(generalSettings.calibSpanNeg[5]);
-  ui->ana7Neg->setValue(generalSettings.calibSpanNeg[6]);
-  ui->ana8Neg->setValue(generalSettings.calibSpanNeg[7]);
-
-  ui->ana1Mid->setValue(generalSettings.calibMid[0]);
-  ui->ana2Mid->setValue(generalSettings.calibMid[1]);
-  ui->ana3Mid->setValue(generalSettings.calibMid[2]);
-  ui->ana4Mid->setValue(generalSettings.calibMid[3]);
-  ui->ana5Mid->setValue(generalSettings.calibMid[4]);
-  ui->ana6Mid->setValue(generalSettings.calibMid[5]);
-  ui->ana7Mid->setValue(generalSettings.calibMid[6]);
-  ui->ana8Mid->setValue(generalSettings.calibMid[7]);
-
-  ui->ana1Pos->setValue(generalSettings.calibSpanPos[0]);
-  ui->ana2Pos->setValue(generalSettings.calibSpanPos[1]);
-  ui->ana3Pos->setValue(generalSettings.calibSpanPos[2]);
-  ui->ana4Pos->setValue(generalSettings.calibSpanPos[3]);
-  ui->ana5Pos->setValue(generalSettings.calibSpanPos[4]);
-  ui->ana6Pos->setValue(generalSettings.calibSpanPos[5]);
-  ui->ana7Pos->setValue(generalSettings.calibSpanPos[6]);
-  ui->ana8Pos->setValue(generalSettings.calibSpanPos[7]);
-
-  ui->PPM1->setValue(generalSettings.trainer.calib[0]);
-  ui->PPM2->setValue(generalSettings.trainer.calib[1]);
-  ui->PPM3->setValue(generalSettings.trainer.calib[2]);
-  ui->PPM4->setValue(generalSettings.trainer.calib[3]);
-  ui->PPM_MultiplierDSB->setValue((qreal)(generalSettings.PPM_Multiplier+10)/10);
-}
-
-void CalibrationPanel::on_txVoltageCalibration_editingFinished()
-{
-  generalSettings.txVoltageCalibration = ui->txVoltageCalibration->value()*10;
-  emit modified();
-}
-
-
-void CalibrationPanel::on_ana1Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[0] = ui->ana1Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana2Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[1] = ui->ana2Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana3Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[2] = ui->ana3Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana4Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[3] = ui->ana4Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana5Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[4] = ui->ana5Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana6Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[5] = ui->ana6Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana7Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[6] = ui->ana7Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana8Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[7] = ui->ana8Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana1Mid_editingFinished()
-{
-  generalSettings.calibMid[0] = ui->ana1Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana2Mid_editingFinished()
-{
-  generalSettings.calibMid[1] = ui->ana2Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana3Mid_editingFinished()
-{
-  generalSettings.calibMid[2] = ui->ana3Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana4Mid_editingFinished()
-{
-  generalSettings.calibMid[3] = ui->ana4Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana5Mid_editingFinished()
-{
-  generalSettings.calibMid[4] = ui->ana5Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana6Mid_editingFinished()
-{
-  generalSettings.calibMid[5] = ui->ana6Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana7Mid_editingFinished()
-{
-  generalSettings.calibMid[6] = ui->ana7Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana8Mid_editingFinished()
-{
-  generalSettings.calibMid[7] = ui->ana8Mid->value();
-  emit modified();
-}
-
-
-void CalibrationPanel::on_ana1Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[0] = ui->ana1Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana2Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[1] = ui->ana2Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana3Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[2] = ui->ana3Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana4Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[3] = ui->ana4Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana5Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[4] = ui->ana5Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana6Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[5] = ui->ana6Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana7Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[6] = ui->ana7Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana8Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[7] = ui->ana8Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_serialPortMode_currentIndexChanged(int index)
-{
-  generalSettings.hw_uartMode = index;
-  emit modified();
+  switch(column) {
+    case 0:
+      generalSettings.calibSpanNeg[row] = value;
+      break;
+    case 1:
+      generalSettings.calibMid[row] = value;
+      break;
+    case 2:
+      generalSettings.calibSpanPos[row] = value;
+      break;
+  }
 }
diff --git a/companion/src/generaledit/calibration.h b/companion/src/generaledit/calibration.h
index 731423472..c7ef92d9a 100644
--- a/companion/src/generaledit/calibration.h
+++ b/companion/src/generaledit/calibration.h
@@ -1,6 +1,7 @@
 #ifndef CALIBRATION_H
 #define CALIBRATION_H
 
+#include <QTableWidget>
 #include "generaledit.h"
 
 namespace Ui {
@@ -17,58 +18,16 @@ class CalibrationPanel : public GeneralPanel
 
   public:
     CalibrationPanel(QWidget *parent, GeneralSettings & generalSettings, Firmware * firmware);
-    virtual ~CalibrationPanel();
-    // virtual void update();
+    virtual ~CalibrationPanel() {};
 
   private slots:
-    void on_txVoltageCalibration_editingFinished();
-    void on_PPM1_editingFinished();
-    void on_PPM2_editingFinished();
-    void on_PPM3_editingFinished();
-    void on_PPM4_editingFinished();
-    void on_PPM_MultiplierDSB_editingFinished();
-
-    void on_txCurrentCalibration_editingFinished();
-    void on_bluetoothEnable_stateChanged(int);
-
-    void on_ana1Neg_editingFinished();
-    void on_ana2Neg_editingFinished();
-    void on_ana3Neg_editingFinished();
-    void on_ana4Neg_editingFinished();
-    void on_ana5Neg_editingFinished();
-    void on_ana6Neg_editingFinished();
-    void on_ana7Neg_editingFinished();
-    void on_ana8Neg_editingFinished();
-
-    void on_ana1Mid_editingFinished();
-    void on_ana2Mid_editingFinished();
-    void on_ana3Mid_editingFinished();
-    void on_ana4Mid_editingFinished();
-    void on_ana5Mid_editingFinished();
-    void on_ana6Mid_editingFinished();
-    void on_ana7Mid_editingFinished();
-    void on_ana8Mid_editingFinished();
-
-    void on_ana1Pos_editingFinished();
-    void on_ana2Pos_editingFinished();
-    void on_ana3Pos_editingFinished();
-    void on_ana4Pos_editingFinished();
-    void on_ana5Pos_editingFinished();
-    void on_ana6Pos_editingFinished();
-    void on_ana7Pos_editingFinished();
-    void on_ana8Pos_editingFinished();
-
-    void on_serialPortMode_currentIndexChanged(int index);
-
-  protected:
-    void setupPotConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
-    void setupSliderConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
-    void setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type, bool threePos);
+    void onCellChanged(int value);
 
   private:
-    Ui::Calibration *ui;
+    QTableWidget * tableWidget;
 
-    void setValues();
+    int getCalibrationValue(int row, int column);
+    void setCalibrationValue(int row, int column, int value);
 };
 
 #endif // CALIBRATION_H
diff --git a/companion/src/generaledit/generaledit.cpp b/companion/src/generaledit/generaledit.cpp
index 127d87cf7..271693d14 100644
--- a/companion/src/generaledit/generaledit.cpp
+++ b/companion/src/generaledit/generaledit.cpp
@@ -8,6 +8,7 @@
 #include "generalsetup.h"
 #include "trainer.h"
 #include "calibration.h"
+#include "hardware.h"
 #include "../modeledit/customfunctions.h"
 #include "verticalscrollarea.h"
 
@@ -42,7 +43,8 @@ GeneralEdit::GeneralEdit(QWidget * parent, RadioData & radioData, Firmware * fir
     addTab(new CustomFunctionsPanel(this, NULL, generalSettings, firmware), tr("Global Functions"));
   }
   addTab(new TrainerPanel(this, generalSettings, firmware), tr("Trainer"));
-  addTab(new CalibrationPanel(this, generalSettings, firmware), tr("Hardware / Calibration"));
+  addTab(new HardwarePanel(this, generalSettings, firmware), tr("Hardware"));
+  addTab(new CalibrationPanel(this, generalSettings, firmware), tr("Calibration"));
 
   ui->tabWidget->setCurrentIndex( g.generalEditTab() );
 }
diff --git a/companion/src/generaledit/hardware.cpp b/companion/src/generaledit/hardware.cpp
new file mode 100644
index 000000000..8ddb32a51
--- /dev/null
+++ b/companion/src/generaledit/hardware.cpp
@@ -0,0 +1,241 @@
+#include "hardware.h"
+#include "ui_hardware.h"
+
+void HardwarePanel::setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type, bool threePos = true)
+{
+  bool enabled = false;
+
+  if (IS_TARANIS(firmware->getBoard())) {
+    if (IS_TARANIS_X9E(firmware->getBoard())) {
+      enabled = true;
+      type->addItem(tr("None"), GeneralSettings::SWITCH_NONE);
+    }
+    else if (index < 8) {
+      enabled = true;
+    }
+  }
+
+  if (enabled) {
+    type->addItem(tr("2 Positions Toggle"), GeneralSettings::SWITCH_TOGGLE);
+    type->addItem(tr("2 Positions"), GeneralSettings::SWITCH_2POS);
+    if (threePos) type->addItem(tr("3 Positions"), GeneralSettings::SWITCH_3POS);
+    name->setField(generalSettings.switchName[index], 3, this);
+    type->setField(generalSettings.switchConfig[index], this);
+  }
+  else {
+    label->hide();
+    name->hide();
+    type->hide();
+  }
+}
+
+void HardwarePanel::setupPotConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
+{
+  bool enabled = false;
+
+  if (IS_TARANIS_X9E(firmware->getBoard()) && index < 4) {
+    label->setText(RawSource(SOURCE_TYPE_STICK, index+NUM_STICKS).toString());
+    enabled = true;
+  }
+  else if (IS_TARANIS_PLUS(firmware->getBoard()) && index < 3) {
+    enabled = true;
+  }
+  else if (IS_TARANIS(firmware->getBoard()) && index < 2) {
+    enabled = true;
+  }
+
+  if (enabled) {
+    type->addItem(tr("None"), GeneralSettings::POT_NONE);
+    type->addItem(tr("Pot with detent"), GeneralSettings::POT_WITH_DETENT);
+    type->addItem(tr("Multipos switch"), GeneralSettings::POT_MULTIPOS_SWITCH);
+    type->addItem(tr("Pot without detent"), GeneralSettings::POT_WITHOUT_DETENT);
+    name->setField(generalSettings.potName[index], 3, this);
+    type->setField(generalSettings.potConfig[index], this);
+  }
+  else {
+    label->hide();
+    name->hide();
+    type->hide();
+  }
+}
+
+void HardwarePanel::setupSliderConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
+{
+  bool enabled = false;
+
+  if (IS_TARANIS(firmware->getBoard()) && index < 2) {
+    type->setEnabled(false);
+    enabled = true;
+  }
+  else if (IS_TARANIS_X9E(firmware->getBoard()) && index < 4) {
+    enabled = true;
+  }
+
+  if (IS_TARANIS_X9E(firmware->getBoard())) {
+    label->setText(RawSource(SOURCE_TYPE_STICK, index+NUM_STICKS+4).toString());
+  }
+
+  if (enabled) {
+    type->addItem(tr("None"), GeneralSettings::SLIDER_NONE);
+    type->addItem(tr("Slider with detent"), GeneralSettings::SLIDER_WITH_DETENT);
+    name->setField(generalSettings.sliderName[index], 3, this);
+    type->setField(generalSettings.sliderConfig[index], this);
+  }
+  else {
+    label->hide();
+    name->hide();
+    type->hide();
+  }
+}
+
+HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings, Firmware * firmware):
+  GeneralPanel(parent, generalSettings, firmware),
+  ui(new Ui::Hardware)
+{
+  ui->setupUi(this);
+
+  if (IS_TARANIS(firmware->getBoard())) {
+    ui->rudName->setField(generalSettings.stickName[0], 3, this);
+    ui->eleName->setField(generalSettings.stickName[1], 3, this);
+    ui->thrName->setField(generalSettings.stickName[2], 3, this);
+    ui->ailName->setField(generalSettings.stickName[3], 3, this);
+  }
+  else {
+    ui->rudLabel->hide();
+    ui->rudName->hide();
+    ui->eleLabel->hide();
+    ui->eleName->hide();
+    ui->thrLabel->hide();
+    ui->thrName->hide();
+    ui->ailLabel->hide();
+    ui->ailName->hide();
+  }
+
+  setupPotConfig(0, ui->pot1Label, ui->pot1Name, ui->pot1Type);
+  setupPotConfig(1, ui->pot2Label, ui->pot2Name, ui->pot2Type);
+  setupPotConfig(2, ui->pot3Label, ui->pot3Name, ui->pot3Type);
+  setupPotConfig(3, ui->pot4Label, ui->pot4Name, ui->pot4Type);
+
+  setupSliderConfig(0, ui->lsLabel, ui->lsName, ui->lsType);
+  setupSliderConfig(1, ui->rsLabel, ui->rsName, ui->rsType);
+  setupSliderConfig(2, ui->ls2Label, ui->ls2Name, ui->ls2Type);
+  setupSliderConfig(3, ui->rs2Label, ui->rs2Name, ui->rs2Type);
+
+  setupSwitchConfig(0, ui->saLabel, ui->saName, ui->saType);
+  setupSwitchConfig(1, ui->sbLabel, ui->sbName, ui->sbType);
+  setupSwitchConfig(2, ui->scLabel, ui->scName, ui->scType);
+  setupSwitchConfig(3, ui->sdLabel, ui->sdName, ui->sdType);
+  setupSwitchConfig(4, ui->seLabel, ui->seName, ui->seType);
+  setupSwitchConfig(5, ui->sfLabel, ui->sfName, ui->sfType, false);   //switch does not support 3POS
+  setupSwitchConfig(6, ui->sgLabel, ui->sgName, ui->sgType);
+  setupSwitchConfig(7, ui->shLabel, ui->shName, ui->shType, false);   //switch does not support 3POS
+  setupSwitchConfig(8, ui->siLabel, ui->siName, ui->siType);
+  setupSwitchConfig(9, ui->sjLabel, ui->sjName, ui->sjType);
+  setupSwitchConfig(10, ui->skLabel, ui->skName, ui->skType);
+  setupSwitchConfig(11, ui->slLabel, ui->slName, ui->slType);
+  setupSwitchConfig(12, ui->smLabel, ui->smName, ui->smType);
+  setupSwitchConfig(13, ui->snLabel, ui->snName, ui->snType);
+  setupSwitchConfig(14, ui->soLabel, ui->soName, ui->soType);
+  setupSwitchConfig(15, ui->spLabel, ui->spName, ui->spType);
+  setupSwitchConfig(16, ui->sqLabel, ui->sqName, ui->sqType);
+  setupSwitchConfig(17, ui->srLabel, ui->srName, ui->srType);
+
+  if (IS_TARANIS(firmware->getBoard())) {
+    ui->serialPortMode->setCurrentIndex(generalSettings.hw_uartMode);
+  }
+  else {
+    ui->serialPortMode->hide();
+    ui->serialPortLabel->hide();
+  }
+
+  if (!IS_SKY9X(firmware->getBoard())) {
+    ui->txCurrentCalibration->hide();
+    ui->txCurrentCalibrationLabel->hide();
+  }
+
+  if (IS_TARANIS_X9E(firmware->getBoard())) {
+    ui->bluetoothEnable->setChecked(generalSettings.bluetoothEnable);
+    ui->bluetoothName->setField(generalSettings.bluetoothName, 10, this);
+  }
+  else {
+    ui->bluetoothLabel->hide();
+    ui->bluetoothEnable->hide();
+    ui->bluetoothName->hide();
+  }
+
+  disableMouseScrolling();
+
+  setValues();
+}
+
+HardwarePanel::~HardwarePanel()
+{
+  delete ui;
+}
+
+void HardwarePanel::on_PPM_MultiplierDSB_editingFinished()
+{
+  generalSettings.PPM_Multiplier = (int)(ui->PPM_MultiplierDSB->value()*10)-10;
+  emit modified();
+}
+
+void HardwarePanel::on_PPM1_editingFinished()
+{
+  generalSettings.trainer.calib[0] = ui->PPM1->value();
+  emit modified();
+}
+
+void HardwarePanel::on_PPM2_editingFinished()
+{
+  generalSettings.trainer.calib[1] = ui->PPM2->value();
+  emit modified();
+}
+
+void HardwarePanel::on_PPM3_editingFinished()
+{
+  generalSettings.trainer.calib[2] = ui->PPM3->value();
+  emit modified();
+}
+
+void HardwarePanel::on_PPM4_editingFinished()
+{
+  generalSettings.trainer.calib[3] = ui->PPM4->value();
+  emit modified();
+}
+
+
+void HardwarePanel::on_txCurrentHardware_editingFinished()
+{
+  generalSettings.txCurrentCalibration = ui->txCurrentCalibration->value();
+  emit modified();
+}
+
+void HardwarePanel::on_bluetoothEnable_stateChanged(int)
+{
+  generalSettings.bluetoothEnable = ui->bluetoothEnable->isChecked();
+  emit modified();
+}
+
+void HardwarePanel::setValues()
+{
+  ui->txVoltageCalibration->setValue((double)generalSettings.txVoltageCalibration/10);
+  ui->txCurrentCalibration->setValue((double)generalSettings.txCurrentCalibration);
+
+  ui->PPM1->setValue(generalSettings.trainer.calib[0]);
+  ui->PPM2->setValue(generalSettings.trainer.calib[1]);
+  ui->PPM3->setValue(generalSettings.trainer.calib[2]);
+  ui->PPM4->setValue(generalSettings.trainer.calib[3]);
+  ui->PPM_MultiplierDSB->setValue((qreal)(generalSettings.PPM_Multiplier+10)/10);
+}
+
+void HardwarePanel::on_txVoltageHardware_editingFinished()
+{
+  generalSettings.txVoltageCalibration = ui->txVoltageCalibration->value()*10;
+  emit modified();
+}
+
+void HardwarePanel::on_serialPortMode_currentIndexChanged(int index)
+{
+  generalSettings.hw_uartMode = index;
+  emit modified();
+}
diff --git a/companion/src/generaledit/hardware.h b/companion/src/generaledit/hardware.h
new file mode 100644
index 000000000..2d6481ffb
--- /dev/null
+++ b/companion/src/generaledit/hardware.h
@@ -0,0 +1,46 @@
+#ifndef HARDWARE_H
+#define HARDWARE_H
+
+#include "generaledit.h"
+
+namespace Ui {
+  class Hardware;
+}
+
+class QLabel;
+class AutoLineEdit;
+class AutoComboBox;
+
+class HardwarePanel : public GeneralPanel
+{
+    Q_OBJECT
+
+  public:
+    HardwarePanel(QWidget *parent, GeneralSettings & generalSettings, Firmware * firmware);
+    virtual ~HardwarePanel();
+
+  private slots:
+    void on_txVoltageHardware_editingFinished();
+    void on_PPM1_editingFinished();
+    void on_PPM2_editingFinished();
+    void on_PPM3_editingFinished();
+    void on_PPM4_editingFinished();
+    void on_PPM_MultiplierDSB_editingFinished();
+
+    void on_txCurrentHardware_editingFinished();
+    void on_bluetoothEnable_stateChanged(int);
+
+    void on_serialPortMode_currentIndexChanged(int index);
+
+  protected:
+    void setupPotConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
+    void setupSliderConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
+    void setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type, bool threePos);
+
+  private:
+    Ui::Hardware *ui;
+
+    void setValues();
+};
+
+#endif // HARDWARE_H
diff --git a/companion/src/generaledit/calibration.ui b/companion/src/generaledit/hardware.ui
similarity index 68%
rename from companion/src/generaledit/calibration.ui
rename to companion/src/generaledit/hardware.ui
index 26ad4e2b6..7ff18ac4e 100644
--- a/companion/src/generaledit/calibration.ui
+++ b/companion/src/generaledit/hardware.ui
@@ -1,187 +1,151 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Calibration</class>
- <widget class="QWidget" name="Calibration">
+ <class>Hardware</class>
+ <widget class="QWidget" name="Hardware">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>805</width>
-    <height>1313</height>
+    <width>359</width>
+    <height>1594</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" columnstretch="0,0,0,0,0,0,0,0,0">
-   <item row="4" column="2">
-    <widget class="QSpinBox" name="ana4Mid">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="40" column="0" alignment="Qt::AlignLeft">
-    <widget class="QLabel" name="serialPortLabel">
-     <property name="text">
-      <string>Serial Port</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="35" column="0">
+  <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" columnstretch="0,0,0,0,0">
+   <item row="29" column="0">
     <widget class="QLabel" name="sqLabel">
      <property name="text">
       <string>SQ</string>
      </property>
     </widget>
    </item>
-   <item row="13" column="1">
+   <item row="7" column="1">
     <widget class="AutoLineEdit" name="pot4Name">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="36" column="0">
+   <item row="30" column="0">
     <widget class="QLabel" name="srLabel">
      <property name="text">
       <string>SR</string>
      </property>
     </widget>
    </item>
-   <item row="33" column="1">
+   <item row="27" column="1">
     <widget class="AutoLineEdit" name="soName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="3" column="6">
-    <widget class="QSpinBox" name="ana7Neg">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="35" column="1">
+   <item row="29" column="1">
     <widget class="AutoLineEdit" name="sqName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="16" column="0">
+   <item row="10" column="0">
     <widget class="QLabel" name="ls2Label">
      <property name="text">
       <string>LS2</string>
      </property>
     </widget>
    </item>
-   <item row="34" column="1">
+   <item row="23" column="2">
+    <widget class="AutoComboBox" name="skType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="28" column="1">
     <widget class="AutoLineEdit" name="spName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="34" column="0">
+   <item row="28" column="0">
     <widget class="QLabel" name="spLabel">
      <property name="text">
       <string>SP</string>
      </property>
     </widget>
    </item>
-   <item row="33" column="0">
+   <item row="27" column="0">
     <widget class="QLabel" name="soLabel">
      <property name="text">
       <string>SO</string>
      </property>
     </widget>
    </item>
-   <item row="13" column="0">
+   <item row="7" column="0">
     <widget class="QLabel" name="pot4Label">
      <property name="text">
       <string>S4</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="3">
-    <widget class="QSpinBox" name="ana1Pos">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="1">
+   <item row="6" column="1">
     <widget class="AutoLineEdit" name="pot3Name">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="15" column="0">
+   <item row="9" column="0">
     <widget class="QLabel" name="rsLabel">
      <property name="text">
       <string>RS</string>
      </property>
     </widget>
    </item>
-   <item row="20" column="0">
+   <item row="14" column="0">
     <widget class="QLabel" name="sbLabel">
      <property name="text">
       <string>SB</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="6">
-    <widget class="QSpinBox" name="ana6Neg">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_17">
+   <item row="41" column="0">
+    <widget class="QLabel" name="label_33">
      <property name="text">
-      <string>Stick 3</string>
+      <string>PPM 2</string>
      </property>
     </widget>
    </item>
-   <item row="11" column="1">
+   <item row="12" column="0" colspan="5">
+    <widget class="Line" name="potsTypeSeparator_2">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>10</height>
+      </size>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
     <widget class="AutoLineEdit" name="pot2Name">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="20" column="2">
+   <item row="14" column="2">
     <widget class="AutoComboBox" name="sbType">
      <property name="toolTip">
       <string/>
@@ -200,20 +164,7 @@
      </property>
     </widget>
    </item>
-   <item row="18" column="0" colspan="5">
-    <widget class="Line" name="potsTypeSeparator_2">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>10</height>
-      </size>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="19" column="2">
+   <item row="13" column="2">
     <widget class="AutoComboBox" name="saType">
      <property name="toolTip">
       <string/>
@@ -232,7 +183,7 @@
      </property>
     </widget>
    </item>
-   <item row="40" column="1">
+   <item row="34" column="1">
     <widget class="QComboBox" name="serialPortMode">
      <item>
       <property name="text">
@@ -261,314 +212,123 @@
      </item>
     </widget>
    </item>
-   <item row="20" column="1">
+   <item row="14" column="1">
     <widget class="AutoLineEdit" name="sbName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="10" column="1">
+   <item row="4" column="1">
     <widget class="AutoLineEdit" name="pot1Name">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="19" column="1">
+   <item row="13" column="1">
     <widget class="AutoLineEdit" name="saName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item row="0" column="0">
     <widget class="QLabel" name="rudLabel">
      <property name="text">
       <string>Rud</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="7">
-    <widget class="QLabel" name="label_7">
-     <property name="text">
-      <string>Mid value</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="3">
-    <widget class="QSpinBox" name="ana2Pos">
-     <property name="statusTip">
-      <string/>
-     </property>
+   <item row="37" column="1">
+    <widget class="QSpinBox" name="txCurrentCalibration">
      <property name="minimum">
-      <number>-9999</number>
+      <number>-49</number>
      </property>
      <property name="maximum">
-      <number>9999</number>
+      <number>49</number>
      </property>
     </widget>
    </item>
-   <item row="1" column="7">
-    <widget class="QSpinBox" name="ana5Mid">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="5">
-    <widget class="QLabel" name="label_pot4">
+   <item row="42" column="0">
+    <widget class="QLabel" name="label_34">
      <property name="text">
-      <string>Pot. 4</string>
+      <string>PPM 3</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="4" rowspan="4">
-    <widget class="Line" name="line_3">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+   <item row="0" column="1">
+    <widget class="AutoLineEdit" name="rudName">
+     <property name="maxLength">
+      <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="3" column="5">
-    <widget class="QLabel" name="label_pot3">
+   <item row="4" column="0">
+    <widget class="QLabel" name="pot1Label">
      <property name="text">
-      <string>Pot. 3</string>
+      <string>S1</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="6">
-    <widget class="QSpinBox" name="ana5Neg">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
+   <item row="1" column="1">
+    <widget class="AutoLineEdit" name="eleName">
+     <property name="maxLength">
+      <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="2" column="5">
-    <widget class="QLabel" name="label_pot2">
+   <item row="5" column="0">
+    <widget class="QLabel" name="pot2Label">
      <property name="text">
-      <string>Pot. 2</string>
+      <string>S2</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="5">
-    <widget class="QLabel" name="label_pot1">
+   <item row="6" column="0">
+    <widget class="QLabel" name="pot3Label">
      <property name="text">
-      <string>Pot. 1</string>
+      <string>S3</string>
      </property>
     </widget>
    </item>
-   <item row="45" column="0">
+   <item row="39" column="0">
     <widget class="QLabel" name="label_23">
      <property name="text">
       <string>PPM 1</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
-    <widget class="QLabel" name="label_24">
+   <item row="39" column="1">
+    <widget class="QSpinBox" name="PPM1">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+     <property name="minimum">
+      <number>-9999</number>
+     </property>
+     <property name="maximum">
+      <number>9999</number>
+     </property>
+    </widget>
+   </item>
+   <item row="34" column="0" alignment="Qt::AlignLeft">
+    <widget class="QLabel" name="serialPortLabel">
      <property name="text">
-      <string>Negative span</string>
+      <string>Serial Port</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
-   <item row="0" column="2">
-    <widget class="QLabel" name="label_25">
-     <property name="text">
-      <string>Mid value</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="3">
-    <widget class="QLabel" name="label_26">
-     <property name="text">
-      <string>Positive span</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_15">
-     <property name="text">
-      <string>Stick 1</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QSpinBox" name="ana1Neg">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2">
-    <widget class="QSpinBox" name="ana1Mid">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-     <property name="value">
-      <number>0</number>
-     </property>
-    </widget>
-   </item>
-   <item row="47" column="0">
-    <widget class="QLabel" name="label_33">
-     <property name="text">
-      <string>PPM 2</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_16">
-     <property name="text">
-      <string>Stick 2</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QSpinBox" name="ana2Neg">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2">
-    <widget class="QSpinBox" name="ana2Mid">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QSpinBox" name="ana3Neg">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="2">
-    <widget class="QSpinBox" name="ana3Mid">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="3">
-    <widget class="QSpinBox" name="ana3Pos">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="label_18">
-     <property name="text">
-      <string>Stick 4</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="QSpinBox" name="ana4Neg">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-     <property name="value">
-      <number>0</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="3">
-    <widget class="QSpinBox" name="ana4Pos">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="42" column="0">
-    <widget class="QLabel" name="txVoltageCalibrationLabel">
-     <property name="text">
-      <string>Battery Offset</string>
-     </property>
-    </widget>
-   </item>
-   <item row="42" column="1">
+   <item row="36" column="1">
     <widget class="QDoubleSpinBox" name="txVoltageCalibration">
      <property name="statusTip">
       <string/>
@@ -590,52 +350,14 @@
      </property>
     </widget>
    </item>
-   <item row="50" column="0">
+   <item row="44" column="0">
     <widget class="QLabel" name="label_30">
      <property name="text">
       <string>PPM Multiplier</string>
      </property>
     </widget>
    </item>
-   <item row="47" column="1">
-    <widget class="QSpinBox" name="PPM2">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="48" column="1">
-    <widget class="QSpinBox" name="PPM3">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="49" column="1">
+   <item row="43" column="1">
     <widget class="QSpinBox" name="PPM4">
      <property name="toolTip">
       <string/>
@@ -654,70 +376,7 @@
      </property>
     </widget>
    </item>
-   <item row="45" column="1">
-    <widget class="QSpinBox" name="PPM1">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="43" column="1">
-    <widget class="QSpinBox" name="txCurrentCalibration">
-     <property name="minimum">
-      <number>-49</number>
-     </property>
-     <property name="maximum">
-      <number>49</number>
-     </property>
-    </widget>
-   </item>
-   <item row="48" column="0">
-    <widget class="QLabel" name="label_34">
-     <property name="text">
-      <string>PPM 3</string>
-     </property>
-    </widget>
-   </item>
-   <item row="49" column="0">
-    <widget class="QLabel" name="label_35">
-     <property name="text">
-      <string>PPM 4</string>
-     </property>
-    </widget>
-   </item>
-   <item row="43" column="0">
-    <widget class="QLabel" name="txCurrentCalibrationLabel">
-     <property name="text">
-      <string>Current Offset</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="8">
-    <widget class="QSpinBox" name="ana5Pos">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="30" column="2">
+   <item row="24" column="2">
     <widget class="AutoComboBox" name="slType">
      <property name="toolTip">
       <string/>
@@ -730,208 +389,70 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="8">
-    <widget class="QSpinBox" name="ana6Pos">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="7">
-    <widget class="QSpinBox" name="ana7Mid">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="7">
-    <widget class="QSpinBox" name="ana6Mid">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="7">
-    <widget class="QSpinBox" name="ana8Mid">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="8">
-    <widget class="QSpinBox" name="ana7Pos">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="8">
-    <widget class="QSpinBox" name="ana8Pos">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="6">
-    <widget class="QSpinBox" name="ana8Neg">
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="4">
-    <widget class="Line" name="potsTypeSeparator">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>10</height>
-      </size>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="6">
-    <widget class="QLabel" name="label">
+   <item row="37" column="0">
+    <widget class="QLabel" name="txCurrentCalibrationLabel">
      <property name="text">
-      <string>Negative span</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <string>Current Offset</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="1">
-    <widget class="AutoLineEdit" name="rudName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="8">
-    <widget class="QLabel" name="label_8">
+   <item row="43" column="0">
+    <widget class="QLabel" name="label_35">
      <property name="text">
-      <string>Positive span</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
+      <string>PPM 4</string>
      </property>
     </widget>
    </item>
-   <item row="10" column="0">
-    <widget class="QLabel" name="pot1Label">
-     <property name="text">
-      <string>S1</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="0">
-    <widget class="QLabel" name="pot2Label">
-     <property name="text">
-      <string>S2</string>
-     </property>
-    </widget>
-   </item>
-   <item row="12" column="0">
-    <widget class="QLabel" name="pot3Label">
-     <property name="text">
-      <string>S3</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="1">
-    <widget class="AutoLineEdit" name="eleName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="19" column="0">
-    <widget class="QLabel" name="saLabel">
-     <property name="text">
-      <string>SA</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="eleLabel">
-     <property name="text">
-      <string>Ele</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="1">
+   <item row="3" column="1">
     <widget class="AutoLineEdit" name="ailName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="9" column="0">
-    <widget class="QLabel" name="ailLabel">
+   <item row="13" column="0">
+    <widget class="QLabel" name="saLabel">
      <property name="text">
-      <string>Ail</string>
+      <string>SA</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="1">
+   <item row="1" column="0">
+    <widget class="QLabel" name="eleLabel">
+     <property name="text">
+      <string>Ele</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
     <widget class="AutoLineEdit" name="thrName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="14" column="1">
+   <item row="8" column="1">
     <widget class="AutoLineEdit" name="lsName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="8" column="0">
+   <item row="3" column="0">
+    <widget class="QLabel" name="ailLabel">
+     <property name="text">
+      <string>Ail</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="1">
+    <widget class="AutoLineEdit" name="rsName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
     <widget class="QLabel" name="thrLabel">
      <property name="text">
       <string>Thr</string>
@@ -939,41 +460,41 @@
     </widget>
    </item>
    <item row="15" column="1">
-    <widget class="AutoLineEdit" name="rsName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="21" column="0">
-    <widget class="QLabel" name="scLabel">
-     <property name="text">
-      <string>SC</string>
-     </property>
-    </widget>
-   </item>
-   <item row="21" column="1">
     <widget class="AutoLineEdit" name="scName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="14" column="0">
-    <widget class="QLabel" name="lsLabel">
+   <item row="15" column="0">
+    <widget class="QLabel" name="scLabel">
      <property name="text">
-      <string>LS</string>
+      <string>SC</string>
      </property>
     </widget>
    </item>
-   <item row="22" column="1">
+   <item row="16" column="1">
     <widget class="AutoLineEdit" name="sdName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="21" column="2">
+   <item row="8" column="0">
+    <widget class="QLabel" name="lsLabel">
+     <property name="text">
+      <string>LS</string>
+     </property>
+    </widget>
+   </item>
+   <item row="17" column="1">
+    <widget class="AutoLineEdit" name="seName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="15" column="2">
     <widget class="AutoComboBox" name="scType">
      <property name="toolTip">
       <string/>
@@ -986,21 +507,21 @@
      </property>
     </widget>
    </item>
-   <item row="23" column="1">
-    <widget class="AutoLineEdit" name="seName">
+   <item row="18" column="1">
+    <widget class="AutoLineEdit" name="sfName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="22" column="0">
+   <item row="16" column="0">
     <widget class="QLabel" name="sdLabel">
      <property name="text">
       <string>SD</string>
      </property>
     </widget>
    </item>
-   <item row="22" column="2">
+   <item row="16" column="2">
     <widget class="AutoComboBox" name="sdType">
      <property name="toolTip">
       <string/>
@@ -1013,21 +534,66 @@
      </property>
     </widget>
    </item>
-   <item row="24" column="1">
-    <widget class="AutoLineEdit" name="sfName">
+   <item row="41" column="1">
+    <widget class="QSpinBox" name="PPM2">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+     <property name="minimum">
+      <number>-9999</number>
+     </property>
+     <property name="maximum">
+      <number>9999</number>
+     </property>
+    </widget>
+   </item>
+   <item row="36" column="0">
+    <widget class="QLabel" name="txVoltageCalibrationLabel">
+     <property name="text">
+      <string>Battery Offset</string>
+     </property>
+    </widget>
+   </item>
+   <item row="42" column="1">
+    <widget class="QSpinBox" name="PPM3">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+     <property name="minimum">
+      <number>-9999</number>
+     </property>
+     <property name="maximum">
+      <number>9999</number>
+     </property>
+    </widget>
+   </item>
+   <item row="19" column="1">
+    <widget class="AutoLineEdit" name="sgName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="23" column="0">
+   <item row="17" column="0">
     <widget class="QLabel" name="seLabel">
      <property name="text">
       <string>SE</string>
      </property>
     </widget>
    </item>
-   <item row="23" column="2">
+   <item row="17" column="2">
     <widget class="AutoComboBox" name="seType">
      <property name="toolTip">
       <string/>
@@ -1040,21 +606,21 @@
      </property>
     </widget>
    </item>
-   <item row="25" column="1">
-    <widget class="AutoLineEdit" name="sgName">
+   <item row="20" column="1">
+    <widget class="AutoLineEdit" name="shName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="24" column="0">
+   <item row="18" column="0">
     <widget class="QLabel" name="sfLabel">
      <property name="text">
       <string>SF</string>
      </property>
     </widget>
    </item>
-   <item row="24" column="2">
+   <item row="18" column="2">
     <widget class="AutoComboBox" name="sfType">
      <property name="toolTip">
       <string/>
@@ -1067,21 +633,21 @@
      </property>
     </widget>
    </item>
-   <item row="26" column="1">
-    <widget class="AutoLineEdit" name="shName">
+   <item row="21" column="1">
+    <widget class="AutoLineEdit" name="siName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="25" column="0">
+   <item row="19" column="0">
     <widget class="QLabel" name="sgLabel">
      <property name="text">
       <string>SG</string>
      </property>
     </widget>
    </item>
-   <item row="25" column="2">
+   <item row="19" column="2">
     <widget class="AutoComboBox" name="sgType">
      <property name="toolTip">
       <string/>
@@ -1094,91 +660,77 @@
      </property>
     </widget>
    </item>
-   <item row="27" column="1">
-    <widget class="AutoLineEdit" name="siName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="26" column="0">
-    <widget class="QLabel" name="shLabel">
-     <property name="text">
-      <string>SH</string>
-     </property>
-    </widget>
-   </item>
-   <item row="28" column="1">
+   <item row="22" column="1">
     <widget class="AutoLineEdit" name="sjName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="27" column="0">
-    <widget class="QLabel" name="siLabel">
+   <item row="20" column="0">
+    <widget class="QLabel" name="shLabel">
      <property name="text">
-      <string>SI</string>
+      <string>SH</string>
      </property>
     </widget>
    </item>
-   <item row="29" column="1">
+   <item row="23" column="1">
     <widget class="AutoLineEdit" name="skName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="28" column="0">
-    <widget class="QLabel" name="sjLabel">
+   <item row="21" column="0">
+    <widget class="QLabel" name="siLabel">
      <property name="text">
-      <string>SJ</string>
+      <string>SI</string>
      </property>
     </widget>
    </item>
-   <item row="30" column="1">
+   <item row="24" column="1">
     <widget class="AutoLineEdit" name="slName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="29" column="0">
-    <widget class="QLabel" name="skLabel">
+   <item row="22" column="0">
+    <widget class="QLabel" name="sjLabel">
      <property name="text">
-      <string>SK</string>
+      <string>SJ</string>
      </property>
     </widget>
    </item>
-   <item row="31" column="1">
+   <item row="25" column="1">
     <widget class="AutoLineEdit" name="smName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="30" column="0">
-    <widget class="QLabel" name="slLabel">
+   <item row="23" column="0">
+    <widget class="QLabel" name="skLabel">
      <property name="text">
-      <string>SL</string>
+      <string>SK</string>
      </property>
     </widget>
    </item>
-   <item row="32" column="1">
+   <item row="26" column="1">
     <widget class="AutoLineEdit" name="snName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="31" column="0">
-    <widget class="QLabel" name="smLabel">
+   <item row="24" column="0">
+    <widget class="QLabel" name="slLabel">
      <property name="text">
-      <string>SM</string>
+      <string>SL</string>
      </property>
     </widget>
    </item>
-   <item row="37" column="0" colspan="4">
+   <item row="31" column="0" colspan="4">
     <widget class="Line" name="potsTypeSeparator_3">
      <property name="minimumSize">
       <size>
@@ -1191,7 +743,7 @@
      </property>
     </widget>
    </item>
-   <item row="44" column="0" colspan="4">
+   <item row="38" column="0" colspan="4">
     <widget class="Line" name="potsTypeSeparator_4">
      <property name="minimumSize">
       <size>
@@ -1204,14 +756,28 @@
      </property>
     </widget>
    </item>
-   <item row="32" column="0">
+   <item row="25" column="0">
+    <widget class="QLabel" name="smLabel">
+     <property name="text">
+      <string>SM</string>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="1">
+    <widget class="AutoLineEdit" name="rs2Name">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="26" column="0">
     <widget class="QLabel" name="snLabel">
      <property name="text">
       <string>SN</string>
      </property>
     </widget>
    </item>
-   <item row="50" column="1">
+   <item row="44" column="1">
     <widget class="QDoubleSpinBox" name="PPM_MultiplierDSB">
      <property name="decimals">
       <number>1</number>
@@ -1224,41 +790,21 @@
      </property>
     </widget>
    </item>
-   <item row="17" column="1">
-    <widget class="AutoLineEdit" name="rs2Name">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="0">
-    <widget class="QLabel" name="rs2Label">
-     <property name="text">
-      <string>RS2</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="1">
+   <item row="10" column="1">
     <widget class="AutoLineEdit" name="ls2Name">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="27" column="2">
-    <widget class="AutoComboBox" name="siType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
+   <item row="11" column="0">
+    <widget class="QLabel" name="rs2Label">
+     <property name="text">
+      <string>RS2</string>
      </property>
     </widget>
    </item>
-   <item row="26" column="2">
+   <item row="20" column="2">
     <widget class="AutoComboBox" name="shType">
      <property name="toolTip">
       <string/>
@@ -1271,7 +817,20 @@
      </property>
     </widget>
    </item>
-   <item row="28" column="2">
+   <item row="21" column="2">
+    <widget class="AutoComboBox" name="siType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="22" column="2">
     <widget class="AutoComboBox" name="sjType">
      <property name="toolTip">
       <string/>
@@ -1284,20 +843,7 @@
      </property>
     </widget>
    </item>
-   <item row="29" column="2">
-    <widget class="AutoComboBox" name="skType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="31" column="2">
+   <item row="25" column="2">
     <widget class="AutoComboBox" name="smType">
      <property name="toolTip">
       <string/>
@@ -1310,7 +856,7 @@
      </property>
     </widget>
    </item>
-   <item row="32" column="2">
+   <item row="26" column="2">
     <widget class="AutoComboBox" name="snType">
      <property name="toolTip">
       <string/>
@@ -1323,7 +869,7 @@
      </property>
     </widget>
    </item>
-   <item row="33" column="2">
+   <item row="27" column="2">
     <widget class="AutoComboBox" name="soType">
      <property name="toolTip">
       <string/>
@@ -1336,7 +882,7 @@
      </property>
     </widget>
    </item>
-   <item row="34" column="2">
+   <item row="28" column="2">
     <widget class="AutoComboBox" name="spType">
      <property name="toolTip">
       <string/>
@@ -1349,7 +895,7 @@
      </property>
     </widget>
    </item>
-   <item row="35" column="2">
+   <item row="29" column="2">
     <widget class="AutoComboBox" name="sqType">
      <property name="toolTip">
       <string/>
@@ -1362,7 +908,7 @@
      </property>
     </widget>
    </item>
-   <item row="36" column="2">
+   <item row="30" column="2">
     <widget class="AutoComboBox" name="srType">
      <property name="toolTip">
       <string/>
@@ -1375,7 +921,7 @@
      </property>
     </widget>
    </item>
-   <item row="17" column="2">
+   <item row="11" column="2">
     <widget class="AutoComboBox" name="rs2Type">
      <property name="toolTip">
       <string/>
@@ -1394,7 +940,7 @@
      </property>
     </widget>
    </item>
-   <item row="16" column="2">
+   <item row="10" column="2">
     <widget class="AutoComboBox" name="ls2Type">
      <property name="toolTip">
       <string/>
@@ -1413,7 +959,7 @@
      </property>
     </widget>
    </item>
-   <item row="15" column="2">
+   <item row="9" column="2">
     <widget class="AutoComboBox" name="rsType">
      <property name="toolTip">
       <string/>
@@ -1432,7 +978,7 @@
      </property>
     </widget>
    </item>
-   <item row="14" column="2">
+   <item row="8" column="2">
     <widget class="AutoComboBox" name="lsType">
      <property name="toolTip">
       <string/>
@@ -1451,7 +997,7 @@
      </property>
     </widget>
    </item>
-   <item row="13" column="2">
+   <item row="7" column="2">
     <widget class="AutoComboBox" name="pot4Type">
      <property name="toolTip">
       <string/>
@@ -1470,7 +1016,7 @@
      </property>
     </widget>
    </item>
-   <item row="12" column="2">
+   <item row="6" column="2">
     <widget class="AutoComboBox" name="pot3Type">
      <property name="toolTip">
       <string/>
@@ -1489,7 +1035,7 @@
      </property>
     </widget>
    </item>
-   <item row="11" column="2">
+   <item row="5" column="2">
     <widget class="AutoComboBox" name="pot2Type">
      <property name="toolTip">
       <string/>
@@ -1508,7 +1054,7 @@
      </property>
     </widget>
    </item>
-   <item row="10" column="2">
+   <item row="4" column="2">
     <widget class="AutoComboBox" name="pot1Type">
      <property name="toolTip">
       <string/>
@@ -1527,7 +1073,7 @@
      </property>
     </widget>
    </item>
-   <item row="38" column="0">
+   <item row="32" column="0">
     <widget class="QLabel" name="bluetoothLabel">
      <property name="text">
       <string>Bluetooth</string>
@@ -1537,7 +1083,14 @@
      </property>
     </widget>
    </item>
-   <item row="38" column="1">
+   <item row="30" column="1">
+    <widget class="AutoLineEdit" name="srName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="32" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QCheckBox" name="bluetoothEnable">
@@ -1555,13 +1108,6 @@
      </item>
     </layout>
    </item>
-   <item row="36" column="1">
-    <widget class="AutoLineEdit" name="srName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>