diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp
index 1f4c4315..61c13b55 100755
--- a/src/audiomixerboard.cpp
+++ b/src/audiomixerboard.cpp
@@ -35,7 +35,7 @@ CChannelFader::CChannelFader ( QWidget*     pNW,
     pParentLayout ( pNPtLy )
 {
     // create new GUI control objects and store pointers to them
-    pMainGrid = new QGridLayout ( pNW, 2, 1 );
+    pMainGrid = new QGridLayout ( 2, 1 );
     pFader    = new QSlider     ( Qt::Vertical, pNW );
     pLabel    = new QLabel      ( "", pNW );
 
@@ -75,15 +75,20 @@ void CChannelFader::OnValueChanged ( int value )
 
 void CChannelFader::SetText ( const std::string sText )
 {
-    const int iBreakPos = 6;
+    const int iBreakPos = 7;
 
-    // break text at predefined position
+    // break text at predefined position, if text is too short, break anyway to
+    // make sure we have two lines for fader tag
     QString sModText = sText.c_str();
 
     if ( sModText.length() > iBreakPos )
     {
         sModText.insert ( iBreakPos, QString ( "<br>" ) );
     }
+    else
+    {
+        sModText.append ( QString ( "<br>" ) );
+    }
 
     // use bold text
     sModText.prepend ( "<b>" );
diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp
index e47f6f63..384468e6 100755
--- a/src/llconclientdlg.cpp
+++ b/src/llconclientdlg.cpp
@@ -56,7 +56,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
 
     QString strFaderTag = tr("<b>Fader Tag:</b> In this edit control, "
         "the tag string of your fader can be set. This tag will appear "
-        "at your fader on the mixer board.");
+        "at your fader on the mixer board when connected to the server.");
     QWhatsThis::add(TextLabelServerTag, strFaderTag);
     QWhatsThis::add(LineEditFaderTag, strFaderTag);
 
@@ -141,6 +141,10 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
     pSettingsMenu->insertItem ( tr ( "&General Settings..." ), this,
         SLOT ( OnOpenGeneralSettings() ) );
 
+    pSettingsMenu->insertSeparator();
+    pSettingsMenu->insertItem ( tr ( "E&xit" ), this,
+        SLOT ( close() ), CTRL+Key_Q );
+
 
     /* Main menu bar -------------------------------------------------------- */
     pMenu = new QMenuBar ( this );
diff --git a/src/llconclientdlgbase.ui b/src/llconclientdlgbase.ui
index 6913ebf0..f5239249 100755
--- a/src/llconclientdlgbase.ui
+++ b/src/llconclientdlgbase.ui
@@ -11,8 +11,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>580</width>
-            <height>289</height>
+            <width>594</width>
+            <height>319</height>
         </rect>
     </property>
     <property stdset="1">
@@ -340,6 +340,23 @@
                                 <number>15</number>
                             </property>
                         </widget>
+                    </hbox>
+                </widget>
+                <widget>
+                    <class>QLayoutWidget</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Layout10</cstring>
+                    </property>
+                    <hbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
                         <spacer>
                             <property>
                                 <name>name</name>