diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj
index 738e782c..e0494014 100644
--- a/Controls.DocumentViewer/DocumentViewer.vbproj
+++ b/Controls.DocumentViewer/DocumentViewer.vbproj
@@ -265,7 +265,9 @@
     <Compile Include="DocumentViewer.Designer.vb">
       <DependentUpon>DocumentViewer.vb</DependentUpon>
     </Compile>
-    <Compile Include="DocumentViewer.vb" />
+    <Compile Include="DocumentViewer.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="frmViewerSettings.Designer.vb">
       <DependentUpon>frmViewerSettings.vb</DependentUpon>
     </Compile>
diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj
index 66162494..689bf30c 100644
--- a/GUIs.Common/Common.vbproj
+++ b/GUIs.Common/Common.vbproj
@@ -71,7 +71,7 @@
     </Reference>
     <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DigitalData.Controls.DocumentViewer">
-      <HintPath>..\..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+      <HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Controls.LookupGrid">
       <HintPath>..\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
diff --git a/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb b/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
index 7c9d377a..b9f40617 100644
--- a/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
+++ b/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
@@ -57,9 +57,11 @@ Partial Class Form1
         '
         'btRunJob
         '
+        Me.btRunJob.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btRunJob.Location = New System.Drawing.Point(6, 19)
         Me.btRunJob.Name = "btRunJob"
-        Me.btRunJob.Size = New System.Drawing.Size(221, 23)
+        Me.btRunJob.Size = New System.Drawing.Size(246, 23)
         Me.btRunJob.TabIndex = 0
         Me.btRunJob.Text = "Run Job"
         Me.btRunJob.UseVisualStyleBackColor = True
@@ -70,13 +72,15 @@ Partial Class Form1
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.ListBox1.FormattingEnabled = True
-        Me.ListBox1.Location = New System.Drawing.Point(430, 7)
+        Me.ListBox1.Location = New System.Drawing.Point(378, 7)
         Me.ListBox1.Name = "ListBox1"
-        Me.ListBox1.Size = New System.Drawing.Size(498, 433)
+        Me.ListBox1.Size = New System.Drawing.Size(441, 654)
         Me.ListBox1.TabIndex = 1
         '
         'btValidateSerializePDF
         '
+        Me.btValidateSerializePDF.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btValidateSerializePDF.Location = New System.Drawing.Point(6, 19)
         Me.btValidateSerializePDF.Name = "btValidateSerializePDF"
         Me.btValidateSerializePDF.Size = New System.Drawing.Size(246, 23)
@@ -86,6 +90,8 @@ Partial Class Form1
         '
         'btValidateSerializeParseProps
         '
+        Me.btValidateSerializeParseProps.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btValidateSerializeParseProps.Location = New System.Drawing.Point(6, 48)
         Me.btValidateSerializeParseProps.Name = "btValidateSerializeParseProps"
         Me.btValidateSerializeParseProps.Size = New System.Drawing.Size(246, 23)
@@ -95,9 +101,11 @@ Partial Class Form1
         '
         'btCreateMD5Checksum
         '
+        Me.btCreateMD5Checksum.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btCreateMD5Checksum.Location = New System.Drawing.Point(6, 19)
         Me.btCreateMD5Checksum.Name = "btCreateMD5Checksum"
-        Me.btCreateMD5Checksum.Size = New System.Drawing.Size(221, 23)
+        Me.btCreateMD5Checksum.Size = New System.Drawing.Size(246, 23)
         Me.btCreateMD5Checksum.TabIndex = 4
         Me.btCreateMD5Checksum.Text = "Create MD5 Checksum for PDF"
         Me.btCreateMD5Checksum.UseVisualStyleBackColor = True
@@ -106,18 +114,20 @@ Partial Class Form1
         '
         Me.GroupBox1.Controls.Add(Me.ButtonValidateXMLOnly)
         Me.GroupBox1.Controls.Add(Me.btRunJob)
-        Me.GroupBox1.Location = New System.Drawing.Point(12, 12)
+        Me.GroupBox1.Location = New System.Drawing.Point(12, 41)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(239, 75)
+        Me.GroupBox1.Size = New System.Drawing.Size(360, 75)
         Me.GroupBox1.TabIndex = 7
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Run Job like in eInvoice Service"
         '
         'ButtonValidateXMLOnly
         '
+        Me.ButtonValidateXMLOnly.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.ButtonValidateXMLOnly.Location = New System.Drawing.Point(6, 48)
         Me.ButtonValidateXMLOnly.Name = "ButtonValidateXMLOnly"
-        Me.ButtonValidateXMLOnly.Size = New System.Drawing.Size(221, 23)
+        Me.ButtonValidateXMLOnly.Size = New System.Drawing.Size(246, 23)
         Me.ButtonValidateXMLOnly.TabIndex = 4
         Me.ButtonValidateXMLOnly.Text = "Run XML Job (spez. Configuration)"
         Me.ButtonValidateXMLOnly.UseVisualStyleBackColor = True
@@ -127,7 +137,7 @@ Partial Class Form1
         Me.GroupBox2.Controls.Add(Me.btValidateSerializePDF)
         Me.GroupBox2.Controls.Add(Me.btExtractPDFAttachments)
         Me.GroupBox2.Controls.Add(Me.btValidateSerializeParseProps)
-        Me.GroupBox2.Location = New System.Drawing.Point(12, 94)
+        Me.GroupBox2.Location = New System.Drawing.Point(12, 123)
         Me.GroupBox2.Name = "GroupBox2"
         Me.GroupBox2.Size = New System.Drawing.Size(360, 109)
         Me.GroupBox2.TabIndex = 8
@@ -136,6 +146,8 @@ Partial Class Form1
         '
         'btExtractPDFAttachments
         '
+        Me.btExtractPDFAttachments.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btExtractPDFAttachments.Location = New System.Drawing.Point(6, 77)
         Me.btExtractPDFAttachments.Name = "btExtractPDFAttachments"
         Me.btExtractPDFAttachments.Size = New System.Drawing.Size(246, 23)
@@ -147,7 +159,7 @@ Partial Class Form1
         '
         Me.GroupBox3.Controls.Add(Me.btCreateMD5Checksum)
         Me.GroupBox3.Controls.Add(Me.txtMD5Checksum)
-        Me.GroupBox3.Location = New System.Drawing.Point(12, 209)
+        Me.GroupBox3.Location = New System.Drawing.Point(12, 238)
         Me.GroupBox3.Name = "GroupBox3"
         Me.GroupBox3.Size = New System.Drawing.Size(360, 85)
         Me.GroupBox3.TabIndex = 9
@@ -156,6 +168,8 @@ Partial Class Form1
         '
         'txtMD5Checksum
         '
+        Me.txtMD5Checksum.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtMD5Checksum.Location = New System.Drawing.Point(6, 49)
         Me.txtMD5Checksum.Name = "txtMD5Checksum"
         Me.txtMD5Checksum.Size = New System.Drawing.Size(348, 20)
@@ -163,6 +177,8 @@ Partial Class Form1
         '
         'txtPropName
         '
+        Me.txtPropName.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtPropName.Location = New System.Drawing.Point(6, 48)
         Me.txtPropName.Name = "txtPropName"
         Me.txtPropName.Size = New System.Drawing.Size(348, 20)
@@ -172,7 +188,7 @@ Partial Class Form1
         '
         Me.GroupBox4.Controls.Add(Me.btFindExtractXMLValue)
         Me.GroupBox4.Controls.Add(Me.txtPropName)
-        Me.GroupBox4.Location = New System.Drawing.Point(12, 300)
+        Me.GroupBox4.Location = New System.Drawing.Point(12, 329)
         Me.GroupBox4.Name = "GroupBox4"
         Me.GroupBox4.Size = New System.Drawing.Size(360, 76)
         Me.GroupBox4.TabIndex = 11
@@ -181,9 +197,11 @@ Partial Class Form1
         '
         'btFindExtractXMLValue
         '
+        Me.btFindExtractXMLValue.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btFindExtractXMLValue.Location = New System.Drawing.Point(6, 19)
         Me.btFindExtractXMLValue.Name = "btFindExtractXMLValue"
-        Me.btFindExtractXMLValue.Size = New System.Drawing.Size(221, 23)
+        Me.btFindExtractXMLValue.Size = New System.Drawing.Size(246, 23)
         Me.btFindExtractXMLValue.TabIndex = 11
         Me.btFindExtractXMLValue.Text = "Find and Extract XML Path Value"
         Me.btFindExtractXMLValue.UseVisualStyleBackColor = True
@@ -191,18 +209,20 @@ Partial Class Form1
         'GroupBox5
         '
         Me.GroupBox5.Controls.Add(Me.btWriteBinary)
-        Me.GroupBox5.Location = New System.Drawing.Point(10, 383)
+        Me.GroupBox5.Location = New System.Drawing.Point(10, 412)
         Me.GroupBox5.Name = "GroupBox5"
-        Me.GroupBox5.Size = New System.Drawing.Size(360, 57)
+        Me.GroupBox5.Size = New System.Drawing.Size(362, 57)
         Me.GroupBox5.TabIndex = 12
         Me.GroupBox5.TabStop = False
         Me.GroupBox5.Text = "GroupBox5"
         '
         'btWriteBinary
         '
+        Me.btWriteBinary.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btWriteBinary.Location = New System.Drawing.Point(6, 19)
         Me.btWriteBinary.Name = "btWriteBinary"
-        Me.btWriteBinary.Size = New System.Drawing.Size(221, 23)
+        Me.btWriteBinary.Size = New System.Drawing.Size(248, 23)
         Me.btWriteBinary.TabIndex = 11
         Me.btWriteBinary.Text = "Write Binary to PDF"
         Me.btWriteBinary.UseVisualStyleBackColor = True
@@ -214,9 +234,9 @@ Partial Class Form1
         '
         'Button1
         '
-        Me.Button1.Location = New System.Drawing.Point(257, 31)
+        Me.Button1.Location = New System.Drawing.Point(12, 12)
         Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(115, 23)
+        Me.Button1.Size = New System.Drawing.Size(119, 23)
         Me.Button1.TabIndex = 13
         Me.Button1.Text = "Open Log"
         Me.Button1.UseVisualStyleBackColor = True
@@ -225,7 +245,7 @@ Partial Class Form1
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(937, 448)
+        Me.ClientSize = New System.Drawing.Size(828, 673)
         Me.Controls.Add(Me.Button1)
         Me.Controls.Add(Me.GroupBox5)
         Me.Controls.Add(Me.GroupBox4)