diff --git a/qt-ui/maintab.ui b/qt-ui/maintab.ui
index 9551ed511..03784e456 100644
--- a/qt-ui/maintab.ui
+++ b/qt-ui/maintab.ui
@@ -18,6 +18,21 @@
     <string>Dive notes</string>
    </attribute>
    <layout class="QGridLayout" name="gridLayout_3">
+    <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>
+    <property name="spacing">
+     <number>0</number>
+    </property>
     <item row="2" column="1">
      <widget class="KMessageWidget" name="diveNotesMessage" native="true"/>
     </item>
@@ -37,11 +52,26 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>421</width>
-         <height>751</height>
+         <width>435</width>
+         <height>770</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_2">
+        <property name="leftMargin">
+         <number>6</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>6</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <property name="spacing">
+         <number>0</number>
+        </property>
         <item row="0" column="0">
          <widget class="QLabel" name="label_2">
           <property name="text">
@@ -58,6 +88,9 @@
         </item>
         <item row="0" column="2">
          <layout class="QHBoxLayout" name="temperatureLabels">
+          <property name="spacing">
+           <number>0</number>
+          </property>
           <item>
            <widget class="QLabel" name="airTempLabel">
             <property name="text">
@@ -99,6 +132,9 @@
         </item>
         <item row="1" column="2">
          <layout class="QHBoxLayout" name="airWaterTempLayout">
+          <property name="spacing">
+           <number>0</number>
+          </property>
           <item>
            <widget class="QLineEdit" name="airtemp">
             <property name="readOnly">
@@ -159,6 +195,9 @@
         </item>
         <item row="8" column="0" colspan="2">
          <layout class="QHBoxLayout" name="ratingVisibilityLabels">
+          <property name="spacing">
+           <number>0</number>
+          </property>
           <item>
            <widget class="QLabel" name="RatingLabel">
             <property name="sizePolicy">
@@ -217,6 +256,9 @@
         </item>
         <item row="9" column="0" colspan="2">
          <layout class="QHBoxLayout" name="ratingVisibilityWidgets">
+          <property name="spacing">
+           <number>0</number>
+          </property>
           <item>
            <widget class="StarWidget" name="rating" native="true">
             <property name="sizePolicy">
@@ -302,7 +344,16 @@
              <property name="spacing">
               <number>0</number>
              </property>
-             <property name="margin">
+             <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>
@@ -373,12 +424,21 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>421</width>
-         <height>751</height>
+         <width>423</width>
+         <height>752</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_5">
-        <property name="margin">
+        <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>
         <property name="spacing">
@@ -390,7 +450,16 @@
            <property name="spacing">
             <number>0</number>
            </property>
-           <property name="margin">
+           <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>
@@ -435,12 +504,21 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>421</width>
-         <height>751</height>
+         <width>423</width>
+         <height>752</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_6">
-        <property name="margin">
+        <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>
         <property name="spacing">
@@ -755,12 +833,21 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>421</width>
-         <height>751</height>
+         <width>423</width>
+         <height>752</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_7">
-        <property name="margin">
+        <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>
         <property name="spacing">