diff --git a/src/ui/UASRawStatusView.cpp b/src/ui/UASRawStatusView.cpp
index 51c48191bf33379445777da242058d91bb014dbc..7f12bfa494189ce1d7cef77622075e43334c5677 100644
--- a/src/ui/UASRawStatusView.cpp
+++ b/src/ui/UASRawStatusView.cpp
@@ -16,7 +16,7 @@ UASRawStatusView::UASRawStatusView(QWidget *parent) : QWidget(parent)
 
     // FIXME reinstate once fixed.
 
-    //timer->start(2000);
+    timer->start(2000);
 }
 void UASRawStatusView::addSource(MAVLinkDecoder *decoder)
 {
diff --git a/src/ui/uas/UASQuickView.cc b/src/ui/uas/UASQuickView.cc
index afc633b03e69ff5f2d25373ca85ce58f46577e42..b6d06645b0b34fbad05a0e3a59a017d26cc23146 100644
--- a/src/ui/uas/UASQuickView.cc
+++ b/src/ui/uas/UASQuickView.cc
@@ -77,6 +77,7 @@ UASQuickView::UASQuickView(QWidget *parent) : QWidget(parent)
         uasPropertyToLabelMap["distToWaypoint"] = item;
     }*/
 
+    //this->setSizePolicy();
     loadSettings();
     //If we don't have any predefined settings, set some defaults.
     if (uasPropertyValueMap.size() == 0)
diff --git a/src/ui/uas/UASQuickViewTextItem.cc b/src/ui/uas/UASQuickViewTextItem.cc
index d03d1f9dc9abcd6bf5a6e4449206da9920bcfb26..11920e4966f0b79f89d3f71c34c35f76eaefb8a1 100644
--- a/src/ui/uas/UASQuickViewTextItem.cc
+++ b/src/ui/uas/UASQuickViewTextItem.cc
@@ -1,5 +1,6 @@
 #include "UASQuickViewTextItem.h"
 #include <QVBoxLayout>
+#include <QDebug>
 UASQuickViewTextItem::UASQuickViewTextItem(QWidget *parent) : UASQuickViewItem(parent)
 {
     QVBoxLayout *layout = new QVBoxLayout();
@@ -7,13 +8,15 @@ UASQuickViewTextItem::UASQuickViewTextItem(QWidget *parent) : UASQuickViewItem(p
     layout->setSpacing(0);
     layout->setMargin(0);
     titleLabel = new QLabel(this);
+    titleLabel->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored);
     titleLabel->setAlignment(Qt::AlignHCenter);
     this->layout()->addWidget(titleLabel);
     valueLabel = new QLabel(this);
+    valueLabel->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored);
     valueLabel->setAlignment(Qt::AlignHCenter);
     valueLabel->setText("0.00");
     this->layout()->addWidget(valueLabel);
-    layout->addSpacerItem(new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding));
+    layout->addSpacerItem(new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Ignored));
     QFont valuefont = valueLabel->font();
     QFont titlefont = titleLabel->font();
     valuefont.setPixelSize(this->height() / 2.0);
@@ -34,8 +37,38 @@ void UASQuickViewTextItem::resizeEvent(QResizeEvent *event)
 {
     QFont valuefont = valueLabel->font();
     QFont titlefont = titleLabel->font();
-    valuefont.setPixelSize(this->height() / 2.0);
-    titlefont.setPixelSize(this->height() / 4.0);
+    valuefont.setPixelSize(this->height());
+    titlefont.setPixelSize(valuefont.pixelSize() / 2.0);
+
+    QFontMetrics metrics(valuefont);
+    //valuefont.setPixelSize(this->height() / 2.0);
+    bool fit = false;
+    while (!fit)
+    {
+
+        QFontMetrics valfm( valuefont );
+        QRect valbound = valfm.boundingRect(0,0, valueLabel->width(), valueLabel->height(), Qt::TextWordWrap | Qt::AlignLeft, valueLabel->text());
+        //QFontMetrics titlefm( titlefont );
+        //QRect titlebound = titlefm.boundingRect(0,0, titleLabel->width(), titleLabel->height(), Qt::TextWordWrap | Qt::AlignLeft, titleLabel->text());
+
+        if ((valbound.width() <= valueLabel->width() && valbound.height() <= valueLabel->height()))// && (titlebound.width() <= titleLabel->width() && titlebound.height() <= titleLabel->height()))
+            fit = true;
+        else
+        {
+            if (valuefont.pixelSize()-5 <= 0)
+            {
+                fit = true;
+                valuefont.setPixelSize(5);
+            }
+            else
+            {
+                valuefont.setPixelSize(valuefont.pixelSize() - 5);
+            }
+            //titlefont.setPixelSize(valuefont.pixelSize() / 2.0);
+            //qDebug() << "Point size:" << valuefont.pixelSize() << valueLabel->width() << valueLabel->height();
+        }
+    }
+titlefont.setPixelSize(valuefont.pixelSize() / 2.0);
     valueLabel->setFont(valuefont);
     titleLabel->setFont(titlefont);
     update();