diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.ui b/plugins/samplesource/sdrdaemon/sdrdaemongui.ui
index 7c1eacd41..c3a674f80 100644
--- a/plugins/samplesource/sdrdaemon/sdrdaemongui.ui
+++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.ui
@@ -176,6 +176,16 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="streamLayout">
+     <item>
+      <widget class="ButtonSwitch" name="autoFollowRate">
+       <property name="toolTip">
+        <string>Follow stream sample rate automatically</string>
+       </property>
+       <property name="text">
+        <string>Auto</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QLabel" name="frameSizeText">
        <property name="minimumSize">
@@ -211,7 +221,7 @@
         </size>
        </property>
        <property name="toolTip">
-        <string>Nominal sample rate from stream data (kS/s)</string>
+        <string>Nominal sample rate from stream meta data (kS/s)</string>
        </property>
        <property name="text">
         <string>0000.00</string>
@@ -293,16 +303,6 @@
        </property>
       </spacer>
      </item>
-     <item>
-      <widget class="ButtonSwitch" name="autoFollowRate">
-       <property name="toolTip">
-        <string>Follow stream sample rate automatically</string>
-       </property>
-       <property name="text">
-        <string>Auto</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
@@ -314,23 +314,6 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="lz4Layout">
-     <item>
-      <widget class="QToolButton" name="lz4Compressed">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="toolTip">
-        <string>Stream is compressed with LZ4</string>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../../sdrbase/resources/res.qrc">
-         <normaloff>:/compressed.png</normaloff>:/compressed.png</iconset>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QToolButton" name="streamLocked">
        <property name="enabled">
@@ -348,6 +331,23 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QToolButton" name="lz4Compressed">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="toolTip">
+        <string>Stream is compressed with LZ4</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../sdrbase/resources/res.qrc">
+         <normaloff>:/compressed.png</normaloff>:/compressed.png</iconset>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QLabel" name="compressionRatioText">
        <property name="minimumSize">