diff --git a/src/ui/WaypointList.cc b/src/ui/WaypointList.cc
index 42c8cd5edb6322c1ac89bd34417f9b1edc95ad98..74da7f1f94ec5eaa3145a6b0014b5dcdeee62283 100644
--- a/src/ui/WaypointList.cc
+++ b/src/ui/WaypointList.cc
@@ -93,10 +93,7 @@ WaypointList::~WaypointList()
 
 void WaypointList::updateStatusLabel(const QString &string)
 {
-    if (this->uas)
-    {
-        m_ui->statusLabel->setText(string);
-    }
+    m_ui->statusLabel->setText(string);
 }
 
 void WaypointList::updateLocalPosition(UASInterface* uas, double x, double y, double z, quint64 usec)
@@ -229,11 +226,11 @@ void WaypointList::addCurrentPositonWaypoint()
         if (waypoints.size() > 0)
         {
             Waypoint *last = waypoints.at(waypoints.size()-1);
-            addWaypoint(new Waypoint(waypoints.size(), mavX, mavY, mavZ, mavYaw, last->getAutoContinue(), false, last->getOrbit(), last->getHoldTime()));
+            addWaypoint(new Waypoint(waypoints.size(), (float)(qRound(mavX*100))/100.f, (float)(qRound(mavY*100))/100.f, (float)(qRound(mavZ*100))/100.f, (float)(qRound(mavYaw*100))/100.f, last->getAutoContinue(), false, last->getOrbit(), last->getHoldTime()));
         }
         else
         {
-            addWaypoint(new Waypoint(waypoints.size(), mavX, mavY, mavZ, mavYaw, true, true, 0.15, 2000));
+            addWaypoint(new Waypoint(waypoints.size(), (float)(qRound(mavX*100))/100.f, (float)(qRound(mavY*100))/100.f, (float)(qRound(mavZ*100))/100.f, (float)(qRound(mavYaw*100))/100.f, true, true, 0.15, 2000));
         }
 
     }
diff --git a/src/ui/WaypointView.ui b/src/ui/WaypointView.ui
index 97f8013a66de0b7e79a093fb3d69baa380693e57..d7e3375bbcf9ee1e67356d723eab33ac763565da 100644
--- a/src/ui/WaypointView.ui
+++ b/src/ui/WaypointView.ui
@@ -281,8 +281,11 @@ QProgressBar::chunk#thrustBar {
         <property name="suffix">
          <string>°</string>
         </property>
+        <property name="minimum">
+         <number>-180</number>
+        </property>
         <property name="maximum">
-         <number>359</number>
+         <number>180</number>
         </property>
         <property name="singleStep">
          <number>10</number>