diff --git a/connections/connectionwindow.cpp b/connections/connectionwindow.cpp
index 5155e5f..c14158a 100644
--- a/connections/connectionwindow.cpp
+++ b/connections/connectionwindow.cpp
@@ -277,8 +277,8 @@ void ConnectionWindow::populateBusDetails(int offset)
             return;
         }
 
-        int busBase = CANConManager::getInstance()->getBusBase(conn_p);
-        ui->lblBusNum->setText(QString::number(busBase + offset));
+        //int busBase = CANConManager::getInstance()->getBusBase(conn_p);
+        //ui->lblBusNum->setText(QString::number(busBase + offset));
         ui->ckListenOnly->setChecked(bus.isListenOnly());
         ui->ckEnable->setChecked(bus.isActive());
 
@@ -328,7 +328,9 @@ void ConnectionWindow::currentRowChanged(const QModelIndex &current, const QMode
         int numB = ui->tabBuses->count();
         for (int i = 0; i < numB; i++) ui->tabBuses->removeTab(0);
 
-        if (numBuses > 1) for (int i = 0; i < numBuses; i++) ui->tabBuses->addTab(QString::number(i+1));
+        int busBase = CANConManager::getInstance()->getBusBase(conn_p);
+
+        /*if (numBuses > 1)*/ for (int i = 0; i < numBuses; i++) ui->tabBuses->addTab(QString::number(busBase + i));
 
         populateBusDetails(0);
         if (ui->ckEnableConsole->isChecked())
diff --git a/ui/connectionwindow.ui b/ui/connectionwindow.ui
index d132606..cbc6119 100644
--- a/ui/connectionwindow.ui
+++ b/ui/connectionwindow.ui
@@ -68,58 +68,44 @@
         <item>
          <layout class="QFormLayout" name="formLayout_2">
           <item row="0" column="0">
-           <widget class="QLabel" name="label_12">
-            <property name="text">
-             <string>CAN Bus Number:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLabel" name="lblBusNum">
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
            <widget class="QLabel" name="label_10">
             <property name="text">
              <string>Speed:</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="0" column="1">
            <widget class="QComboBox" name="cbBusSpeed"/>
           </item>
-          <item row="2" column="0">
+          <item row="1" column="0">
            <widget class="QLabel" name="label_11">
             <property name="text">
              <string>Listen Only:</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
+          <item row="1" column="1">
            <widget class="QCheckBox" name="ckListenOnly">
             <property name="text">
              <string/>
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
+          <item row="2" column="0">
            <widget class="QLabel" name="label_14">
             <property name="text">
              <string>Enable Bus:</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
+          <item row="2" column="1">
            <widget class="QCheckBox" name="ckEnable">
             <property name="text">
              <string/>
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
+          <item row="3" column="1">
            <widget class="QPushButton" name="btnSaveBus">
             <property name="text">
              <string>Save Bus Settings</string>