diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp
index acfd53433..e0a6bf671 100644
--- a/plugins/channelrx/demoddatv/datvdemodgui.cpp
+++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp
@@ -160,7 +160,6 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba
     m_intLastDecodedData=0;
     m_intLastSpeed=0;
     m_intReadyDecodedData=0;
-    m_blnButtonPlayClicked=false;
     m_objTimer.setInterval(1000);
     connect(&m_objTimer, SIGNAL(timeout()), this, SLOT(tick()));
     m_objTimer.start();
@@ -557,7 +556,7 @@ void DATVDemodGUI::on_chkHardMetric_clicked()
     applySettings();
 }
 
-void DATVDemodGUI::on_pushButton_2_clicked()
+void DATVDemodGUI::on_resetDefaults_clicked()
 {
     resetToDefaults();
 }
@@ -579,22 +578,9 @@ void DATVDemodGUI::on_chkAllowDrift_clicked()
      applySettings();
 }
 
-void DATVDemodGUI::on_pushButton_3_clicked()
-{
-
-   m_blnButtonPlayClicked=true;
-
-   if(m_objDATVDemod!=nullptr)
-   {
-       m_objDATVDemod->PlayVideo(true);
-   }
-}
-
-
-void DATVDemodGUI::on_pushButton_4_clicked()
+void DATVDemodGUI::on_fullScreen_clicked()
 {
     ui->screenTV_2->SetFullScreen(true);
-
 }
 
 void DATVDemodGUI::on_mouseEvent(QMouseEvent* obj)
@@ -705,8 +691,8 @@ void DATVDemodGUI::displayRRCParameters(bool blnVisible)
 {
     ui->spiRollOff->setVisible(blnVisible);
     ui->spiExcursion->setVisible(blnVisible);
-    ui->label_5->setVisible(blnVisible);
-    ui->label_6->setVisible(blnVisible);
+    ui->rollOffLabel->setVisible(blnVisible);
+    ui->excursionLabel->setVisible(blnVisible);
 }
 
 void DATVDemodGUI::on_cmbFilter_currentIndexChanged(int index)
diff --git a/plugins/channelrx/demoddatv/datvdemodgui.h b/plugins/channelrx/demoddatv/datvdemodgui.h
index 5d64516c3..43d13b922 100644
--- a/plugins/channelrx/demoddatv/datvdemodgui.h
+++ b/plugins/channelrx/demoddatv/datvdemodgui.h
@@ -76,12 +76,11 @@ private slots:
     void on_cmbFEC_currentIndexChanged(const QString &arg1);
     void on_chkViterbi_clicked();
     void on_chkHardMetric_clicked();
-    void on_pushButton_2_clicked();
+    void on_resetDefaults_clicked();
     void on_spiSymbolRate_valueChanged(int arg1);
     void on_spiNotchFilters_valueChanged(int arg1);
     void on_chkAllowDrift_clicked();
-    void on_pushButton_3_clicked();
-    void on_pushButton_4_clicked();
+    void on_fullScreen_clicked();
     void on_mouseEvent(QMouseEvent* obj);
     void on_StreamDataAvailable(int *intPackets, int *intBytes, int *intPercent, qint64 *intTotalReceived);
     void on_StreamMetaDataChanged(DataTSMetaData2 *objMetaData);
diff --git a/plugins/channelrx/demoddatv/datvdemodgui.ui b/plugins/channelrx/demoddatv/datvdemodgui.ui
index 457259acc..663bc2565 100644
--- a/plugins/channelrx/demoddatv/datvdemodgui.ui
+++ b/plugins/channelrx/demoddatv/datvdemodgui.ui
@@ -454,7 +454,7 @@
         <string>HARD METRIC</string>
        </property>
       </widget>
-      <widget class="QLabel" name="label">
+      <widget class="QLabel" name="sSecLabel">
        <property name="geometry">
         <rect>
          <x>100</x>
@@ -499,7 +499,7 @@
         <number>32</number>
        </property>
       </widget>
-      <widget class="QLabel" name="label_3">
+      <widget class="QLabel" name="notchFilterLabel">
        <property name="geometry">
         <rect>
          <x>100</x>
@@ -544,7 +544,7 @@
         <string>Data: 0</string>
        </property>
       </widget>
-      <widget class="QPushButton" name="pushButton_2">
+      <widget class="QPushButton" name="resetDefaults">
        <property name="geometry">
         <rect>
          <x>230</x>
@@ -553,6 +553,9 @@
          <height>22</height>
         </rect>
        </property>
+       <property name="toolTip">
+        <string>Reset to defaults</string>
+       </property>
        <property name="text">
         <string>R</string>
        </property>
@@ -595,7 +598,7 @@
         <string>Speed: 0b/s</string>
        </property>
       </widget>
-      <widget class="QLabel" name="label_4">
+      <widget class="QLabel" name="bufferLabel">
        <property name="geometry">
         <rect>
          <x>10</x>
@@ -658,7 +661,7 @@
         <number>35</number>
        </property>
       </widget>
-      <widget class="QLabel" name="label_5">
+      <widget class="QLabel" name="rollOffLabel">
        <property name="geometry">
         <rect>
          <x>106</x>
@@ -671,7 +674,7 @@
         <string>R.off</string>
        </property>
       </widget>
-      <widget class="QLabel" name="label_6">
+      <widget class="QLabel" name="excursionLabel">
        <property name="geometry">
         <rect>
          <x>180</x>
diff --git a/plugins/channelrx/demoddatv/datvideorender.cpp b/plugins/channelrx/demoddatv/datvideorender.cpp
index cfb0f1962..4cbea4253 100644
--- a/plugins/channelrx/demoddatv/datvideorender.cpp
+++ b/plugins/channelrx/demoddatv/datvideorender.cpp
@@ -95,15 +95,13 @@ void DATVideoRender::SetFullScreen(bool fullScreen)
     if (fullScreen == true)
     {
         setWindowFlags(Qt::Window);
-        setWindowState(Qt::WindowFullScreen);
-        show();
+        showFullScreen();
         m_isFullScreen = true;
     }
     else
     {
         setWindowFlags(Qt::Widget);
-        setWindowState(Qt::WindowNoState);
-        show();
+        showNormal();
         m_isFullScreen = false;
     }
 }