diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 8ecc2e1fc8f05b45db1c251f79e9f429efcb201b..aeb4612ccc40739fcd4c1e6b856eb05483b6ef4a 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -225,9 +225,3 @@ win32 {
     HEADERS += src/comm/OpalLink.h
     DEFINES += OPAL_RT
 }
-
-macx {
-    SOURCES += src/comm/OpalLink.cc
-    HEADERS += src/comm/OpalLink.h
-    DEFINES += OPAL_RT
-}
diff --git a/src/Core.cc b/src/Core.cc
index 38e719662791cb580cd0e898b49373867c4d663a..7e04b0f6e3b04b344b3ab1734a5833acf67fe520 100644
--- a/src/Core.cc
+++ b/src/Core.cc
@@ -139,7 +139,6 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
     // Add OpalRT Link, but do not connect
     OpalLink* opalLink = new OpalLink();
     mainWindow->addLink(opalLink);
-    opalLink->connect();
 #warning OPAL LINK NOW AUTO CONNECTING IN CORE.CC
 #endif
     // MAVLinkSimulationLink* simulationLink = new MAVLinkSimulationLink(MG::DIR::getSupportFilesDirectory() + "/demo-log.txt");
diff --git a/src/ui/UASList.ui b/src/ui/UASList.ui
index 27857f49720e17984910d878cefe8a629a8d26ab..d7976341b81957d9ab8f458b365f4f5087516058 100644
--- a/src/ui/UASList.ui
+++ b/src/ui/UASList.ui
@@ -6,13 +6,13 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>500</width>
     <height>300</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>500</width>
+    <width>0</width>
     <height>0</height>
    </size>
   </property>
diff --git a/src/ui/UASView.ui b/src/ui/UASView.ui
index 39c09c344d9d166d0bdb788f3d4b755168030ad3..203c312927fca72e2856253b9d0750b0a12bb232 100644
--- a/src/ui/UASView.ui
+++ b/src/ui/UASView.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>362</width>
+    <width>370</width>
     <height>120</height>
    </rect>
   </property>
@@ -18,7 +18,7 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>0</width>
+    <width>370</width>
     <height>0</height>
    </size>
   </property>