diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp
index a4314410..a181f5f9 100755
--- a/src/audiomixerboard.cpp
+++ b/src/audiomixerboard.cpp
@@ -219,8 +219,7 @@ CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags f ) :
     QGroupBox ( parent )
 {
     // set title text and title properties
-    setTitle ( "Server Mixer" );
-    setAlignment ( Qt::AlignHCenter );
+    setTitle ( "Server" );
 
     // add hboxlayout
     pMainLayout = new QHBoxLayout ( this );
diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp
index b23a8f6e..1d1693ba 100755
--- a/src/llconclientdlg.cpp
+++ b/src/llconclientdlg.cpp
@@ -80,7 +80,6 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
         "With these radio buttons the audio input channel on which the "
         "reverberation effect is applied can be chosen. Either the left "
         "or right input channel can be selected." );
-    TextLabelReverbSelection->setWhatsThis ( strRevChanSel );
     RadioButtonRevSelL->setWhatsThis       ( strRevChanSel );
     RadioButtonRevSelR->setWhatsThis       ( strRevChanSel );
 
diff --git a/src/llconclientdlgbase.ui b/src/llconclientdlgbase.ui
index 977820ab..7de7de24 100755
--- a/src/llconclientdlgbase.ui
+++ b/src/llconclientdlgbase.ui
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>531</width>
+    <width>483</width>
     <height>324</height>
    </rect>
   </property>
@@ -345,159 +345,24 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="GroupBoxReverberation" >
+    <widget class="QGroupBox" name="groupBoxLocal" >
      <property name="title" >
-      <string>Reverb</string>
+      <string>Local</string>
      </property>
      <layout class="QVBoxLayout" >
-      <item>
-       <widget class="QLabel" name="TextLabelReverbSelection" >
-        <property name="text" >
-         <string>Channel
-Selection</string>
-        </property>
-        <property name="alignment" >
-         <set>Qt::AlignCenter</set>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="RadioButtonRevSelL" >
-        <property name="text" >
-         <string>Left</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="RadioButtonRevSelR" >
-        <property name="text" >
-         <string>Right</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <layout class="QVBoxLayout" >
         <property name="spacing" >
-         <number>6</number>
-        </property>
-        <property name="leftMargin" >
          <number>0</number>
         </property>
-        <property name="topMargin" >
-         <number>0</number>
-        </property>
-        <property name="rightMargin" >
-         <number>0</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="TextLabelAudReverb" >
-          <property name="text" >
-           <string>Level</string>
-          </property>
-          <property name="alignment" >
-           <set>Qt::AlignCenter</set>
-          </property>
-          <property name="wordWrap" >
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>0</number>
-          </property>
-          <property name="topMargin" >
-           <number>0</number>
-          </property>
-          <property name="rightMargin" >
-           <number>0</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>0</number>
-          </property>
-          <item>
-           <spacer>
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType" >
-             <enum>QSizePolicy::Minimum</enum>
-            </property>
-            <property name="sizeHint" >
-             <size>
-              <width>0</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QSlider" name="SliderAudReverb" >
-            <property name="pageStep" >
-             <number>1</number>
-            </property>
-            <property name="orientation" >
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="tickPosition" >
-             <enum>QSlider::TicksBothSides</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer>
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType" >
-             <enum>QSizePolicy::Minimum</enum>
-            </property>
-            <property name="sizeHint" >
-             <size>
-              <width>0</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="GroupBoxAudioInput" >
-     <property name="title" >
-      <string>Audio Mixer</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <layout class="QVBoxLayout" >
         <item>
          <widget class="QLabel" name="TextAudInFader" >
           <property name="text" >
-           <string>Local
-Audio
-Fader</string>
+           <string>Fader</string>
           </property>
           <property name="alignment" >
            <set>Qt::AlignCenter</set>
           </property>
-          <property name="wordWrap" >
-           <bool>false</bool>
-          </property>
          </widget>
         </item>
         <item>
@@ -586,18 +451,132 @@ Fader</string>
        </layout>
       </item>
       <item>
-       <widget class="CAudioMixerBoard" native="1" name="MainMixerBoard" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+       <layout class="QVBoxLayout" >
+        <property name="spacing" >
+         <number>0</number>
         </property>
-       </widget>
+        <property name="leftMargin" >
+         <number>0</number>
+        </property>
+        <property name="topMargin" >
+         <number>0</number>
+        </property>
+        <property name="rightMargin" >
+         <number>0</number>
+        </property>
+        <property name="bottomMargin" >
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="TextLabelAudReverb" >
+          <property name="text" >
+           <string>Reverb</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" >
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <property name="leftMargin" >
+           <number>0</number>
+          </property>
+          <property name="topMargin" >
+           <number>0</number>
+          </property>
+          <property name="rightMargin" >
+           <number>0</number>
+          </property>
+          <property name="bottomMargin" >
+           <number>0</number>
+          </property>
+          <item>
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType" >
+             <enum>QSizePolicy::Minimum</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>0</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QSlider" name="SliderAudReverb" >
+            <property name="pageStep" >
+             <number>1</number>
+            </property>
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="tickPosition" >
+             <enum>QSlider::TicksBothSides</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType" >
+             <enum>QSizePolicy::Minimum</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>0</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" >
+        <property name="spacing" >
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QRadioButton" name="RadioButtonRevSelL" >
+          <property name="text" >
+           <string>Left</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="RadioButtonRevSelR" >
+          <property name="text" >
+           <string>Right</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="CAudioMixerBoard" native="1" name="MainMixerBoard" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>