diff --git a/desktop-widgets/filterwidget2.ui b/desktop-widgets/filterwidget2.ui
index 6a4345c43..0b95f7bae 100644
--- a/desktop-widgets/filterwidget2.ui
+++ b/desktop-widgets/filterwidget2.ui
@@ -21,10 +21,10 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="4" colspan="6">
+   <item row="8" column="4" colspan="2">
     <widget class="QLineEdit" name="tags"/>
    </item>
-   <item row="1" column="2">
+   <item row="1" column="1">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>Min</string>
@@ -38,7 +38,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="7">
+   <item row="3" column="4">
     <widget class="QLabel" name="label_13">
      <property name="text">
       <string>Max</string>
@@ -59,17 +59,17 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="6">
+   <item row="3" column="2">
     <widget class="QDoubleSpinBox" name="minWaterTemp"/>
    </item>
-   <item row="2" column="7">
+   <item row="2" column="4">
     <widget class="QLabel" name="label_16">
      <property name="text">
       <string>Max</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="2">
+   <item row="3" column="1">
     <widget class="QLabel" name="label_12">
      <property name="text">
       <string>Min</string>
@@ -90,14 +90,14 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="2">
+   <item row="4" column="1">
     <widget class="QLabel" name="label_17">
      <property name="text">
       <string>Min</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="8">
+   <item row="3" column="5">
     <widget class="QDoubleSpinBox" name="maxWaterTemp"/>
    </item>
    <item row="2" column="0">
@@ -107,21 +107,21 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="2">
+   <item row="2" column="1">
     <widget class="QLabel" name="label_14">
      <property name="text">
       <string>Min</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="7">
+   <item row="1" column="4">
     <widget class="QLabel" name="label_15">
      <property name="text">
       <string>Max</string>
      </property>
     </widget>
    </item>
-   <item row="10" column="4" colspan="6">
+   <item row="10" column="4" colspan="2">
     <widget class="QLineEdit" name="location"/>
    </item>
    <item row="11" column="0">
@@ -131,13 +131,13 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="6">
+   <item row="4" column="2">
     <widget class="QDoubleSpinBox" name="minAirTemp"/>
    </item>
-   <item row="4" column="8">
+   <item row="4" column="5">
     <widget class="QDoubleSpinBox" name="maxAirTemp"/>
    </item>
-   <item row="11" column="4" colspan="6">
+   <item row="11" column="4" colspan="2">
     <widget class="QLineEdit" name="equipment"/>
    </item>
    <item row="3" column="0">
@@ -147,10 +147,10 @@
      </property>
     </widget>
    </item>
-   <item row="9" column="4" colspan="6">
+   <item row="9" column="4" colspan="2">
     <widget class="QLineEdit" name="people"/>
    </item>
-   <item row="4" column="7">
+   <item row="4" column="4">
     <widget class="QLabel" name="label_18">
      <property name="text">
       <string>Max</string>
@@ -171,7 +171,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="8">
+   <item row="2" column="5">
     <widget class="StarWidget" name="maxVisibility" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -184,7 +184,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="6">
+   <item row="2" column="2">
     <widget class="StarWidget" name="minVisibility" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -197,7 +197,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="6">
+   <item row="1" column="2">
     <widget class="StarWidget" name="minRating" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -210,7 +210,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="8">
+   <item row="1" column="5">
     <widget class="StarWidget" name="maxRating" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -223,7 +223,7 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="2">
+   <item row="7" column="1">
     <widget class="QCheckBox" name="logged">
      <property name="text">
       <string>Logged</string>
@@ -233,7 +233,7 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="6">
+   <item row="7" column="4">
     <widget class="QCheckBox" name="planned">
      <property name="text">
       <string>Planned</string>
@@ -243,27 +243,27 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="7">
+   <item row="5" column="4">
     <widget class="QTimeEdit" name="fromTime"/>
    </item>
-   <item row="5" column="2" colspan="5">
+   <item row="5" column="1" colspan="2">
     <widget class="QDateTimeEdit" name="fromDate">
      <property name="calendarPopup">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="6" column="2" colspan="5">
+   <item row="6" column="1" colspan="2">
     <widget class="QDateTimeEdit" name="toDate">
      <property name="calendarPopup">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="6" column="7">
+   <item row="6" column="4">
     <widget class="QTimeEdit" name="toTime"/>
    </item>
-   <item row="0" column="3">
+   <item row="0" column="2">
     <widget class="QToolButton" name="close">
      <property name="toolTip">
       <string>Close and reset filters</string>
@@ -277,7 +277,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="2">
+   <item row="0" column="1">
     <widget class="QToolButton" name="clear">
      <property name="toolTip">
       <string>Reset filters</string>
@@ -291,7 +291,7 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="2">
+   <item row="8" column="1" colspan="2">
     <widget class="QComboBox" name="tagsMode">
      <item>
       <property name="text">
@@ -305,7 +305,7 @@
      </item>
     </widget>
    </item>
-   <item row="9" column="2">
+   <item row="9" column="1" colspan="2">
     <widget class="QComboBox" name="peopleMode">
      <item>
       <property name="text">
@@ -319,7 +319,7 @@
      </item>
     </widget>
    </item>
-   <item row="10" column="2">
+   <item row="10" column="1" colspan="2">
     <widget class="QComboBox" name="locationMode">
      <item>
       <property name="text">
@@ -333,7 +333,7 @@
      </item>
     </widget>
    </item>
-   <item row="11" column="2">
+   <item row="11" column="1" colspan="2">
     <widget class="QComboBox" name="equipmentMode">
      <item>
       <property name="text">