diff --git a/Readme.md b/Readme.md
index 3194edc3f..154efa1d9 100644
--- a/Readme.md
+++ b/Readme.md
@@ -185,6 +185,7 @@ For Debian Jessie or Stretch:
   - DSB option for SSB
   - Mute option for NFM channel
   - New Broadcast FM demodulator with stereo support
+  - RDS support in Broadcast FM demodulator
   
 <h2>Major redesign</h2>
 
@@ -213,7 +214,6 @@ For Debian Jessie or Stretch:
   - Allow arbitrary sample rate for channelizers and demodulators (not multiple of 48 kHz). Prerequisite for polyphase channelizer
   - Implement polyphase channelizer
   - Level calibration  
-  - Enhance Broadcast FM with RDS
   - Even more demods ...
   
 <h1>Developper's notes</h1>
diff --git a/plugins/channel/bfm/bfmdemodgui.cpp b/plugins/channel/bfm/bfmdemodgui.cpp
index 65c707658..9daf0acc5 100644
--- a/plugins/channel/bfm/bfmdemodgui.cpp
+++ b/plugins/channel/bfm/bfmdemodgui.cpp
@@ -414,11 +414,11 @@ void BFMDemodGUI::channelSampleRateChanged()
 void BFMDemodGUI::rdsUpdate()
 {
 	// Quality metrics
-	ui->demodQText->setText(QString::number(m_bfmDemod->getDemodQua(), 'f', 0));
-	ui->decoderQText->setText(QString("%1").arg(m_bfmDemod->getDecoderQua()));
+	ui->demodQText->setText(QString("%1 %").arg(m_bfmDemod->getDemodQua(), 0, 'f', 0));
+	ui->decoderQText->setText(QString("%1 %").arg(m_bfmDemod->getDecoderQua(), 0, 'f', 0));
 	Real accDb = CalcDb::dbPower(std::fabs(m_bfmDemod->getDemodAcc()));
-	ui->accumText->setText(QString::number(accDb, 'f', 1));
-	ui->fclkText->setText(QString::number(m_bfmDemod->getDemodFclk(), 'f', 2));
+	ui->accumText->setText(QString("%1 dB").arg(accDb, 0, 'f', 1));
+	ui->fclkText->setText(QString("%1 Hz").arg(m_bfmDemod->getDemodFclk(), 0, 'f', 2));
 
 	// PI group
 	if (m_rdsParser.m_pi_updated)
diff --git a/plugins/channel/bfm/bfmdemodgui.ui b/plugins/channel/bfm/bfmdemodgui.ui
index 7e56ebb1f..fc661010b 100644
--- a/plugins/channel/bfm/bfmdemodgui.ui
+++ b/plugins/channel/bfm/bfmdemodgui.ui
@@ -470,7 +470,7 @@
          </size>
         </property>
         <property name="text">
-         <string>Dem Q</string>
+         <string>Dem</string>
         </property>
        </widget>
       </item>
@@ -478,43 +478,27 @@
        <widget class="QLabel" name="demodQText">
         <property name="minimumSize">
          <size>
-          <width>20</width>
+          <width>40</width>
           <height>0</height>
          </size>
         </property>
         <property name="maximumSize">
          <size>
-          <width>20</width>
+          <width>40</width>
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>Demodulator (DBPSK) quality </string>
+        </property>
         <property name="text">
-         <string>0</string>
+         <string>0 %</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QLabel" name="demodQUnits">
-        <property name="minimumSize">
-         <size>
-          <width>10</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>10</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>%</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="Line" name="sep1">
         <property name="orientation">
@@ -537,7 +521,7 @@
          </size>
         </property>
         <property name="text">
-         <string>Dec Q</string>
+         <string>Dec</string>
         </property>
        </widget>
       </item>
@@ -545,43 +529,27 @@
        <widget class="QLabel" name="decoderQText">
         <property name="minimumSize">
          <size>
-          <width>20</width>
+          <width>40</width>
           <height>0</height>
          </size>
         </property>
         <property name="maximumSize">
          <size>
-          <width>20</width>
+          <width>40</width>
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>Decoder (sync) quality</string>
+        </property>
         <property name="text">
-         <string>0</string>
+         <string>0 %</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QLabel" name="decoderQUnits">
-        <property name="minimumSize">
-         <size>
-          <width>10</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>10</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>%</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="Line" name="sep2">
         <property name="orientation">
@@ -612,43 +580,27 @@
        <widget class="QLabel" name="accumText">
         <property name="minimumSize">
          <size>
-          <width>40</width>
+          <width>60</width>
           <height>0</height>
          </size>
         </property>
         <property name="maximumSize">
          <size>
-          <width>40</width>
+          <width>60</width>
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>Sample symbol power</string>
+        </property>
         <property name="text">
-         <string>0</string>
+         <string>0 dB</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QLabel" name="accumUnits">
-        <property name="minimumSize">
-         <size>
-          <width>15</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>15</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>dB</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="Line" name="sep3">
         <property name="orientation">
@@ -679,18 +631,21 @@
        <widget class="QLabel" name="fclkText">
         <property name="minimumSize">
          <size>
-          <width>60</width>
+          <width>80</width>
           <height>0</height>
          </size>
         </property>
         <property name="maximumSize">
          <size>
-          <width>60</width>
+          <width>80</width>
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>Symbol clock frequency</string>
+        </property>
         <property name="text">
-         <string>1187.50</string>
+         <string>1187.50 Hz</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -698,23 +653,17 @@
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="fclkUnits">
-        <property name="minimumSize">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
          <size>
-          <width>15</width>
-          <height>0</height>
+          <width>40</width>
+          <height>20</height>
          </size>
         </property>
-        <property name="maximumSize">
-         <size>
-          <width>15</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Hz</string>
-        </property>
-       </widget>
+       </spacer>
       </item>
      </layout>
     </item>
@@ -736,6 +685,9 @@
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="piCountText">
+        <property name="toolTip">
+         <string>PI groups count</string>
+        </property>
         <property name="text">
          <string>0</string>
         </property>
@@ -750,6 +702,9 @@
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="g00CountText">
+        <property name="toolTip">
+         <string>G0 groups count</string>
+        </property>
         <property name="text">
          <string>0</string>
         </property>
@@ -771,6 +726,9 @@
       </item>
       <item row="1" column="2">
        <widget class="QLabel" name="g01CountText">
+        <property name="toolTip">
+         <string>G1 groups count</string>
+        </property>
         <property name="text">
          <string>0</string>
         </property>
@@ -785,6 +743,9 @@
       </item>
       <item row="1" column="3">
        <widget class="QLabel" name="g02CountText">
+        <property name="toolTip">
+         <string>G2 groups count</string>
+        </property>
         <property name="text">
          <string>0</string>
         </property>
@@ -806,6 +767,9 @@
       </item>
       <item row="1" column="4">
        <widget class="QLabel" name="g03CountText">
+        <property name="toolTip">
+         <string>G3 groups count</string>
+        </property>
         <property name="text">
          <string>0</string>
         </property>
@@ -820,6 +784,9 @@
       </item>
       <item row="1" column="5">
        <widget class="QLabel" name="g04CountText">
+        <property name="toolTip">
+         <string>G4 groups count</string>
+        </property>
         <property name="text">
          <string>0</string>
         </property>
@@ -834,6 +801,9 @@
       </item>
       <item row="1" column="6">
        <widget class="QLabel" name="g05CountText">
+        <property name="toolTip">
+         <string>G5 groups count</string>
+        </property>
         <property name="text">
          <string>0</string>
         </property>
@@ -848,6 +818,9 @@
       </item>
       <item row="1" column="7">
        <widget class="QLabel" name="g06CountText">
+        <property name="toolTip">
+         <string>G6 groups count</string>
+        </property>
         <property name="text">
          <string>0</string>
         </property>
@@ -855,6 +828,9 @@
       </item>
       <item row="1" column="8">
        <widget class="QLabel" name="g07CountText">
+        <property name="toolTip">
+         <string>G7 groups count</string>
+        </property>
         <property name="text">
          <string>0</string>
         </property>
@@ -862,6 +838,9 @@
       </item>
       <item row="1" column="9">
        <widget class="QLabel" name="g08CountText">
+        <property name="toolTip">
+         <string>G8 groups count</string>
+        </property>
         <property name="text">
          <string>0</string>
         </property>
@@ -876,6 +855,9 @@
       </item>
       <item row="1" column="10">
        <widget class="QLabel" name="g09CountText">
+        <property name="toolTip">
+         <string>G9 groups count</string>
+        </property>
         <property name="text">
          <string>0</string>
         </property>
@@ -890,6 +872,9 @@
       </item>
       <item row="1" column="11">
        <widget class="QLabel" name="g14CountText">
+        <property name="toolTip">
+         <string>G14 groups count</string>
+        </property>
         <property name="text">
          <string>0</string>
         </property>
@@ -914,6 +899,9 @@
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>PI updated</string>
+        </property>
         <property name="text">
          <string>PI</string>
         </property>
@@ -934,6 +922,9 @@
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>PI hex code</string>
+        </property>
         <property name="text">
          <string>0000</string>
         </property>
@@ -954,6 +945,9 @@
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>Traffic Program</string>
+        </property>
         <property name="text">
          <string>TP</string>
         </property>
@@ -961,6 +955,9 @@
       </item>
       <item>
        <widget class="QLabel" name="piType">
+        <property name="toolTip">
+         <string>Program type</string>
+        </property>
         <property name="text">
          <string>None</string>
         </property>
@@ -968,6 +965,9 @@
       </item>
       <item>
        <widget class="QLabel" name="piCoverage">
+        <property name="toolTip">
+         <string>Program coverage</string>
+        </property>
         <property name="text">
          <string>Local</string>
         </property>
@@ -985,6 +985,9 @@
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>Group 0 updated</string>
+        </property>
         <property name="text">
          <string>G00</string>
         </property>
@@ -1005,6 +1008,9 @@
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>Program Service Name</string>
+        </property>
         <property name="text">
          <string>........</string>
         </property>
@@ -1025,6 +1031,9 @@
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>Traffic Announcement</string>
+        </property>
         <property name="text">
          <string>TA</string>
         </property>
@@ -1038,6 +1047,9 @@
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>Music/Speech</string>
+        </property>
         <property name="text">
          <string>Music</string>
         </property>
@@ -1051,6 +1063,9 @@
           <height>16777215</height>
          </size>
         </property>
+        <property name="toolTip">
+         <string>Mono/Stereo</string>
+        </property>
         <property name="text">
          <string>Mono</string>
         </property>
@@ -1058,6 +1073,9 @@
       </item>
       <item>
        <widget class="QLabel" name="g00AltFrequencies">
+        <property name="toolTip">
+         <string>Alternate frequencies (MHz)</string>
+        </property>
         <property name="text">
          <string/>
         </property>