diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp
index 18155c72d..ca1f1e66a 100644
--- a/src/swiftlauncher/swiftlauncher.cpp
+++ b/src/swiftlauncher/swiftlauncher.cpp
@@ -80,16 +80,14 @@ CSwiftLauncher::CSwiftLauncher(QWidget *parent) :
     m_checkTimer.setInterval(2500);
     m_checkTimer.start();
 
-    // auto launch wizard
-    if (sGui->isInstallerOptionSet())
+    // auto launch wizard nd other init parts
+    const QPointer<CSwiftLauncher> myself(this);
+    QTimer::singleShot(2500, this, [ = ]
     {
-        const QPointer<CSwiftLauncher> myself(this);
-        QTimer::singleShot(2500, this, [ = ]
-        {
-            if (!sGui || sGui->isShuttingDown() || !myself) { return; }
-            myself->startWizard();
-        });
-    }
+        if (!sGui || sGui->isShuttingDown() || !myself) { return; }
+        this->onCoreModeReleased();
+        if (sGui->isInstallerOptionSet()) { myself->startWizard(); }
+    });
 }
 
 CSwiftLauncher::~CSwiftLauncher()
@@ -491,8 +489,9 @@ void CSwiftLauncher::checkRunningApplicationsAndCore()
     const bool foundLocalCore = runningApps.containsApplication(CApplicationInfo::PilotClientCore);
     const bool foundLocalMappingTool = runningApps.containsApplication(CApplicationInfo::MappingTool);
     const bool foundLocalPilotClientGui = runningApps.containsApplication(CApplicationInfo::PilotClientGui);
+    const bool standalone = ui->rb_SwiftStandalone->isChecked();
 
-    ui->tb_SwiftCore->setEnabled(!foundLocalCore && m_startCoreWaitCycles < 1);
+    ui->tb_SwiftCore->setEnabled(!standalone && !foundLocalCore && m_startCoreWaitCycles < 1);
     ui->tb_SwiftMappingTool->setEnabled(!foundLocalMappingTool && m_startMappingToolWaitCycles < 1);
     ui->tb_SwiftGui->setEnabled(!foundLocalPilotClientGui && m_startGuiWaitCycles < 1);
 }
@@ -521,7 +520,9 @@ void CSwiftLauncher::onDBusEditingFinished()
 
 void CSwiftLauncher::onCoreModeReleased()
 {
-    ui->comp_DBusSelector->setEnabled(!ui->rb_SwiftStandalone->isChecked());
+    const bool sa = ui->rb_SwiftStandalone->isChecked();
+    ui->comp_DBusSelector->setEnabled(!sa);
+    ui->tb_SwiftCore->setEnabled(!sa);
     this->saveSetup();
 }
 
diff --git a/src/swiftlauncher/swiftlauncher.ui b/src/swiftlauncher/swiftlauncher.ui
index f7badfd61..162336a0d 100644
--- a/src/swiftlauncher/swiftlauncher.ui
+++ b/src/swiftlauncher/swiftlauncher.ui
@@ -88,7 +88,7 @@
           <item>
            <widget class="QToolBox" name="tb_Launcher">
             <property name="currentIndex">
-             <number>3</number>
+             <number>2</number>
             </property>
             <property name="tabSpacing">
              <number>6</number>
@@ -99,7 +99,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>275</height>
+               <height>309</height>
               </rect>
              </property>
              <attribute name="label">
@@ -130,7 +130,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>275</height>
+               <height>309</height>
               </rect>
              </property>
              <attribute name="label">
@@ -194,8 +194,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>371</width>
-               <height>298</height>
+               <width>392</width>
+               <height>309</height>
               </rect>
              </property>
              <attribute name="label">
@@ -297,7 +297,7 @@
               <item row="3" column="1" colspan="2">
                <widget class="QGroupBox" name="gb_DBusServer">
                 <property name="title">
-                 <string>DBus</string>
+                 <string>DBus (swift core/GUI, NOT XSwiftBus)</string>
                 </property>
                 <layout class="QVBoxLayout" name="vl_DBusGroupBox">
                  <property name="spacing">
@@ -361,7 +361,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>275</height>
+               <height>309</height>
               </rect>
              </property>
              <attribute name="label">
@@ -442,8 +442,8 @@
                      <rect>
                       <x>0</x>
                       <y>0</y>
-                      <width>380</width>
-                      <height>94</height>
+                      <width>376</width>
+                      <height>126</height>
                      </rect>
                     </property>
                     <layout class="QVBoxLayout" name="vl_DataUpdatesScrollArea">
@@ -494,7 +494,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>275</height>
+               <height>309</height>
               </rect>
              </property>
              <attribute name="label">
@@ -537,7 +537,7 @@
                <x>0</x>
                <y>0</y>
                <width>392</width>
-               <height>144</height>
+               <height>151</height>
               </rect>
              </property>
              <attribute name="label">