diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui
index 899854f86..5bfa53d0e 100644
--- a/qt-ui/maintab.ui
+++ b/qt-ui/maintab.ui
@@ -123,6 +123,12 @@
         </item>
         <item row="8" column="0">
          <widget class="TagWidget" name="divemaster">
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>30</height>
+           </size>
+          </property>
           <property name="readOnly">
            <bool>false</bool>
           </property>
@@ -144,6 +150,12 @@
         </item>
         <item row="8" column="1">
          <widget class="TagWidget" name="buddy">
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>30</height>
+           </size>
+          </property>
           <property name="readOnly">
            <bool>false</bool>
           </property>
@@ -220,6 +232,13 @@
           </item>
          </layout>
         </item>
+        <item row="1" column="0" rowspan="2">
+         <widget class="DateWidget" name="dateEdit" native="true">
+          <property name="focusPolicy">
+           <enum>Qt::StrongFocus</enum>
+          </property>
+         </widget>
+        </item>
         <item row="12" column="0" colspan="2">
          <widget class="TagWidget" name="tagWidget">
           <property name="sizePolicy">
@@ -234,6 +253,12 @@
             <height>0</height>
            </size>
           </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>30</height>
+           </size>
+          </property>
           <property name="verticalScrollBarPolicy">
            <enum>Qt::ScrollBarAlwaysOff</enum>
           </property>
@@ -245,13 +270,6 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="0" rowspan="2">
-         <widget class="DateWidget" name="dateEdit" native="true">
-          <property name="focusPolicy">
-           <enum>Qt::StrongFocus</enum>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>
      </widget>
@@ -282,8 +300,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>100</width>
-         <height>30</height>
+         <width>662</width>
+         <height>642</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_5">
@@ -362,8 +380,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>548</width>
-         <height>395</height>
+         <width>662</width>
+         <height>642</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_6">
@@ -672,8 +690,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>468</width>
-         <height>229</height>
+         <width>662</width>
+         <height>642</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_7">