diff --git a/sdrbase/gui/glspectrum.cpp b/sdrbase/gui/glspectrum.cpp
index 7ad1213e0..d4cf15242 100644
--- a/sdrbase/gui/glspectrum.cpp
+++ b/sdrbase/gui/glspectrum.cpp
@@ -855,7 +855,7 @@ void GLSpectrum::paintGL()
 		glPopMatrix();
 	}
 
-	// paint histogram grid
+	// TODO: paint histogram grid
 	if((m_displayHistogram || m_displayMaxHold || m_displayCurrent) && (m_displayGrid)) {
 		glEnable(GL_BLEND);
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -876,8 +876,8 @@ void GLSpectrum::paintGL()
 				if(tick->textSize > 0) {
 					float y = tick->pos / m_powerScale.getSize();
 					glBegin(GL_LINE_LOOP);
-					glVertex2f(0, y);
-					glVertex2f(1, y);
+					glVertex2f(0, 1-y);
+					glVertex2f(1, 1-y);
 					glEnd();
 				}
 			}
diff --git a/sdrbase/gui/glspectrumgui.ui b/sdrbase/gui/glspectrumgui.ui
index 0cdff7145..655d3ab96 100644
--- a/sdrbase/gui/glspectrumgui.ui
+++ b/sdrbase/gui/glspectrumgui.ui
@@ -285,41 +285,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="ButtonSwitch" name="waterfall">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Display waterfall</string>
-       </property>
-       <property name="text">
-        <string>Waterfall</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../resources/res.qrc">
-         <normaloff>:/waterfall.png</normaloff>:/waterfall.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="ButtonSwitch" name="histogram">
        <property name="sizePolicy">
@@ -460,6 +425,41 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="ButtonSwitch" name="waterfall">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Display waterfall</string>
+       </property>
+       <property name="text">
+        <string>Waterfall</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../resources/res.qrc">
+         <normaloff>:/waterfall.png</normaloff>:/waterfall.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="ButtonSwitch" name="grid">
        <property name="sizePolicy">
@@ -536,7 +536,6 @@
   <tabstop>fftSize</tabstop>
   <tabstop>refLevel</tabstop>
   <tabstop>levelRange</tabstop>
-  <tabstop>waterfall</tabstop>
   <tabstop>histogram</tabstop>
   <tabstop>maxHold</tabstop>
   <tabstop>invert</tabstop>