diff --git a/src/blackgui/components/dbusserveraddressselector.cpp b/src/blackgui/components/dbusserveraddressselector.cpp
index c53fc4299..9a1abd5c1 100644
--- a/src/blackgui/components/dbusserveraddressselector.cpp
+++ b/src/blackgui/components/dbusserveraddressselector.cpp
@@ -37,10 +37,10 @@ namespace BlackGui
             this->set(sGui->getCmdDBusAddressValue());
 
             ui->le_DBusServerPort->setValidator(new QIntValidator(0, 65535, this));
-            connect(ui->rb_DBusP2P, &QRadioButton::released, this, &CDBusServerAddressSelector::onRadioButtonReleased);
-            connect(ui->rb_DBusSession, &QRadioButton::released, this, &CDBusServerAddressSelector::onRadioButtonReleased);
-            connect(ui->rb_DBusSystem, &QRadioButton::released, this, &CDBusServerAddressSelector::onRadioButtonReleased);
-            connect(ui->le_DBusServerPort, &QLineEdit::editingFinished, this, &CDBusServerAddressSelector::editingFinished);
+            connect(ui->rb_DBusP2P,           &QRadioButton::released,        this, &CDBusServerAddressSelector::onRadioButtonReleased);
+            connect(ui->rb_DBusSession,       &QRadioButton::released,        this, &CDBusServerAddressSelector::onRadioButtonReleased);
+            connect(ui->rb_DBusSystem,        &QRadioButton::released,        this, &CDBusServerAddressSelector::onRadioButtonReleased);
+            connect(ui->le_DBusServerPort,    &QLineEdit::editingFinished,    this, &CDBusServerAddressSelector::editingFinished);
             connect(ui->cb_DBusServerAddress, &QComboBox::currentTextChanged, this, &CDBusServerAddressSelector::editingFinished);
         }
 
diff --git a/src/blackgui/components/dbusserveraddressselector.h b/src/blackgui/components/dbusserveraddressselector.h
index c6e226ea1..76ed9fbb0 100644
--- a/src/blackgui/components/dbusserveraddressselector.h
+++ b/src/blackgui/components/dbusserveraddressselector.h
@@ -30,7 +30,7 @@ namespace BlackGui
             explicit CDBusServerAddressSelector(QWidget *parent = nullptr);
 
             //! Dtor
-            virtual ~CDBusServerAddressSelector();
+            virtual ~CDBusServerAddressSelector() override;
 
             //! DBus address for P2P or empty
             QString getP2PAddress() const;
diff --git a/src/blackgui/components/dbusserveraddressselector.ui b/src/blackgui/components/dbusserveraddressselector.ui
index 2f6a27ebc..5ba4b5b7a 100644
--- a/src/blackgui/components/dbusserveraddressselector.ui
+++ b/src/blackgui/components/dbusserveraddressselector.ui
@@ -2,16 +2,8 @@
 <ui version="4.0">
  <class>CDBusServerAddressSelector</class>
  <widget class="QFrame" name="CDBusServerAddressSelector">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>149</width>
-    <height>118</height>
-   </rect>
-  </property>
   <property name="windowTitle">
-   <string>Frame</string>
+   <string>DBus selector</string>
   </property>
   <layout class="QVBoxLayout" name="vl_DBusSelector">
    <property name="leftMargin">
@@ -27,29 +19,18 @@
     <number>2</number>
    </property>
    <item>
-    <widget class="QRadioButton" name="rb_DBusSession">
+    <widget class="QRadioButton" name="rb_DBusP2P">
+     <property name="toolTip">
+      <string>swift peer to peer setup, setup to run swift on 2 computers</string>
+     </property>
      <property name="text">
-      <string>DBus session server</string>
+      <string>DBus P2P server (2 computers)</string>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QRadioButton" name="rb_DBusSystem">
-     <property name="text">
-      <string>DBus system server</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QRadioButton" name="rb_DBusP2P">
-     <property name="text">
-      <string>DBus peer to peer server (P2P)</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QFrame" name="fr_DBusServerAddress">
      <layout class="QGridLayout" name="gl_DBusServerAddressDetails">
@@ -68,36 +49,6 @@
       <property name="verticalSpacing">
        <number>4</number>
       </property>
-      <item row="0" column="2">
-       <widget class="QComboBox" name="cb_DBusServerAddress">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="editable">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="lbl_DBusServerAddress">
-        <property name="text">
-         <string>Address:</string>
-        </property>
-        <property name="textInteractionFlags">
-         <set>Qt::LinksAccessibleByMouse</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="lbl_DBusServerPort">
-        <property name="text">
-         <string>Port:</string>
-        </property>
-       </widget>
-      </item>
       <item row="1" column="2">
        <widget class="QLineEdit" name="le_DBusServerPort">
         <property name="maximumSize">
@@ -114,11 +65,65 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="2">
+       <widget class="QComboBox" name="cb_DBusServerAddress">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="editable">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="lbl_DBusServerPort">
+        <property name="text">
+         <string>Port:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="lbl_DBusServerAddress">
+        <property name="text">
+         <string>Address:</string>
+        </property>
+        <property name="textInteractionFlags">
+         <set>Qt::LinksAccessibleByMouse</set>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QRadioButton" name="rb_DBusSession">
+     <property name="text">
+      <string>DBus session server</string>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QRadioButton" name="rb_DBusSystem">
+     <property name="text">
+      <string>DBus system server</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>rb_DBusP2P</tabstop>
+  <tabstop>cb_DBusServerAddress</tabstop>
+  <tabstop>le_DBusServerPort</tabstop>
+  <tabstop>rb_DBusSession</tabstop>
+  <tabstop>rb_DBusSystem</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>