diff --git a/src/gui/group/EditGroupWidgetMain.ui b/src/gui/group/EditGroupWidgetMain.ui
index faa8a30ff..a98e735fd 100644
--- a/src/gui/group/EditGroupWidgetMain.ui
+++ b/src/gui/group/EditGroupWidgetMain.ui
@@ -37,7 +37,7 @@
      <height>523</height>
     </rect>
    </property>
-   <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,0,0,1" rowminimumheight="0,0,0,0,0,0,0,0,0,1">
+   <layout class="QVBoxLayout" name="verticalLayout_3">
     <property name="leftMargin">
      <number>0</number>
     </property>
@@ -50,180 +50,185 @@
     <property name="bottomMargin">
      <number>0</number>
     </property>
-    <property name="horizontalSpacing">
-     <number>10</number>
-    </property>
-    <property name="verticalSpacing">
-     <number>8</number>
-    </property>
-    <item row="3" column="0">
-     <widget class="QCheckBox" name="expireCheck">
-      <property name="accessibleName">
-       <string>Toggle expiration</string>
-      </property>
-      <property name="text">
-       <string>Expires:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="1">
-     <widget class="QLineEdit" name="editName">
-      <property name="accessibleName">
-       <string>Name field</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="1">
-     <widget class="QDateTimeEdit" name="expireDatePicker">
-      <property name="enabled">
-       <bool>false</bool>
-      </property>
-      <property name="accessibleName">
-       <string>Expiration field</string>
-      </property>
-      <property name="calendarPopup">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </item>
-    <item row="6" column="1">
-     <widget class="QRadioButton" name="autoTypeSequenceInherit">
-      <property name="text">
-       <string>Use default Auto-Type sequence of parent group</string>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="0">
-     <widget class="QLabel" name="autotypeLabel">
-      <property name="text">
-       <string>Auto-Type:</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item row="4" column="0">
-     <widget class="QLabel" name="searchLabel">
-      <property name="text">
-       <string>Search:</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item row="5" column="1">
-     <widget class="QComboBox" name="autotypeComboBox">
-      <property name="accessibleName">
-       <string>Auto-Type toggle for this and sub groups</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QLabel" name="labelNotes">
+    <item>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="3" column="0">
+       <widget class="QLabel" name="searchLabel">
         <property name="text">
-         <string>Notes:</string>
+         <string>Search:</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item>
-       <spacer name="verticalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
+      <item row="5" column="1">
+       <widget class="QRadioButton" name="autoTypeSequenceInherit">
+        <property name="text">
+         <string>Use default Auto-Type sequence of parent group</string>
         </property>
-        <property name="sizeHint" stdset="0">
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QComboBox" name="autotypeComboBox">
+        <property name="accessibleName">
+         <string>Auto-Type toggle for this and sub groups</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPlainTextEdit" name="editNotes">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
          <size>
-          <width>20</width>
-          <height>0</height>
+          <width>16777215</width>
+          <height>120</height>
          </size>
         </property>
-       </spacer>
+        <property name="accessibleName">
+         <string>Notes field</string>
+        </property>
+       </widget>
       </item>
-     </layout>
-    </item>
-    <item row="8" column="1">
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="expireCheck">
+        <property name="accessibleName">
+         <string>Toggle expiration</string>
         </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
+        <property name="text">
+         <string>Expires:</string>
         </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>30</width>
-          <height>0</height>
-         </size>
-        </property>
-       </spacer>
+       </widget>
       </item>
-      <item>
-       <widget class="QLineEdit" name="autoTypeSequenceCustomEdit">
+      <item row="3" column="1">
+       <widget class="QComboBox" name="searchComboBox">
+        <property name="accessibleName">
+         <string>Search toggle for this and sub groups</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QDateTimeEdit" name="expireDatePicker">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="accessibleName">
-         <string>Default auto-type sequence field</string>
+         <string>Expiration field</string>
         </property>
-        <property name="accessibleDescription">
-         <string/>
+        <property name="calendarPopup">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelName">
+        <property name="text">
+         <string>Name:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1">
+       <widget class="QRadioButton" name="autoTypeSequenceCustomRadio">
+        <property name="text">
+         <string>Set default Auto-Type sequence</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="editName">
+        <property name="accessibleName">
+         <string>Name field</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QLabel" name="labelNotes">
+          <property name="text">
+           <string>Notes:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="verticalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item row="7" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>30</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="autoTypeSequenceCustomEdit">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="accessibleName">
+           <string>Default auto-type sequence field</string>
+          </property>
+          <property name="accessibleDescription">
+           <string/>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="autotypeLabel">
+        <property name="text">
+         <string>Auto-Type:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
      </layout>
     </item>
-    <item row="1" column="1">
-     <widget class="QPlainTextEdit" name="editNotes">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>16777215</width>
-        <height>120</height>
-       </size>
-      </property>
-      <property name="accessibleName">
-       <string>Notes field</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="0">
-     <widget class="QLabel" name="labelName">
+    <item>
+     <widget class="QCheckBox" name="excludeReportsCheckBox">
       <property name="text">
-       <string>Name:</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       <string>Exclude from database reports</string>
       </property>
      </widget>
     </item>
-    <item row="7" column="1">
-     <widget class="QRadioButton" name="autoTypeSequenceCustomRadio">
-      <property name="text">
-       <string>Set default Auto-Type sequence</string>
-      </property>
-     </widget>
-    </item>
-    <item row="4" column="1">
-     <widget class="QComboBox" name="searchComboBox">
-      <property name="accessibleName">
-       <string>Search toggle for this and sub groups</string>
-      </property>
-     </widget>
-    </item>
-    <item row="9" column="0">
+    <item>
      <spacer name="verticalSpacer_4">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
@@ -239,17 +244,6 @@
    </layout>
   </widget>
  </widget>
- <tabstops>
-  <tabstop>editName</tabstop>
-  <tabstop>editNotes</tabstop>
-  <tabstop>expireCheck</tabstop>
-  <tabstop>expireDatePicker</tabstop>
-  <tabstop>searchComboBox</tabstop>
-  <tabstop>autotypeComboBox</tabstop>
-  <tabstop>autoTypeSequenceInherit</tabstop>
-  <tabstop>autoTypeSequenceCustomRadio</tabstop>
-  <tabstop>autoTypeSequenceCustomEdit</tabstop>
- </tabstops>
  <resources/>
  <connections/>
 </ui>