diff --git a/Aviso/ATEZ/frmATEZ_EZA.vb b/Aviso/ATEZ/frmATEZ_EZA.vb
index 775515d..340ebe4 100644
--- a/Aviso/ATEZ/frmATEZ_EZA.vb
+++ b/Aviso/ATEZ/frmATEZ_EZA.vb
@@ -28,7 +28,7 @@ Public Class frmATEZ_EZA
     Dim id As Integer = -1
     Dim dgv As DataGridView = Nothing
     Dim atez_data As cATEZ_NCTS_DATA
-    Dim atez = New cATEZ_NCTS_IN("atez_ncts")
+    Dim atez = New cATEZ_NCTS_IN("ATEZ")
     Dim allSelected As Boolean = False
 
     Property BezugsNr As String = ""
diff --git a/Aviso/ATEZ/frmATEZ_NCTS.vb b/Aviso/ATEZ/frmATEZ_NCTS.vb
index 121d88c..ea867c3 100644
--- a/Aviso/ATEZ/frmATEZ_NCTS.vb
+++ b/Aviso/ATEZ/frmATEZ_NCTS.vb
@@ -25,7 +25,7 @@ Public Class frmATEZ_NCTS
     Dim id As Integer = -1
     Dim dgv As DataGridView = Nothing
     Dim atez_data As cATEZ_NCTS_DATA
-    Dim atez = New cATEZ_NCTS_IN("atez_ncts")
+    Dim atez As cATEZ_NCTS_IN = New cATEZ_NCTS_IN("ATEZ")
     Dim allSelected As Boolean = False
 
     Property BezugsNr As String = ""
@@ -77,7 +77,7 @@ Public Class frmATEZ_NCTS
 
 
             If Button1.Text = "JSON" Then
-                If Not atez.setJson(atez_data) Then MsgBox("Fehler beim Erstellen der Daten")
+                If Not atez.setJsonNCTS(atez_data) Then MsgBox("Fehler beim Erstellen der Daten")
                 atez.setJsonPDF(atez_data, dgvAnhaenge)
 
                 Dim data As New DataObject()
diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj
index 5cf7953..3a05bd8 100644
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -77,7 +77,8 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>aviso.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup>
@@ -1870,6 +1871,9 @@
     <None Include="Resources\compliance_s.png" />
     <None Include="Resources\eudr.png" />
     <None Include="Resources\fgas_s.png" />
+    <None Include="Resources\ambar_boarder_new.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <Content Include="Resources\FO.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb
index aa5310c..acc943e 100644
--- a/Aviso/My Project/AssemblyInfo.vb	
+++ b/Aviso/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("4.2.1.8")>
-<Assembly: AssemblyFileVersion("4.2.1.8")>
+<Assembly: AssemblyVersion("4.2.2.2")>
+<Assembly: AssemblyFileVersion("4.2.2.2")>
diff --git a/Aviso/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb
index 4f612c3..ba159a6 100644
--- a/Aviso/My Project/Resources.Designer.vb	
+++ b/Aviso/My Project/Resources.Designer.vb	
@@ -189,6 +189,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Public ReadOnly Property ambar_boarder_new() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ambar_boarder_new", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx
index 2f3fe19..cc25293 100644
--- a/Aviso/My Project/Resources.resx	
+++ b/Aviso/My Project/Resources.resx	
@@ -721,4 +721,7 @@
   <data name="zollberatung_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\zollberatung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ambar_boarder_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ambar_boarder_new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Aviso/Resources/ambar_boarder_new.png b/Aviso/Resources/ambar_boarder_new.png
new file mode 100644
index 0000000..1cb377f
Binary files /dev/null and b/Aviso/Resources/ambar_boarder_new.png differ
diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb
index 68ca5ef..ab98250 100644
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -80,6 +80,7 @@ Partial Class frmHauptfenster
         Me.AnhangsartenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.SpireLizenzPrüfenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.UNBescheinigungAusTFEinlesenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
         Me.FirmaWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.VERAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -253,6 +254,8 @@ Partial Class frmHauptfenster
         Me.Button11 = New System.Windows.Forms.Button()
         Me.btnMAVerzeichnis = New System.Windows.Forms.Button()
         Me.btnMitarbeiterKonto = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
+        Me.Label9 = New System.Windows.Forms.Label()
         Me.btnKontakt = New System.Windows.Forms.Button()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Button5 = New System.Windows.Forms.Button()
@@ -386,7 +389,6 @@ Partial Class frmHauptfenster
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
         Me.timerStandzeit = New System.Windows.Forms.Timer(Me.components)
-        Me.Label9 = New System.Windows.Forms.Label()
         Me.TimerUPDATE = New System.Windows.Forms.Timer(Me.components)
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlOptionen = New System.Windows.Forms.Panel()
@@ -418,8 +420,6 @@ Partial Class frmHauptfenster
         Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
         Me.Panel5 = New System.Windows.Forms.Panel()
         Me.Panel7 = New System.Windows.Forms.Panel()
-        Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
-        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.conMenuAviso.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.pnlDetailsRechts.SuspendLayout()
@@ -761,6 +761,12 @@ Partial Class frmHauptfenster
         Me.UNBescheinigungAusTFEinlesenToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
         Me.UNBescheinigungAusTFEinlesenToolStripMenuItem.Text = "UN-Bescheinigung aus TF einlesen"
         '
+        'FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem
+        '
+        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Name = "FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem"
+        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
+        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Text = "FIX SQL TIGGER (SQLGUIDE01)"
+        '
         'ToolStripSeparator4
         '
         Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
@@ -1855,6 +1861,7 @@ Partial Class frmHauptfenster
         Me.Top.Controls.Add(Me.Button11)
         Me.Top.Controls.Add(Me.btnMAVerzeichnis)
         Me.Top.Controls.Add(Me.btnMitarbeiterKonto)
+        Me.Top.Controls.Add(Me.Label9)
         Me.Top.Controls.Add(Me.btnKontakt)
         Me.Top.Controls.Add(Me.Button2)
         Me.Top.Controls.Add(Me.Button5)
@@ -1868,6 +1875,7 @@ Partial Class frmHauptfenster
         Me.Top.Controls.Add(Me.Button3)
         Me.Top.Controls.Add(Me.btnKunden)
         Me.Top.Controls.Add(Me.btnSpedBuch)
+        Me.Top.Controls.Add(Me.UsrCntlTestsystem1)
         Me.Top.Dock = System.Windows.Forms.DockStyle.Top
         Me.Top.Location = New System.Drawing.Point(0, 20)
         Me.Top.Name = "Top"
@@ -1955,6 +1963,33 @@ Partial Class frmHauptfenster
         Me.btnMitarbeiterKonto.TextAlign = System.Drawing.ContentAlignment.BottomCenter
         Me.btnMitarbeiterKonto.UseVisualStyleBackColor = False
         '
+        'UsrCntlTestsystem1
+        '
+        Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlTestsystem1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.UsrCntlTestsystem1.ForeColor = System.Drawing.Color.Red
+        Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(633, 9)
+        Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6)
+        Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1"
+        Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
+        Me.UsrCntlTestsystem1.TabIndex = 8
+        '
+        'Label9
+        '
+        Me.Label9.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label9.AutoSize = True
+        Me.Label9.BackColor = System.Drawing.Color.White
+        Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
+        Me.Label9.ForeColor = System.Drawing.Color.Red
+        Me.Label9.Location = New System.Drawing.Point(905, 19)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(438, 15)
+        Me.Label9.TabIndex = 9
+        Me.Label9.Text = "Es ist ein Programm-Update verfügbar, bitte das AVISO neu starten."
+        Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Label9.Visible = False
+        '
         'btnKontakt
         '
         Me.btnKontakt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -3745,22 +3780,6 @@ Partial Class frmHauptfenster
         '
         Me.timerStandzeit.Interval = 300000
         '
-        'Label9
-        '
-        Me.Label9.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label9.AutoSize = True
-        Me.Label9.BackColor = System.Drawing.Color.White
-        Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold)
-        Me.Label9.ForeColor = System.Drawing.Color.Red
-        Me.Label9.Location = New System.Drawing.Point(370, 5)
-        Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(438, 15)
-        Me.Label9.TabIndex = 9
-        Me.Label9.Text = "Es ist ein Programm-Update verfügbar, bitte das AVISO neu starten."
-        Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Label9.Visible = False
-        '
         'TimerUPDATE
         '
         Me.TimerUPDATE.Interval = 900000
@@ -4007,31 +4026,12 @@ Partial Class frmHauptfenster
         Me.Panel7.Size = New System.Drawing.Size(252, 51)
         Me.Panel7.TabIndex = 4
         '
-        'UsrCntlTestsystem1
-        '
-        Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlTestsystem1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.UsrCntlTestsystem1.ForeColor = System.Drawing.Color.Red
-        Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(632, -1)
-        Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6)
-        Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1"
-        Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
-        Me.UsrCntlTestsystem1.TabIndex = 8
-        '
-        'FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem
-        '
-        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Name = "FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem"
-        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
-        Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem.Text = "FIX SQL TIGGER (SQLGUIDE01)"
-        '
         'frmHauptfenster
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1302, 694)
         Me.Controls.Add(Me.pnlOptionen)
-        Me.Controls.Add(Me.Label9)
-        Me.Controls.Add(Me.UsrCntlTestsystem1)
         Me.Controls.Add(Me.SplitContainer1)
         Me.Controls.Add(Me.pnlLeft)
         Me.Controls.Add(Me.Top)
@@ -4049,6 +4049,7 @@ Partial Class frmHauptfenster
         Me.pnlDetailsRechts.ResumeLayout(False)
         Me.pnlDetailsRechts.PerformLayout()
         Me.Top.ResumeLayout(False)
+        Me.Top.PerformLayout()
         Me.SplitContainer2.Panel1.ResumeLayout(False)
         Me.SplitContainer2.Panel2.ResumeLayout(False)
         CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).EndInit()
@@ -4097,7 +4098,6 @@ Partial Class frmHauptfenster
         Me.cntVerag.ResumeLayout(False)
         Me.pnlLeft.ResumeLayout(False)
         Me.ResumeLayout(False)
-        Me.PerformLayout()
 
     End Sub
     Friend WithEvents mnuInfo As System.Windows.Forms.ToolStripMenuItem