diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 7f5aeb1..3eb6a33 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -585,12 +585,13 @@ void MainWindow::buildCommonWidgets()
     //createDockWidget(pilotView,quickview,tr("Quick View"),"UAS_INFO_QUICKVIEW_DOCKWIDGET",VIEW_FLIGHT,Qt::LeftDockWidgetArea);
 
     QGCTabbedInfoView *infoview = new QGCTabbedInfoView(this);
+    infoview->addSource(mavlinkDecoder);
     createDockWidget(pilotView,infoview,tr("Info View"),"UAS_INFO_INFOVIEW_DOCKWIDGET",VIEW_FLIGHT,Qt::LeftDockWidgetArea);
 
 
-    UASRawStatusView *view = new UASRawStatusView();
-    view->setDecoder(mavlinkDecoder);
-    view->show();
+    //UASRawStatusView *view = new UASRawStatusView();
+    //view->setDecoder(mavlinkDecoder);
+    //view->show();
     //hddisplay->addSource(mavlinkDecoder);
     //createDockWidget(pilotView,new HSIDisplay(this),tr("Horizontal Situation"),"HORIZONTAL_SITUATION_INDICATOR_DOCKWIDGET",VIEW_FLIGHT,Qt::LeftDockWidgetArea);
     //pilotView->setTabPosition(Qt::LeftDockWidgetArea,QTabWidget::North);
diff --git a/src/ui/QGCTabbedInfoView.cpp b/src/ui/QGCTabbedInfoView.cpp
index 8230afa..8958a0d 100644
--- a/src/ui/QGCTabbedInfoView.cpp
+++ b/src/ui/QGCTabbedInfoView.cpp
@@ -1,12 +1,20 @@
 #include "QGCTabbedInfoView.h"
-#include <UASActionsWidget.h>
-#include <UASQuickView.h>
 
 QGCTabbedInfoView::QGCTabbedInfoView(QWidget *parent) : QWidget(parent)
 {
     ui.setupUi(this);
-    ui.tabWidget->addTab(new UASQuickView(this),"Quick");
-    ui.tabWidget->addTab(new UASActionsWidget(this),"Actions");
+    actionsWidget = new UASActionsWidget(this);
+    quickView = new UASQuickView(this);\
+    rawView = new UASRawStatusView(this);
+    ui.tabWidget->addTab(quickView,"Quick");
+    ui.tabWidget->addTab(actionsWidget,"Actions");
+    ui.tabWidget->addTab(rawView,"Status");
+}
+void QGCTabbedInfoView::addSource(MAVLinkDecoder *decoder)
+{
+    m_decoder = decoder;
+    rawView->addSource(decoder);
+    quickView->addSource(decoder);
 }
 
 QGCTabbedInfoView::~QGCTabbedInfoView()
diff --git a/src/ui/QGCTabbedInfoView.h b/src/ui/QGCTabbedInfoView.h
index 4f26ad7..a4c93a7 100644
--- a/src/ui/QGCTabbedInfoView.h
+++ b/src/ui/QGCTabbedInfoView.h
@@ -3,7 +3,10 @@
 
 #include <QWidget>
 #include "ui_QGCTabbedInfoView.h"
-
+#include "MAVLinkDecoder.h"
+#include "UASActionsWidget.h"
+#include "UASQuickView.h"
+#include "UASRawStatusView.h"
 class QGCTabbedInfoView : public QWidget
 {
     Q_OBJECT
@@ -11,9 +14,13 @@ class QGCTabbedInfoView : public QWidget
 public:
     explicit QGCTabbedInfoView(QWidget *parent = 0);
     ~QGCTabbedInfoView();
-    
+    void addSource(MAVLinkDecoder *decoder);
 private:
+    MAVLinkDecoder *m_decoder;
     Ui::QGCTabbedInfoView ui;
+    UASActionsWidget *actionsWidget;
+    UASQuickView *quickView;
+    UASRawStatusView *rawView;
 };
 
 #endif // QGCTABBEDINFOVIEW_H
diff --git a/src/ui/UASRawStatusView.cpp b/src/ui/UASRawStatusView.cpp
index d8e76f3..21fa58a 100644
--- a/src/ui/UASRawStatusView.cpp
+++ b/src/ui/UASRawStatusView.cpp
@@ -15,7 +15,7 @@ UASRawStatusView::UASRawStatusView(QWidget *parent) : QWidget(parent)
     connect(timer,SIGNAL(timeout()),this,SLOT(updateTableTimerTick()));
     timer->start(2000);
 }
-void UASRawStatusView::setDecoder(MAVLinkDecoder *decoder)
+void UASRawStatusView::addSource(MAVLinkDecoder *decoder)
 {
     connect(decoder,SIGNAL(valueChanged(int,QString,QString,double,quint64)),this,SLOT(valueChanged(int,QString,QString,double,quint64)));
     connect(decoder,SIGNAL(valueChanged(int,QString,QString,qint8,quint64)),this,SLOT(valueChanged(int,QString,QString,qint8,quint64)));
diff --git a/src/ui/UASRawStatusView.h b/src/ui/UASRawStatusView.h
index 514c67a..cc38281 100644
--- a/src/ui/UASRawStatusView.h
+++ b/src/ui/UASRawStatusView.h
@@ -12,7 +12,7 @@ class UASRawStatusView : public QWidget
 public:
     explicit UASRawStatusView(QWidget *parent = 0);
     ~UASRawStatusView();
-    void setDecoder(MAVLinkDecoder *decoder);
+    void addSource(MAVLinkDecoder *decoder);
 private slots:
     void updateTableTimerTick();
     void valueChanged(const int uasId, const QString& name, const QString& unit, const quint8 value, const quint64 msec);
diff --git a/src/ui/uas/UASActionsWidget.h b/src/ui/uas/UASActionsWidget.h
index 17ba175..a6f256d 100644
--- a/src/ui/uas/UASActionsWidget.h
+++ b/src/ui/uas/UASActionsWidget.h
@@ -12,7 +12,6 @@ class UASActionsWidget : public QWidget
 public:
     explicit UASActionsWidget(QWidget *parent = 0);
     ~UASActionsWidget();
-    
 private:
     Ui::UASActionsWidget ui;
     UASInterface *m_uas;