diff --git a/src/dlgprefsounddlg.ui b/src/dlgprefsounddlg.ui
index 45f786d6ff7..13a66a54911 100644
--- a/src/dlgprefsounddlg.ui
+++ b/src/dlgprefsounddlg.ui
@@ -16,6 +16,9 @@
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="1">
+      <widget class="QComboBox" name="apiComboBox"/>
+     </item>
      <item row="8" column="0">
       <widget class="QLabel" name="headDelayLabel">
        <property name="text">
@@ -46,16 +49,6 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="apiComboBox"/>
-     </item>
-     <item row="10" column="1">
-      <widget class="QLabel" name="currentLatency">
-       <property name="text">
-        <string>20 ms</string>
-       </property>
-      </widget>
-     </item>
      <item row="1" column="0">
       <widget class="QLabel" name="sampleRateLabel">
        <property name="text">
@@ -66,18 +59,18 @@
        </property>
       </widget>
      </item>
-     <item row="12" column="0">
+     <item row="10" column="0">
       <spacer name="outputVSpacer_3">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
        <property name="sizeType">
-        <enum>QSizePolicy::Preferred</enum>
+        <enum>QSizePolicy::MinimumExpanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
-         <height>40</height>
+         <height>1</height>
         </size>
        </property>
       </spacer>
@@ -85,26 +78,6 @@
      <item row="1" column="1">
       <widget class="QComboBox" name="sampleRateComboBox"/>
      </item>
-     <item row="10" column="0">
-      <widget class="QLabel" name="latencyLabel">
-       <property name="text">
-        <string>Known Latency</string>
-       </property>
-       <property name="buddy">
-        <cstring>audioBufferComboBox</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="11" column="0">
-      <widget class="QLabel" name="underflowLabel">
-       <property name="text">
-        <string>Buffer Underflow Count</string>
-       </property>
-       <property name="buddy">
-        <cstring>audioBufferComboBox</cstring>
-       </property>
-      </widget>
-     </item>
      <item row="2" column="1">
       <widget class="QComboBox" name="audioBufferComboBox"/>
      </item>
@@ -118,13 +91,6 @@
        </property>
       </widget>
      </item>
-     <item row="11" column="1">
-      <widget class="QLabel" name="bufferUnderflowCount">
-       <property name="text">
-        <string>0</string>
-       </property>
-      </widget>
-     </item>
      <item row="8" column="1">
       <widget class="QDoubleSpinBox" name="headDelaySpinBox">
        <property name="suffix">
@@ -200,8 +166,45 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="Line" name="line_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="buttonsHLayout">
+     <item>
+      <widget class="QPushButton" name="queryButton">
+       <property name="text">
+        <string>Query Devices</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="buttonsHSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
    <item>
     <widget class="QTabWidget" name="ioTabs">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
@@ -215,10 +218,13 @@
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::MinimumExpanding</enum>
+         </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>40</height>
+           <height>1</height>
           </size>
          </property>
         </spacer>
@@ -235,10 +241,13 @@
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::MinimumExpanding</enum>
+         </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>40</height>
+           <height>1</height>
           </size>
          </property>
         </spacer>
@@ -250,69 +259,86 @@
    <item>
     <widget class="QGroupBox" name="Hints">
      <property name="title">
-      <string>Hints</string>
+      <string>Hints and Diagnostics</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_6">
-      <item row="5" column="0">
-       <widget class="QLabel" name="limitsHint">
+      <item row="0" column="0" colspan="2">
+       <widget class="QLabel" name="underflowCounterHint">
         <property name="text">
-         <string>Enable Real-Time scheduling (currently disabled), see the &lt;a href=&quot;http://www.mixxx.org/wiki/doku.php/troubleshooting?s[]=limits&quot;&gt;Mixxx Wiki&lt;/a&gt;.</string>
+         <string>Enlarge your audio buffer if the underflow counter is increasing or you hear pops during playback.</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
-        <property name="openExternalLinks">
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="underflowCounterHint">
+      <item row="1" column="0" colspan="2">
+       <widget class="QLabel" name="audioBufferHint">
         <property name="text">
-         <string>Enlarge your audio buffer if the underflow counter is increasing or you hear pops during playback.</string>
+         <string>Downsize your audio buffer to improve Mixxx's responsiveness.</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="audioBufferHint">
+      <item row="2" column="0" colspan="2">
+       <widget class="QLabel" name="limitsHint">
         <property name="text">
-         <string>Downsize your audio buffer to improve Mixxx's responsiveness.</string>
+         <string>Enable Real-Time scheduling (currently disabled), see the &lt;a href=&quot;http://www.mixxx.org/wiki/doku.php/troubleshooting?s[]=limits&quot;&gt;Mixxx Wiki&lt;/a&gt;.</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
+        <property name="openExternalLinks">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
+      <item row="3" column="0" colspan="2">
+       <widget class="Line" name="line">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+        <widget class="QLabel" name="latencyLabel">
+         <property name="text">
+          <string>System Reported Latency</string>
+         </property>
+         <property name="buddy">
+          <cstring>audioBufferComboBox</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QLabel" name="currentLatency">
+         <property name="text">
+          <string>20 ms</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="underflowLabel">
+         <property name="text">
+          <string>Buffer Underflow Count</string>
+         </property>
+         <property name="buddy">
+          <cstring>audioBufferComboBox</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QLabel" name="bufferUnderflowCount">
+         <property name="text">
+          <string>0</string>
+         </property>
+        </widget>
+       </item>
      </layout>
     </widget>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="buttonsHLayout">
-     <item>
-      <widget class="QPushButton" name="queryButton">
-       <property name="text">
-        <string>Query Devices</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="buttonsHSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
diff --git a/src/dlgprefwaveformdlg.ui b/src/dlgprefwaveformdlg.ui
index b941c9a47bb..8d52751a9a0 100644
--- a/src/dlgprefwaveformdlg.ui
+++ b/src/dlgprefwaveformdlg.ui
@@ -147,7 +147,7 @@
         <string/>
        </property>
        <property name="text">
-        <string>OpenGl status</string>
+        <string>OpenGL status</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>