diff --git a/src/ui/HSIDisplay.cc b/src/ui/HSIDisplay.cc
index bdccbf302d3f0476ecf7be54c960ef86a058df9b..645d2832d3bdc6dffa7482e6ba90c31f80554df5 100644
--- a/src/ui/HSIDisplay.cc
+++ b/src/ui/HSIDisplay.cc
@@ -665,6 +665,7 @@ void HSIDisplay::drawWaypoints(QPainter& painter)
             QPen pen(color);
             pen.setWidthF(refLineWidthToPen(0.4f));
             painter.setPen(pen);
+            painter.setBrush(Qt::NoBrush);
 
             // Draw line from last waypoint to this one
             if (!lastWaypoint.isNull())
diff --git a/src/ui/UASControl.ui b/src/ui/UASControl.ui
index c1a095749e0cb2cde8db34ff6ce149fb01b79d85..bc34fd146b929d2281b9ca6962fe1b74888364c3 100644
--- a/src/ui/UASControl.ui
+++ b/src/ui/UASControl.ui
@@ -6,14 +6,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>380</width>
-    <height>190</height>
+    <width>280</width>
+    <height>164</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>280</width>
+    <height>130</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" rowminimumheight="0,0,0,0,0,0,100">
+  <layout class="QGridLayout" name="gridLayout" rowminimumheight="5,10,10,0,10,5,0">
    <property name="leftMargin">
     <number>6</number>
    </property>
@@ -147,10 +153,13 @@
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>20</width>
-       <height>0</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/src/ui/UASInfo.ui b/src/ui/UASInfo.ui
index 029e796c19b97702463ec9d0556510d933d2d09c..a86c9a2623c27ad2c2a54915c61e67acdba7933f 100644
--- a/src/ui/UASInfo.ui
+++ b/src/ui/UASInfo.ui
@@ -287,7 +287,7 @@
    <item row="3" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
-      <string>CPU Load</string>
+      <string>MCU Load</string>
      </property>
     </widget>
    </item>
@@ -370,14 +370,14 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="6">
+   <item row="5" column="0" colspan="6">
     <widget class="Line" name="line">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="7">
+   <item row="7" column="0" colspan="7">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -393,13 +393,69 @@
      </property>
     </spacer>
    </item>
-   <item row="5" column="0" colspan="6">
+   <item row="6" column="0" colspan="6">
     <widget class="QLabel" name="errorLabel">
      <property name="text">
       <string>No error status received yet</string>
      </property>
     </widget>
    </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>CPU Load</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="2">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>0</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="3">
+    <widget class="QLabel" name="label_10">
+     <property name="text">
+      <string>%</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="4" colspan="2">
+    <widget class="QProgressBar" name="progressBar">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>20</height>
+      </size>
+     </property>
+     <property name="baseSize">
+      <size>
+       <width>0</width>
+       <height>18</height>
+      </size>
+     </property>
+     <property name="value">
+      <number>24</number>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>13</width>
+       <height>15</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>