diff --git a/ChangeLog b/ChangeLog
index b80dd491..0fb217db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ Bugs
 ----
 - frontend/test_args.c: don't use WIFEXITED(), WEXITSTATUS() on Windows
 - libzint: fix some confusing error messages introduced by segment stuff
+- GUI: remove unnecessary tabMain min size (better layout rendering on
+  Windows/Fedora)
 
 
 Version 2.11.0 (2022-05-24)
diff --git a/README.linux b/README.linux
index d00a8b87..90f27127 100644
--- a/README.linux
+++ b/README.linux
@@ -58,7 +58,7 @@ or Ubuntu 20.04
 
     sudo apt install qt5-default qt5-uitools
 
-or Fedora 36 (Qt6 NOT recommended, currently uses 6.3.0 which is flaky)
+or Fedora 36 (not recommended)
 
      sudo dnf install qt5-qtbase-devel qt5-qttools-devel qt5-qttools-static qt5-qtsvg-devel
 
diff --git a/docs/images/gui_black_eye.png b/docs/images/gui_black_eye.png
index 246ac5da..7bbe7fa8 100644
Binary files a/docs/images/gui_black_eye.png and b/docs/images/gui_black_eye.png differ
diff --git a/docs/images/gui_composite.png b/docs/images/gui_composite.png
index f76088b0..4c739be2 100644
Binary files a/docs/images/gui_composite.png and b/docs/images/gui_composite.png differ
diff --git a/docs/images/gui_main.png b/docs/images/gui_main.png
index 5fb88fd2..f11d01c4 100644
Binary files a/docs/images/gui_main.png and b/docs/images/gui_main.png differ
diff --git a/docs/images/gui_sequence.png b/docs/images/gui_sequence.png
index 7e997814..c056ac8f 100644
Binary files a/docs/images/gui_sequence.png and b/docs/images/gui_sequence.png differ
diff --git a/docs/images/gui_swap.png b/docs/images/gui_swap.png
index 31464b42..38236ffc 100644
Binary files a/docs/images/gui_swap.png and b/docs/images/gui_swap.png differ
diff --git a/docs/images/gui_white_eye.png b/docs/images/gui_white_eye.png
index 8c8ea30c..2ef3f877 100644
Binary files a/docs/images/gui_white_eye.png and b/docs/images/gui_white_eye.png differ
diff --git a/docs/manual.pmd b/docs/manual.pmd
index 0cd4dd29..90a89092 100644
--- a/docs/manual.pmd
+++ b/docs/manual.pmd
@@ -255,7 +255,7 @@ right-clicking the preview.
 ![Zint Barcode Studio main menu (left) and context menu
 (right)](images/gui_menus.png)
 
-## 3.2 Composite Groupbox
+## 3.2 GS1 Composite Groupbox
 
 ![Zint Barcode Studio encoding GS1 Composite data](images/gui_composite.png)
 
diff --git a/docs/manual.txt b/docs/manual.txt
index 676c496a..246f3b32 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -18,7 +18,7 @@ June 2022
     -   2.4 Zint Tcl Backend
 -   3. Using Zint Barcode Studio
     -   3.1 Main Window and Data Tab
-    -   3.2 Composite Groupbox
+    -   3.2 GS1 Composite Groupbox
     -   3.3 Additional ECI/Data Segments Groupbox
     -   3.4 Symbology-specific Tab
     -   3.5 Appearance Tab
@@ -418,7 +418,7 @@ also available in a context menu by right-clicking the preview.
 
 [Zint Barcode Studio main menu (left) and context menu (right)]
 
-3.2 Composite Groupbox
+3.2 GS1 Composite Groupbox
 
 [Zint Barcode Studio encoding GS1 Composite data]
 
diff --git a/frontend_qt/mainWindow.ui b/frontend_qt/mainWindow.ui
index c4708cff..1e80564a 100644
--- a/frontend_qt/mainWindow.ui
+++ b/frontend_qt/mainWindow.ui
@@ -5,26 +5,12 @@
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>704</width>
-    <height>743</height>
-   </rect>
-  </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>425</width>
-    <height>440</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string>Zint Barcode Studio</string>
   </property>
@@ -140,22 +126,10 @@
        </item>
        <item>
         <widget class="QTabWidget" name="tabMain">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>346</height>
-          </size>
-         </property>
          <property name="maximumSize">
           <size>
            <width>16777215</width>
-           <height>346</height>
+           <height>360</height>
           </size>
          </property>
          <property name="autoFillBackground">
@@ -171,7 +145,7 @@
           <attribute name="title">
            <string>&amp;Data</string>
           </attribute>
-          <layout class="QVBoxLayout" name="verticalLayout_3">
+          <layout class="QVBoxLayout" name="verticalLayoutTabData">
            <item>
             <widget class="QGroupBox" name="grpData">
              <property name="sizePolicy">
@@ -538,7 +512,7 @@ for this symbology to defaults</string>
               <string>GS1 Composite symbol settings</string>
              </property>
              <property name="title">
-              <string>Composite Code</string>
+              <string>GS1 Composite Code</string>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_2">
               <item>