diff --git a/src/qtgui/advsearch.ui b/src/qtgui/advsearch.ui
index 66596944..a941041c 100644
--- a/src/qtgui/advsearch.ui
+++ b/src/qtgui/advsearch.ui
@@ -42,8 +42,14 @@
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
+                            <property name="margin">
+                                <number>7</number>
+                            </property>
                             <property name="text">
-                                <string>Search For</string>
+                                <string>Search for files&lt;br&gt;having all of:</string>
+                            </property>
+                            <property name="toolTip" stdset="0">
+                                <string>All non blank fields will be combined with AND conjunctions</string>
                             </property>
                         </widget>
                         <widget class="QLayoutWidget">
@@ -54,7 +60,10 @@
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
+                                <property name="margin">
+                                    <number>8</number>
+                                </property>
+                                <widget class="QLabel" row="2" column="0">
                                     <property name="name">
                                         <cstring>orWordsTL</cstring>
                                     </property>
@@ -62,7 +71,7 @@
                                         <string>Any of these words</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit" row="2" column="2">
+                                <widget class="QLineEdit" row="2" column="1">
                                     <property name="name">
                                         <cstring>orWordsLE</cstring>
                                     </property>
@@ -72,15 +81,15 @@
                                         <cstring>textLabel1_2</cstring>
                                     </property>
                                     <property name="text">
-                                        <string>File name</string>
+                                        <string>File name matching</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit" row="4" column="2">
+                                <widget class="QLineEdit" row="4" column="1">
                                     <property name="name">
                                         <cstring>fileNameLE</cstring>
                                     </property>
                                 </widget>
-                                <widget class="QLabel" row="3" column="0" rowspan="1" colspan="2">
+                                <widget class="QLabel" row="3" column="0">
                                     <property name="name">
                                         <cstring>noWordsTL</cstring>
                                     </property>
@@ -88,40 +97,25 @@
                                         <string>None of these words</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit" row="3" column="2">
+                                <widget class="QLineEdit" row="3" column="1">
                                     <property name="name">
                                         <cstring>noWordsLE</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string></string>
-                                    </property>
                                 </widget>
                                 <widget class="QLabel" row="0" column="0">
                                     <property name="name">
                                         <cstring>andWordsTL</cstring>
                                     </property>
-                                    <property name="frameShape">
-                                        <enum>NoFrame</enum>
-                                    </property>
-                                    <property name="frameShadow">
-                                        <enum>Plain</enum>
-                                    </property>
                                     <property name="text">
                                         <string>All these words</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2">
+                                <widget class="QLineEdit" row="0" column="1">
                                     <property name="name">
                                         <cstring>andWordsLE</cstring>
                                     </property>
-                                    <property name="minimumSize">
-                                        <size>
-                                            <width>250</width>
-                                            <height>0</height>
-                                        </size>
-                                    </property>
                                 </widget>
-                                <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
+                                <widget class="QLabel" row="1" column="0">
                                     <property name="name">
                                         <cstring>phraseTL</cstring>
                                     </property>
@@ -129,7 +123,7 @@
                                         <string>This exact phrase</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit" row="1" column="2">
+                                <widget class="QLineEdit" row="1" column="1">
                                     <property name="name">
                                         <cstring>phraseLE</cstring>
                                     </property>