diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb
index 44d9a28..f148f1e 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("3.6.2.4")>
-<Assembly: AssemblyFileVersion("3.6.2.4")>
+<Assembly: AssemblyVersion("3.6.2.8")>
+<Assembly: AssemblyFileVersion("3.6.2.8")>
diff --git a/Aviso/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb
index 7ad6396..0a4d652 100644
--- a/Aviso/My Project/Resources.Designer.vb	
+++ b/Aviso/My Project/Resources.Designer.vb	
@@ -1152,9 +1152,9 @@ Namespace My.Resources
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
         '''</summary>
-        Friend ReadOnly Property sdfsdf3sdfsd34sdfgsdg() As String
+        Friend ReadOnly Property sdfsdf3dddddffffvbvcv() As String
             Get
-                Return ResourceManager.GetString("sdfsdf3sdfsd34sdfgsdg", resourceCulture)
+                Return ResourceManager.GetString("sdfsdf3dddddffffvbvcv", resourceCulture)
             End Get
         End Property
         
@@ -1498,7 +1498,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die 3.6.2.4 ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die 3.6.2.8 ähnelt.
         '''</summary>
         Friend ReadOnly Property Version() As String
             Get
diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx
index a76285e..0a26c30 100644
--- a/Aviso/My Project/Resources.resx	
+++ b/Aviso/My Project/Resources.resx	
@@ -536,7 +536,7 @@
     <value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>3.6.2.4</value>
+    <value>3.6.2.8</value>
   </data>
   <data name="statusBtn_vorgeschrieben_Aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -604,7 +604,7 @@
   <data name="ATANAK_Instructions_Export_T1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ATANAK_Instructions_Export_T1.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="sdfsdf3sdfsd34sdfgsdg" xml:space="preserve">
+  <data name="sdfsdf3dddddffffvbvcv" xml:space="preserve">
     <value />
   </data>
 </root>
\ No newline at end of file
diff --git a/Aviso/frmAddAktenvermerkShort.vb b/Aviso/frmAddAktenvermerkShort.vb
index 0c168c3..403f621 100644
--- a/Aviso/frmAddAktenvermerkShort.vb
+++ b/Aviso/frmAddAktenvermerkShort.vb
@@ -127,6 +127,13 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli
                 If myAviso.LKW_fertig Then VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.LKWFertig(myAviso.AvisoID) : frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
             Else
                 insertVermerk("DE Zoll eingereicht", 17)
+
+                'If vbYes = MsgBox("Fahrer-Anweisung ""zum Zollamt gehen"" ausdrucken?", vbYesNo) Then
+                '    Try
+                '        Dim path = SDL.FormularManagerNEU.zumZOLL_AVISO(myAviso, "DE")
+                '        If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, (New System.Drawing.Printing.PrinterSettings).PrinterName)
+                '    Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try
+                'End If
             End If
         ElseIf sender Is btnDEZollDIGITAL Then
             Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -145,6 +152,13 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli
                 If myAviso.LKW_fertig Then VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.LKWFertig(myAviso.AvisoID) : frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
             Else
                 insertVermerk("AT Zoll eingereicht", 19)
+
+                'If vbYes = MsgBox("Fahrer-Anweisung ""zum Zollamt gehen"" ausdrucken?", vbYesNo) Then
+                '    Try
+                '        Dim path = SDL.FormularManagerNEU.zumZOLL_AVISO(myAviso, "AT")
+                '        If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, (New System.Drawing.Printing.PrinterSettings).PrinterName)
+                '    Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try
+                'End If
             End If
         ElseIf sender Is btnLKWStandzeitWE Then
             insertVermerk("LKW Standzeit Wochenende", 21)
diff --git a/Aviso/frmDokumenteSchicken.Designer.vb b/Aviso/frmDokumenteSchicken.Designer.vb
index bfc1e49..5f51b67 100644
--- a/Aviso/frmDokumenteSchicken.Designer.vb
+++ b/Aviso/frmDokumenteSchicken.Designer.vb
@@ -24,6 +24,9 @@ Partial Class frmDokumenteSchicken
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDokumenteSchicken))
         Me.pnl = New System.Windows.Forms.Panel()
+        Me.cbxInfoblattFurDigitalabfertigungDrucken = New System.Windows.Forms.CheckBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.rtbSonstigeInfo = New System.Windows.Forms.RichTextBox()
         Me.rtbDokumente = New System.Windows.Forms.RichTextBox()
         Me.btnOK = New System.Windows.Forms.Button()
         Me.Header = New System.Windows.Forms.Panel()
@@ -32,8 +35,6 @@ Partial Class frmDokumenteSchicken
         Me.lblTitle = New System.Windows.Forms.Label()
         Me.btnClose = New System.Windows.Forms.Button()
         Me.lblText = New System.Windows.Forms.Label()
-        Me.rtbSonstigeInfo = New System.Windows.Forms.RichTextBox()
-        Me.Label2 = New System.Windows.Forms.Label()
         Me.pnl.SuspendLayout()
         Me.Header.SuspendLayout()
         Me.SuspendLayout()
@@ -42,6 +43,7 @@ Partial Class frmDokumenteSchicken
         '
         Me.pnl.BackColor = System.Drawing.Color.White
         Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnl.Controls.Add(Me.cbxInfoblattFurDigitalabfertigungDrucken)
         Me.pnl.Controls.Add(Me.Label2)
         Me.pnl.Controls.Add(Me.rtbSonstigeInfo)
         Me.pnl.Controls.Add(Me.rtbDokumente)
@@ -53,9 +55,39 @@ Partial Class frmDokumenteSchicken
         Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnl.Location = New System.Drawing.Point(0, 0)
         Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(316, 410)
+        Me.pnl.Size = New System.Drawing.Size(316, 452)
         Me.pnl.TabIndex = 0
         '
+        'cbxInfoblattFurDigitalabfertigungDrucken
+        '
+        Me.cbxInfoblattFurDigitalabfertigungDrucken.AutoSize = True
+        Me.cbxInfoblattFurDigitalabfertigungDrucken.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
+        Me.cbxInfoblattFurDigitalabfertigungDrucken.Location = New System.Drawing.Point(11, 348)
+        Me.cbxInfoblattFurDigitalabfertigungDrucken.Name = "cbxInfoblattFurDigitalabfertigungDrucken"
+        Me.cbxInfoblattFurDigitalabfertigungDrucken.Size = New System.Drawing.Size(300, 24)
+        Me.cbxInfoblattFurDigitalabfertigungDrucken.TabIndex = 97
+        Me.cbxInfoblattFurDigitalabfertigungDrucken.Text = "Infoblatt für Digitalabfertigung drucken"
+        Me.cbxInfoblattFurDigitalabfertigungDrucken.UseVisualStyleBackColor = True
+        '
+        'Label2
+        '
+        Me.Label2.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label2.Location = New System.Drawing.Point(3, 183)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(422, 25)
+        Me.Label2.TabIndex = 96
+        Me.Label2.Text = "Sonstige Info:"
+        Me.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        '
+        'rtbSonstigeInfo
+        '
+        Me.rtbSonstigeInfo.Location = New System.Drawing.Point(6, 211)
+        Me.rtbSonstigeInfo.Name = "rtbSonstigeInfo"
+        Me.rtbSonstigeInfo.Size = New System.Drawing.Size(301, 130)
+        Me.rtbSonstigeInfo.TabIndex = 95
+        Me.rtbSonstigeInfo.Text = ""
+        '
         'rtbDokumente
         '
         Me.rtbDokumente.Location = New System.Drawing.Point(6, 59)
@@ -66,10 +98,10 @@ Partial Class frmDokumenteSchicken
         '
         'btnOK
         '
-        Me.btnOK.DialogResult = DialogResult.OK
+        Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK
         Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnOK.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
-        Me.btnOK.Location = New System.Drawing.Point(81, 347)
+        Me.btnOK.Location = New System.Drawing.Point(81, 389)
         Me.btnOK.Name = "btnOK"
         Me.btnOK.Size = New System.Drawing.Size(133, 50)
         Me.btnOK.TabIndex = 93
@@ -154,30 +186,11 @@ Partial Class frmDokumenteSchicken
         Me.lblText.Text = "Folgende Dokumente sind an den Kunden zu senden:"
         Me.lblText.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
-        'rtbSonstigeInfo
-        '
-        Me.rtbSonstigeInfo.Location = New System.Drawing.Point(6, 211)
-        Me.rtbSonstigeInfo.Name = "rtbSonstigeInfo"
-        Me.rtbSonstigeInfo.Size = New System.Drawing.Size(301, 130)
-        Me.rtbSonstigeInfo.TabIndex = 95
-        Me.rtbSonstigeInfo.Text = ""
-        '
-        'Label2
-        '
-        Me.Label2.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label2.Location = New System.Drawing.Point(3, 183)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(422, 25)
-        Me.Label2.TabIndex = 96
-        Me.Label2.Text = "Sonstige Info:"
-        Me.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        '
         'frmDokumenteSchicken
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(316, 410)
+        Me.ClientSize = New System.Drawing.Size(316, 452)
         Me.Controls.Add(Me.pnl)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@@ -185,6 +198,7 @@ Partial Class frmDokumenteSchicken
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "frmDokumenteSchicken"
         Me.pnl.ResumeLayout(False)
+        Me.pnl.PerformLayout()
         Me.Header.ResumeLayout(False)
         Me.ResumeLayout(False)
 
@@ -200,4 +214,5 @@ Partial Class frmDokumenteSchicken
     Public WithEvents rtbDokumente As System.Windows.Forms.RichTextBox
     Public WithEvents Label2 As Label
     Public WithEvents rtbSonstigeInfo As RichTextBox
+    Friend WithEvents cbxInfoblattFurDigitalabfertigungDrucken As CheckBox
 End Class
diff --git a/Aviso/frmDokumenteSchicken.vb b/Aviso/frmDokumenteSchicken.vb
index 98ecb82..831cb2f 100644
--- a/Aviso/frmDokumenteSchicken.vb
+++ b/Aviso/frmDokumenteSchicken.vb
@@ -1,6 +1,33 @@
 Public Class frmDokumenteSchicken
+    Dim AVISO As VERAG_PROG_ALLGEMEIN.cAviso
 
+    Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso)
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+        Me.AVISO = AVISO
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+
+    End Sub
     Private Sub frmDokumenteSchicken_Shown(sender As Object, e As EventArgs) Handles Me.Shown
         btnOK.Focus()
     End Sub
+
+    Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
+        Try
+            If cbxInfoblattFurDigitalabfertigungDrucken.Checked And cbxInfoblattFurDigitalabfertigungDrucken.Visible Then
+                Dim path = SDL.FormularManagerNEU.Finish_AVISO(AVISO)
+                Dim oPS As New System.Drawing.Printing.PrinterSettings
+                If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, oPS.PrinterName)
+            End If
+        Catch ex As Exception
+
+        End Try
+    End Sub
+
+    Private Sub frmDokumenteSchicken_Load(sender As Object, e As EventArgs) Handles Me.Load
+        If Not VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("PRINT_Freigabe_FinishDigital") Then
+            cbxInfoblattFurDigitalabfertigungDrucken.Visible = False
+        End If
+    End Sub
 End Class
\ No newline at end of file
diff --git a/Aviso/frmGesSich.Designer.vb b/Aviso/frmGesSich.Designer.vb
index 3d84b8c..7414cba 100644
--- a/Aviso/frmGesSich.Designer.vb
+++ b/Aviso/frmGesSich.Designer.vb
@@ -23,6 +23,11 @@ Partial Class frmGesSich
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesSich))
         Me.dgvGesamtsicherheitMRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Panel2 = New System.Windows.Forms.Panel()
@@ -91,14 +96,38 @@ Partial Class frmGesSich
         Me.dgvGesamtsicherheitMRN.AKTUALISIERUNGS_INTERVALL = -1
         Me.dgvGesamtsicherheitMRN.AllowUserToAddRows = False
         Me.dgvGesamtsicherheitMRN.AllowUserToDeleteRows = False
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvGesamtsicherheitMRN.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
         Me.dgvGesamtsicherheitMRN.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvGesamtsicherheitMRN.DefaultCellStyle = DataGridViewCellStyle2
         Me.dgvGesamtsicherheitMRN.Dock = System.Windows.Forms.DockStyle.Left
         Me.dgvGesamtsicherheitMRN.Location = New System.Drawing.Point(0, 0)
         Me.dgvGesamtsicherheitMRN.Name = "dgvGesamtsicherheitMRN"
         Me.dgvGesamtsicherheitMRN.ReadOnly = True
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvGesamtsicherheitMRN.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
         Me.dgvGesamtsicherheitMRN.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvGesamtsicherheitMRN.Size = New System.Drawing.Size(692, 589)
-        Me.dgvGesamtsicherheitMRN.TabIndex = 1
+        Me.dgvGesamtsicherheitMRN.TabIndex = 0
         '
         'Panel2
         '
@@ -109,7 +138,7 @@ Partial Class frmGesSich
         Me.Panel2.Location = New System.Drawing.Point(0, 187)
         Me.Panel2.Name = "Panel2"
         Me.Panel2.Size = New System.Drawing.Size(1384, 589)
-        Me.Panel2.TabIndex = 3
+        Me.Panel2.TabIndex = 1
         '
         'panOverlay
         '
@@ -140,7 +169,7 @@ Partial Class frmGesSich
         Me.cboFiliale.MaxLength = 4
         Me.cboFiliale.Name = "cboFiliale"
         Me.cboFiliale.Size = New System.Drawing.Size(186, 24)
-        Me.cboFiliale.TabIndex = 39
+        Me.cboFiliale.TabIndex = 2
         '
         'FlatButton2
         '
@@ -152,7 +181,7 @@ Partial Class frmGesSich
         Me.FlatButton2.Location = New System.Drawing.Point(424, 232)
         Me.FlatButton2.Name = "FlatButton2"
         Me.FlatButton2.Size = New System.Drawing.Size(75, 23)
-        Me.FlatButton2.TabIndex = 38
+        Me.FlatButton2.TabIndex = 7
         Me.FlatButton2.Text = "Speichern"
         Me.FlatButton2.UseVisualStyleBackColor = False
         '
@@ -163,7 +192,7 @@ Partial Class frmGesSich
         Me.txtLKWID.Margin = New System.Windows.Forms.Padding(0)
         Me.txtLKWID.Name = "txtLKWID"
         Me.txtLKWID.Size = New System.Drawing.Size(186, 24)
-        Me.txtLKWID.TabIndex = 37
+        Me.txtLKWID.TabIndex = 6
         '
         'txtAbfertNum
         '
@@ -172,7 +201,7 @@ Partial Class frmGesSich
         Me.txtAbfertNum.Margin = New System.Windows.Forms.Padding(0)
         Me.txtAbfertNum.Name = "txtAbfertNum"
         Me.txtAbfertNum.Size = New System.Drawing.Size(186, 24)
-        Me.txtAbfertNum.TabIndex = 36
+        Me.txtAbfertNum.TabIndex = 4
         '
         'Label18
         '
@@ -181,7 +210,7 @@ Partial Class frmGesSich
         Me.Label18.Location = New System.Drawing.Point(173, 180)
         Me.Label18.Name = "Label18"
         Me.Label18.Size = New System.Drawing.Size(76, 20)
-        Me.Label18.TabIndex = 22
+        Me.Label18.TabIndex = 5
         Me.Label18.Text = "LKW-ID:"
         '
         'Label17
@@ -191,7 +220,7 @@ Partial Class frmGesSich
         Me.Label17.Location = New System.Drawing.Point(68, 130)
         Me.Label17.Name = "Label17"
         Me.Label17.Size = New System.Drawing.Size(181, 20)
-        Me.Label17.TabIndex = 21
+        Me.Label17.TabIndex = 3
         Me.Label17.Text = "Abfertigungsnummer:"
         '
         'Label16
@@ -201,7 +230,7 @@ Partial Class frmGesSich
         Me.Label16.Location = New System.Drawing.Point(126, 80)
         Me.Label16.Name = "Label16"
         Me.Label16.Size = New System.Drawing.Size(123, 20)
-        Me.Label16.TabIndex = 20
+        Me.Label16.TabIndex = 1
         Me.Label16.Text = "Filial-Nummer:"
         '
         'btnClosePanOverlay
@@ -216,7 +245,7 @@ Partial Class frmGesSich
         Me.btnClosePanOverlay.Location = New System.Drawing.Point(475, 24)
         Me.btnClosePanOverlay.Name = "btnClosePanOverlay"
         Me.btnClosePanOverlay.Size = New System.Drawing.Size(24, 24)
-        Me.btnClosePanOverlay.TabIndex = 19
+        Me.btnClosePanOverlay.TabIndex = 0
         Me.btnClosePanOverlay.UseVisualStyleBackColor = False
         '
         'dgvGesamtsicherheitCRN
@@ -224,14 +253,30 @@ Partial Class frmGesSich
         Me.dgvGesamtsicherheitCRN.AKTUALISIERUNGS_INTERVALL = -1
         Me.dgvGesamtsicherheitCRN.AllowUserToAddRows = False
         Me.dgvGesamtsicherheitCRN.AllowUserToDeleteRows = False
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvGesamtsicherheitCRN.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
         Me.dgvGesamtsicherheitCRN.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvGesamtsicherheitCRN.DefaultCellStyle = DataGridViewCellStyle5
         Me.dgvGesamtsicherheitCRN.Dock = System.Windows.Forms.DockStyle.Right
         Me.dgvGesamtsicherheitCRN.Location = New System.Drawing.Point(692, 0)
         Me.dgvGesamtsicherheitCRN.Name = "dgvGesamtsicherheitCRN"
         Me.dgvGesamtsicherheitCRN.ReadOnly = True
         Me.dgvGesamtsicherheitCRN.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvGesamtsicherheitCRN.Size = New System.Drawing.Size(692, 589)
-        Me.dgvGesamtsicherheitCRN.TabIndex = 0
+        Me.dgvGesamtsicherheitCRN.TabIndex = 1
         '
         'btnAddClose
         '
@@ -245,7 +290,7 @@ Partial Class frmGesSich
         Me.btnAddClose.Location = New System.Drawing.Point(1348, 104)
         Me.btnAddClose.Name = "btnAddClose"
         Me.btnAddClose.Size = New System.Drawing.Size(24, 24)
-        Me.btnAddClose.TabIndex = 19
+        Me.btnAddClose.TabIndex = 31
         Me.btnAddClose.UseVisualStyleBackColor = False
         '
         'btnAddOpen
@@ -260,7 +305,7 @@ Partial Class frmGesSich
         Me.btnAddOpen.Location = New System.Drawing.Point(654, 104)
         Me.btnAddOpen.Name = "btnAddOpen"
         Me.btnAddOpen.Size = New System.Drawing.Size(24, 24)
-        Me.btnAddOpen.TabIndex = 18
+        Me.btnAddOpen.TabIndex = 30
         Me.btnAddOpen.UseVisualStyleBackColor = False
         '
         'lblGestellungNr
@@ -272,7 +317,7 @@ Partial Class frmGesSich
         Me.lblGestellungNr.Location = New System.Drawing.Point(126, 22)
         Me.lblGestellungNr.Name = "lblGestellungNr"
         Me.lblGestellungNr.Size = New System.Drawing.Size(171, 24)
-        Me.lblGestellungNr.TabIndex = 16
+        Me.lblGestellungNr.TabIndex = 2
         Me.lblGestellungNr.Text = "Gesamtsicherheit"
         '
         'txtCRNTime
@@ -282,7 +327,7 @@ Partial Class frmGesSich
         Me.txtCRNTime.Margin = New System.Windows.Forms.Padding(0)
         Me.txtCRNTime.Name = "txtCRNTime"
         Me.txtCRNTime.Size = New System.Drawing.Size(55, 24)
-        Me.txtCRNTime.TabIndex = 15
+        Me.txtCRNTime.TabIndex = 27
         '
         'txtCRNDate
         '
@@ -291,7 +336,7 @@ Partial Class frmGesSich
         Me.txtCRNDate.Margin = New System.Windows.Forms.Padding(0)
         Me.txtCRNDate.Name = "txtCRNDate"
         Me.txtCRNDate.Size = New System.Drawing.Size(85, 24)
-        Me.txtCRNDate.TabIndex = 14
+        Me.txtCRNDate.TabIndex = 26
         '
         'txtMRNTime
         '
@@ -300,7 +345,7 @@ Partial Class frmGesSich
         Me.txtMRNTime.Margin = New System.Windows.Forms.Padding(0)
         Me.txtMRNTime.Name = "txtMRNTime"
         Me.txtMRNTime.Size = New System.Drawing.Size(55, 24)
-        Me.txtMRNTime.TabIndex = 13
+        Me.txtMRNTime.TabIndex = 22
         '
         'txtMRNDate
         '
@@ -311,7 +356,7 @@ Partial Class frmGesSich
         Me.txtMRNDate.Margin = New System.Windows.Forms.Padding(0)
         Me.txtMRNDate.Name = "txtMRNDate"
         Me.txtMRNDate.Size = New System.Drawing.Size(85, 24)
-        Me.txtMRNDate.TabIndex = 12
+        Me.txtMRNDate.TabIndex = 21
         '
         'btnSave
         '
@@ -323,7 +368,7 @@ Partial Class frmGesSich
         Me.btnSave.Location = New System.Drawing.Point(12, 12)
         Me.btnSave.Name = "btnSave"
         Me.btnSave.Size = New System.Drawing.Size(75, 23)
-        Me.btnSave.TabIndex = 11
+        Me.btnSave.TabIndex = 0
         Me.btnSave.Text = "Speichern"
         Me.btnSave.UseVisualStyleBackColor = False
         '
@@ -335,7 +380,7 @@ Partial Class frmGesSich
         Me.txtCRNSicherheitsbetrag.Margin = New System.Windows.Forms.Padding(0)
         Me.txtCRNSicherheitsbetrag.Name = "txtCRNSicherheitsbetrag"
         Me.txtCRNSicherheitsbetrag.Size = New System.Drawing.Size(100, 24)
-        Me.txtCRNSicherheitsbetrag.TabIndex = 10
+        Me.txtCRNSicherheitsbetrag.TabIndex = 29
         '
         'txtCRNWarenwert
         '
@@ -344,7 +389,7 @@ Partial Class frmGesSich
         Me.txtCRNWarenwert.Margin = New System.Windows.Forms.Padding(0)
         Me.txtCRNWarenwert.Name = "txtCRNWarenwert"
         Me.txtCRNWarenwert.Size = New System.Drawing.Size(100, 24)
-        Me.txtCRNWarenwert.TabIndex = 9
+        Me.txtCRNWarenwert.TabIndex = 28
         '
         'txtCRN
         '
@@ -353,7 +398,7 @@ Partial Class frmGesSich
         Me.txtCRN.Margin = New System.Windows.Forms.Padding(0)
         Me.txtCRN.Name = "txtCRN"
         Me.txtCRN.Size = New System.Drawing.Size(205, 24)
-        Me.txtCRN.TabIndex = 7
+        Me.txtCRN.TabIndex = 25
         '
         'txtMRNSicherheitsbetrag
         '
@@ -363,7 +408,7 @@ Partial Class frmGesSich
         Me.txtMRNSicherheitsbetrag.Margin = New System.Windows.Forms.Padding(0)
         Me.txtMRNSicherheitsbetrag.Name = "txtMRNSicherheitsbetrag"
         Me.txtMRNSicherheitsbetrag.Size = New System.Drawing.Size(100, 24)
-        Me.txtMRNSicherheitsbetrag.TabIndex = 6
+        Me.txtMRNSicherheitsbetrag.TabIndex = 24
         '
         'txtMRNWarenwert
         '
@@ -372,7 +417,7 @@ Partial Class frmGesSich
         Me.txtMRNWarenwert.Margin = New System.Windows.Forms.Padding(0)
         Me.txtMRNWarenwert.Name = "txtMRNWarenwert"
         Me.txtMRNWarenwert.Size = New System.Drawing.Size(100, 24)
-        Me.txtMRNWarenwert.TabIndex = 5
+        Me.txtMRNWarenwert.TabIndex = 23
         '
         'txtMRN
         '
@@ -381,7 +426,7 @@ Partial Class frmGesSich
         Me.txtMRN.Margin = New System.Windows.Forms.Padding(0)
         Me.txtMRN.Name = "txtMRN"
         Me.txtMRN.Size = New System.Drawing.Size(205, 24)
-        Me.txtMRN.TabIndex = 3
+        Me.txtMRN.TabIndex = 19
         '
         'FlatButton1
         '
@@ -394,7 +439,7 @@ Partial Class frmGesSich
         Me.FlatButton1.Location = New System.Drawing.Point(1340, 15)
         Me.FlatButton1.Name = "FlatButton1"
         Me.FlatButton1.Size = New System.Drawing.Size(32, 33)
-        Me.FlatButton1.TabIndex = 0
+        Me.FlatButton1.TabIndex = 3
         Me.FlatButton1.UseVisualStyleBackColor = False
         '
         'lblZollsatz
@@ -406,7 +451,7 @@ Partial Class frmGesSich
         Me.lblZollsatz.Location = New System.Drawing.Point(1010, 37)
         Me.lblZollsatz.Name = "lblZollsatz"
         Me.lblZollsatz.Size = New System.Drawing.Size(86, 16)
-        Me.lblZollsatz.TabIndex = 2
+        Me.lblZollsatz.TabIndex = 4
         Me.lblZollsatz.Text = "Zollsatz: 12%"
         '
         'lblReferenzwert
@@ -430,7 +475,7 @@ Partial Class frmGesSich
         Me.lblSaldo.Location = New System.Drawing.Point(1111, 37)
         Me.lblSaldo.Name = "lblSaldo"
         Me.lblSaldo.Size = New System.Drawing.Size(147, 24)
-        Me.lblSaldo.TabIndex = 0
+        Me.lblSaldo.TabIndex = 5
         Me.lblSaldo.Text = "Saldo: €80.000"
         '
         'panOben
@@ -483,7 +528,7 @@ Partial Class frmGesSich
         Me.panOben.Margin = New System.Windows.Forms.Padding(0)
         Me.panOben.Name = "panOben"
         Me.panOben.Size = New System.Drawing.Size(1384, 187)
-        Me.panOben.TabIndex = 2
+        Me.panOben.TabIndex = 0
         '
         'btnDeleteClose
         '
@@ -497,7 +542,7 @@ Partial Class frmGesSich
         Me.btnDeleteClose.Location = New System.Drawing.Point(1348, 74)
         Me.btnDeleteClose.Name = "btnDeleteClose"
         Me.btnDeleteClose.Size = New System.Drawing.Size(24, 24)
-        Me.btnDeleteClose.TabIndex = 42
+        Me.btnDeleteClose.TabIndex = 7
         Me.btnDeleteClose.UseVisualStyleBackColor = False
         Me.btnDeleteClose.Visible = False
         '
@@ -513,7 +558,7 @@ Partial Class frmGesSich
         Me.btnDeleteOpen.Location = New System.Drawing.Point(654, 74)
         Me.btnDeleteOpen.Name = "btnDeleteOpen"
         Me.btnDeleteOpen.Size = New System.Drawing.Size(24, 24)
-        Me.btnDeleteOpen.TabIndex = 40
+        Me.btnDeleteOpen.TabIndex = 6
         Me.btnDeleteOpen.UseVisualStyleBackColor = False
         Me.btnDeleteOpen.Visible = False
         '
@@ -529,7 +574,7 @@ Partial Class frmGesSich
         Me.btnUpdateClose.Location = New System.Drawing.Point(1348, 136)
         Me.btnUpdateClose.Name = "btnUpdateClose"
         Me.btnUpdateClose.Size = New System.Drawing.Size(24, 24)
-        Me.btnUpdateClose.TabIndex = 41
+        Me.btnUpdateClose.TabIndex = 37
         Me.btnUpdateClose.UseVisualStyleBackColor = False
         Me.btnUpdateClose.Visible = False
         '
@@ -545,7 +590,7 @@ Partial Class frmGesSich
         Me.btnUpdateOpen.Location = New System.Drawing.Point(654, 136)
         Me.btnUpdateOpen.Name = "btnUpdateOpen"
         Me.btnUpdateOpen.Size = New System.Drawing.Size(24, 24)
-        Me.btnUpdateOpen.TabIndex = 40
+        Me.btnUpdateOpen.TabIndex = 35
         Me.btnUpdateOpen.UseVisualStyleBackColor = False
         Me.btnUpdateOpen.Visible = False
         '
@@ -556,7 +601,7 @@ Partial Class frmGesSich
         Me.Label15.Location = New System.Drawing.Point(242, 90)
         Me.Label15.Name = "Label15"
         Me.Label15.Size = New System.Drawing.Size(25, 13)
-        Me.Label15.TabIndex = 39
+        Me.Label15.TabIndex = 9
         Me.Label15.Text = "Pos"
         '
         'txtPos
@@ -566,7 +611,7 @@ Partial Class frmGesSich
         Me.txtPos.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPos.Name = "txtPos"
         Me.txtPos.Size = New System.Drawing.Size(35, 24)
-        Me.txtPos.TabIndex = 38
+        Me.txtPos.TabIndex = 20
         '
         'Label14
         '
@@ -576,7 +621,7 @@ Partial Class frmGesSich
         Me.Label14.Location = New System.Drawing.Point(194, 136)
         Me.Label14.Name = "Label14"
         Me.Label14.Size = New System.Drawing.Size(59, 13)
-        Me.Label14.TabIndex = 37
+        Me.Label14.TabIndex = 33
         Me.Label14.Text = "19% EUST"
         '
         'txtEust
@@ -587,7 +632,7 @@ Partial Class frmGesSich
         Me.txtEust.Margin = New System.Windows.Forms.Padding(0)
         Me.txtEust.Name = "txtEust"
         Me.txtEust.Size = New System.Drawing.Size(100, 24)
-        Me.txtEust.TabIndex = 36
+        Me.txtEust.TabIndex = 39
         '
         'Label13
         '
@@ -597,7 +642,7 @@ Partial Class frmGesSich
         Me.Label13.Location = New System.Drawing.Point(76, 133)
         Me.Label13.Name = "Label13"
         Me.Label13.Size = New System.Drawing.Size(73, 13)
-        Me.Label13.TabIndex = 35
+        Me.Label13.TabIndex = 32
         Me.Label13.Text = "A.TR Ja/Nein"
         '
         'cboATR
@@ -609,7 +654,7 @@ Partial Class frmGesSich
         Me.cboATR.Location = New System.Drawing.Point(74, 149)
         Me.cboATR.Name = "cboATR"
         Me.cboATR.Size = New System.Drawing.Size(120, 26)
-        Me.cboATR.TabIndex = 34
+        Me.cboATR.TabIndex = 38
         '
         'Label7
         '
@@ -618,7 +663,7 @@ Partial Class frmGesSich
         Me.Label7.Location = New System.Drawing.Point(1014, 136)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(41, 13)
-        Me.Label7.TabIndex = 33
+        Me.Label7.TabIndex = 36
         Me.Label7.Text = "Freitext"
         '
         'Label8
@@ -628,7 +673,7 @@ Partial Class frmGesSich
         Me.Label8.Location = New System.Drawing.Point(1075, 90)
         Me.Label8.Name = "Label8"
         Me.Label8.Size = New System.Drawing.Size(59, 13)
-        Me.Label8.TabIndex = 32
+        Me.Label8.TabIndex = 17
         Me.Label8.Text = "Warenwert"
         '
         'Label9
@@ -638,7 +683,7 @@ Partial Class frmGesSich
         Me.Label9.Location = New System.Drawing.Point(1169, 90)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(89, 13)
-        Me.Label9.TabIndex = 31
+        Me.Label9.TabIndex = 18
         Me.Label9.Text = "Sicherheitsbetrag"
         '
         'Label10
@@ -648,7 +693,7 @@ Partial Class frmGesSich
         Me.Label10.Location = New System.Drawing.Point(1003, 90)
         Me.Label10.Name = "Label10"
         Me.Label10.Size = New System.Drawing.Size(40, 13)
-        Me.Label10.TabIndex = 30
+        Me.Label10.TabIndex = 16
         Me.Label10.Text = "Uhrzeit"
         '
         'Label11
@@ -658,7 +703,7 @@ Partial Class frmGesSich
         Me.Label11.Location = New System.Drawing.Point(918, 90)
         Me.Label11.Name = "Label11"
         Me.Label11.Size = New System.Drawing.Size(38, 13)
-        Me.Label11.TabIndex = 29
+        Me.Label11.TabIndex = 15
         Me.Label11.Text = "Datum"
         '
         'Label12
@@ -668,7 +713,7 @@ Partial Class frmGesSich
         Me.Label12.Location = New System.Drawing.Point(765, 90)
         Me.Label12.Name = "Label12"
         Me.Label12.Size = New System.Drawing.Size(64, 13)
-        Me.Label12.TabIndex = 28
+        Me.Label12.TabIndex = 14
         Me.Label12.Text = "ATC / MRN"
         '
         'Label6
@@ -678,7 +723,7 @@ Partial Class frmGesSich
         Me.Label6.Location = New System.Drawing.Point(364, 136)
         Me.Label6.Name = "Label6"
         Me.Label6.Size = New System.Drawing.Size(41, 13)
-        Me.Label6.TabIndex = 27
+        Me.Label6.TabIndex = 34
         Me.Label6.Text = "Freitext"
         '
         'Label5
@@ -688,7 +733,7 @@ Partial Class frmGesSich
         Me.Label5.Location = New System.Drawing.Point(426, 90)
         Me.Label5.Name = "Label5"
         Me.Label5.Size = New System.Drawing.Size(59, 13)
-        Me.Label5.TabIndex = 26
+        Me.Label5.TabIndex = 12
         Me.Label5.Text = "Warenwert"
         '
         'Label4
@@ -698,7 +743,7 @@ Partial Class frmGesSich
         Me.Label4.Location = New System.Drawing.Point(520, 90)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(89, 13)
-        Me.Label4.TabIndex = 25
+        Me.Label4.TabIndex = 13
         Me.Label4.Text = "Sicherheitsbetrag"
         '
         'Label3
@@ -708,7 +753,7 @@ Partial Class frmGesSich
         Me.Label3.Location = New System.Drawing.Point(365, 90)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(40, 13)
-        Me.Label3.TabIndex = 24
+        Me.Label3.TabIndex = 11
         Me.Label3.Text = "Uhrzeit"
         '
         'Label2
@@ -718,7 +763,7 @@ Partial Class frmGesSich
         Me.Label2.Location = New System.Drawing.Point(274, 90)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(38, 13)
-        Me.Label2.TabIndex = 23
+        Me.Label2.TabIndex = 10
         Me.Label2.Text = "Datum"
         '
         'Label1
@@ -728,7 +773,7 @@ Partial Class frmGesSich
         Me.Label1.Location = New System.Drawing.Point(76, 90)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(70, 13)
-        Me.Label1.TabIndex = 22
+        Me.Label1.TabIndex = 8
         Me.Label1.Text = "ATB Nummer"
         '
         'txtFreitextClose
@@ -738,7 +783,7 @@ Partial Class frmGesSich
         Me.txtFreitextClose.Margin = New System.Windows.Forms.Padding(0)
         Me.txtFreitextClose.Name = "txtFreitextClose"
         Me.txtFreitextClose.Size = New System.Drawing.Size(255, 24)
-        Me.txtFreitextClose.TabIndex = 21
+        Me.txtFreitextClose.TabIndex = 41
         '
         'txtFreitextOpen
         '
@@ -747,7 +792,7 @@ Partial Class frmGesSich
         Me.txtFreitextOpen.Margin = New System.Windows.Forms.Padding(0)
         Me.txtFreitextOpen.Name = "txtFreitextOpen"
         Me.txtFreitextOpen.Size = New System.Drawing.Size(256, 24)
-        Me.txtFreitextOpen.TabIndex = 20
+        Me.txtFreitextOpen.TabIndex = 40
         '
         'frmGesSich
         '
diff --git a/Aviso/frmGesSichMenu.Designer.vb b/Aviso/frmGesSichMenu.Designer.vb
index b3dbbaa..38c334a 100644
--- a/Aviso/frmGesSichMenu.Designer.vb
+++ b/Aviso/frmGesSichMenu.Designer.vb
@@ -58,7 +58,7 @@ Partial Class frmGesSichMenu
         Me.dgvListe.Name = "dgvListe"
         Me.dgvListe.ReadOnly = True
         Me.dgvListe.Size = New System.Drawing.Size(502, 565)
-        Me.dgvListe.TabIndex = 3
+        Me.dgvListe.TabIndex = 1
         '
         'Panel1
         '
@@ -81,7 +81,7 @@ Partial Class frmGesSichMenu
         Me.Panel1.Location = New System.Drawing.Point(0, 0)
         Me.Panel1.Name = "Panel1"
         Me.Panel1.Size = New System.Drawing.Size(502, 156)
-        Me.Panel1.TabIndex = 2
+        Me.Panel1.TabIndex = 0
         '
         'FlatButton2
         '
@@ -93,7 +93,7 @@ Partial Class frmGesSichMenu
         Me.FlatButton2.Location = New System.Drawing.Point(112, 101)
         Me.FlatButton2.Name = "FlatButton2"
         Me.FlatButton2.Size = New System.Drawing.Size(81, 20)
-        Me.FlatButton2.TabIndex = 25
+        Me.FlatButton2.TabIndex = 10
         Me.FlatButton2.Text = "jedes Datum"
         Me.FlatButton2.UseVisualStyleBackColor = False
         '
@@ -107,7 +107,7 @@ Partial Class frmGesSichMenu
         Me.btnSucheStarten.Location = New System.Drawing.Point(201, 127)
         Me.btnSucheStarten.Name = "btnSucheStarten"
         Me.btnSucheStarten.Size = New System.Drawing.Size(81, 20)
-        Me.btnSucheStarten.TabIndex = 24
+        Me.btnSucheStarten.TabIndex = 11
         Me.btnSucheStarten.Text = "Suche starten"
         Me.btnSucheStarten.UseVisualStyleBackColor = False
         '
@@ -130,7 +130,7 @@ Partial Class frmGesSichMenu
         Me.txtbis.MaxLines_Warning_Label = Nothing
         Me.txtbis.Name = "txtbis"
         Me.txtbis.Size = New System.Drawing.Size(81, 20)
-        Me.txtbis.TabIndex = 23
+        Me.txtbis.TabIndex = 8
         '
         'txtVon
         '
@@ -151,7 +151,7 @@ Partial Class frmGesSichMenu
         Me.txtVon.MaxLines_Warning_Label = Nothing
         Me.txtVon.Name = "txtVon"
         Me.txtVon.Size = New System.Drawing.Size(81, 20)
-        Me.txtVon.TabIndex = 22
+        Me.txtVon.TabIndex = 7
         '
         'Label3
         '
@@ -162,7 +162,7 @@ Partial Class frmGesSichMenu
         Me.Label3.Location = New System.Drawing.Point(109, 59)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(24, 15)
-        Me.Label3.TabIndex = 19
+        Me.Label3.TabIndex = 5
         Me.Label3.Text = "Bis"
         '
         'Label2
@@ -174,7 +174,7 @@ Partial Class frmGesSichMenu
         Me.Label2.Location = New System.Drawing.Point(12, 59)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(28, 15)
-        Me.Label2.TabIndex = 18
+        Me.Label2.TabIndex = 4
         Me.Label2.Text = "Von"
         '
         'Label1
@@ -186,7 +186,7 @@ Partial Class frmGesSichMenu
         Me.Label1.Location = New System.Drawing.Point(12, 11)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(45, 15)
-        Me.Label1.TabIndex = 17
+        Me.Label1.TabIndex = 0
         Me.Label1.Text = "Suche:"
         '
         'FlatButton1
@@ -200,7 +200,7 @@ Partial Class frmGesSichMenu
         Me.FlatButton1.Location = New System.Drawing.Point(233, 22)
         Me.FlatButton1.Name = "FlatButton1"
         Me.FlatButton1.Size = New System.Drawing.Size(32, 33)
-        Me.FlatButton1.TabIndex = 15
+        Me.FlatButton1.TabIndex = 2
         Me.FlatButton1.UseVisualStyleBackColor = False
         '
         'txtSuchbegriff
@@ -208,7 +208,7 @@ Partial Class frmGesSichMenu
         Me.txtSuchbegriff.Location = New System.Drawing.Point(12, 29)
         Me.txtSuchbegriff.Name = "txtSuchbegriff"
         Me.txtSuchbegriff.Size = New System.Drawing.Size(181, 20)
-        Me.txtSuchbegriff.TabIndex = 14
+        Me.txtSuchbegriff.TabIndex = 1
         '
         'chkOffen
         '
@@ -219,7 +219,7 @@ Partial Class frmGesSichMenu
         Me.chkOffen.Location = New System.Drawing.Point(28, 131)
         Me.chkOffen.Name = "chkOffen"
         Me.chkOffen.Size = New System.Drawing.Size(120, 17)
-        Me.chkOffen.TabIndex = 13
+        Me.chkOffen.TabIndex = 12
         Me.chkOffen.Text = "nur offene anzeigen"
         Me.chkOffen.UseVisualStyleBackColor = True
         '
@@ -233,7 +233,7 @@ Partial Class frmGesSichMenu
         Me.btnNeu.Location = New System.Drawing.Point(415, 127)
         Me.btnNeu.Name = "btnNeu"
         Me.btnNeu.Size = New System.Drawing.Size(75, 23)
-        Me.btnNeu.TabIndex = 12
+        Me.btnNeu.TabIndex = 13
         Me.btnNeu.Text = "Neu"
         Me.btnNeu.UseVisualStyleBackColor = False
         '
@@ -246,7 +246,7 @@ Partial Class frmGesSichMenu
         Me.lblSaldo.Location = New System.Drawing.Point(294, 24)
         Me.lblSaldo.Name = "lblSaldo"
         Me.lblSaldo.Size = New System.Drawing.Size(147, 24)
-        Me.lblSaldo.TabIndex = 2
+        Me.lblSaldo.TabIndex = 3
         Me.lblSaldo.Text = "Saldo: €80.000"
         '
         'lblZollsatz
@@ -258,7 +258,7 @@ Partial Class frmGesSichMenu
         Me.lblZollsatz.Location = New System.Drawing.Point(295, 86)
         Me.lblZollsatz.Name = "lblZollsatz"
         Me.lblZollsatz.Size = New System.Drawing.Size(86, 16)
-        Me.lblZollsatz.TabIndex = 4
+        Me.lblZollsatz.TabIndex = 9
         Me.lblZollsatz.Text = "Zollsatz: 12%"
         '
         'lblReferenzwert
@@ -270,19 +270,19 @@ Partial Class frmGesSichMenu
         Me.lblReferenzwert.Location = New System.Drawing.Point(295, 59)
         Me.lblReferenzwert.Name = "lblReferenzwert"
         Me.lblReferenzwert.Size = New System.Drawing.Size(137, 16)
-        Me.lblReferenzwert.TabIndex = 3
+        Me.lblReferenzwert.TabIndex = 6
         Me.lblReferenzwert.Text = "Referenzwert: €80.000"
         '
         'ContextMenuStrip1
         '
         Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 48)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(132, 26)
         '
         'ExportCSVToolStripMenuItem
         '
         Me.ExportCSVToolStripMenuItem.Name = "ExportCSVToolStripMenuItem"
-        Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(131, 22)
         Me.ExportCSVToolStripMenuItem.Text = "Export CSV"
         '
         'frmGesSichMenu
diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb
index ed8ad47..4bfd2b6 100644
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -113,9 +113,10 @@ Partial Class frmHauptfenster
         Me.SDLAbholaufträgeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem13 = New System.Windows.Forms.ToolStripMenuItem()
         Me.VorauskassenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ATGesamtsicherheitVeragAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ATGesamtsicherheitVeragAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ATGesamtsicherheitVeragCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.StatistikToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.LKWBerichtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.StatistikADMINToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -238,7 +239,6 @@ Partial Class frmHauptfenster
         Me.Button12 = New System.Windows.Forms.Button()
         Me.btnNeu = New System.Windows.Forms.Button()
         Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
-        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Button10 = New System.Windows.Forms.Button()
         Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -322,7 +322,7 @@ Partial Class frmHauptfenster
         Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
         Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
-        Me.ATGesamtsicherheitVeragCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
         Me.conMenuAviso.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.Top.SuspendLayout()
@@ -369,7 +369,7 @@ Partial Class frmHauptfenster
         'conÜbernehmen
         '
         Me.conÜbernehmen.Name = "conÜbernehmen"
-        Me.conÜbernehmen.Size = New System.Drawing.Size(284, 22)
+        Me.conÜbernehmen.Size = New System.Drawing.Size(286, 22)
         Me.conÜbernehmen.Text = "Akt übernehmen"
         '
         'conMenuAviso
@@ -377,64 +377,64 @@ Partial Class frmHauptfenster
         Me.conMenuAviso.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.conMenuAviso.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conÜbernehmen, Me.ToolStripSeparator5, Me.conFertig, Me.ToolStripSeparator1, Me.conVorgeschrieben, Me.conVorbereitet, Me.conAnkunft, Me.conFreigabe, Me.conNichtEingetroffen, Me.ToolStripSeparator2, Me.conÄndern})
         Me.conMenuAviso.Name = "conMenuTage"
-        Me.conMenuAviso.Size = New System.Drawing.Size(285, 198)
+        Me.conMenuAviso.Size = New System.Drawing.Size(287, 198)
         '
         'ToolStripSeparator5
         '
         Me.ToolStripSeparator5.Name = "ToolStripSeparator5"
-        Me.ToolStripSeparator5.Size = New System.Drawing.Size(281, 6)
+        Me.ToolStripSeparator5.Size = New System.Drawing.Size(283, 6)
         '
         'conFertig
         '
         Me.conFertig.Name = "conFertig"
-        Me.conFertig.Size = New System.Drawing.Size(284, 22)
+        Me.conFertig.Size = New System.Drawing.Size(286, 22)
         Me.conFertig.Text = "LKW ist FERTIG / nicht FERTIG"
         '
         'ToolStripSeparator1
         '
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(281, 6)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(283, 6)
         '
         'conVorgeschrieben
         '
         Me.conVorgeschrieben.Name = "conVorgeschrieben"
-        Me.conVorgeschrieben.Size = New System.Drawing.Size(284, 22)
+        Me.conVorgeschrieben.Size = New System.Drawing.Size(286, 22)
         Me.conVorgeschrieben.Text = "auf Status VORGESCHRIEBEN setzen"
         '
         'conVorbereitet
         '
         Me.conVorbereitet.Name = "conVorbereitet"
-        Me.conVorbereitet.Size = New System.Drawing.Size(284, 22)
+        Me.conVorbereitet.Size = New System.Drawing.Size(286, 22)
         Me.conVorbereitet.Text = "auf Status VORBEREITET setzen"
         Me.conVorbereitet.Visible = False
         '
         'conAnkunft
         '
         Me.conAnkunft.Name = "conAnkunft"
-        Me.conAnkunft.Size = New System.Drawing.Size(284, 22)
+        Me.conAnkunft.Size = New System.Drawing.Size(286, 22)
         Me.conAnkunft.Text = "auf Status ANKUNFT setzen"
         '
         'conFreigabe
         '
         Me.conFreigabe.Name = "conFreigabe"
-        Me.conFreigabe.Size = New System.Drawing.Size(284, 22)
+        Me.conFreigabe.Size = New System.Drawing.Size(286, 22)
         Me.conFreigabe.Text = "auf Status FREIGABE setzen"
         '
         'conNichtEingetroffen
         '
         Me.conNichtEingetroffen.Name = "conNichtEingetroffen"
-        Me.conNichtEingetroffen.Size = New System.Drawing.Size(284, 22)
+        Me.conNichtEingetroffen.Size = New System.Drawing.Size(286, 22)
         Me.conNichtEingetroffen.Text = "auf Status NICHT EINGETROFFEN setzen"
         '
         'ToolStripSeparator2
         '
         Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(281, 6)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(283, 6)
         '
         'conÄndern
         '
         Me.conÄndern.Name = "conÄndern"
-        Me.conÄndern.Size = New System.Drawing.Size(284, 22)
+        Me.conÄndern.Size = New System.Drawing.Size(286, 22)
         Me.conÄndern.Text = "Eintrag ändern"
         '
         'MenuStrip1
@@ -597,43 +597,43 @@ Partial Class frmHauptfenster
         'VERAGToolStripMenuItem
         '
         Me.VERAGToolStripMenuItem.Name = "VERAGToolStripMenuItem"
-        Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
+        Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
         Me.VERAGToolStripMenuItem.Text = "VERAG"
         '
         'ATILLAToolStripMenuItem
         '
         Me.ATILLAToolStripMenuItem.Name = "ATILLAToolStripMenuItem"
-        Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
+        Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
         Me.ATILLAToolStripMenuItem.Text = "ATILLA"
         '
         'IMEXToolStripMenuItem
         '
         Me.IMEXToolStripMenuItem.Name = "IMEXToolStripMenuItem"
-        Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
+        Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
         Me.IMEXToolStripMenuItem.Text = "IMEX"
         '
         'UNISPEDToolStripMenuItem
         '
         Me.UNISPEDToolStripMenuItem.Name = "UNISPEDToolStripMenuItem"
-        Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
+        Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
         Me.UNISPEDToolStripMenuItem.Text = "UNISPED"
         '
         'AMBARToolStripMenuItem
         '
         Me.AMBARToolStripMenuItem.Name = "AMBARToolStripMenuItem"
-        Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
+        Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
         Me.AMBARToolStripMenuItem.Text = "AMBAR"
         '
         'FRONTOFFICEToolStripMenuItem
         '
         Me.FRONTOFFICEToolStripMenuItem.Name = "FRONTOFFICEToolStripMenuItem"
-        Me.FRONTOFFICEToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
+        Me.FRONTOFFICEToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
         Me.FRONTOFFICEToolStripMenuItem.Text = "FRONTOFFICE"
         '
         'VERIMEXToolStripMenuItem
         '
         Me.VERIMEXToolStripMenuItem.Name = "VERIMEXToolStripMenuItem"
-        Me.VERIMEXToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
+        Me.VERIMEXToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
         Me.VERIMEXToolStripMenuItem.Text = "VERIMEX"
         '
         'StandortWechselnToolStripMenuItem
@@ -691,13 +691,13 @@ Partial Class frmHauptfenster
         'DeutschToolStripMenuItem
         '
         Me.DeutschToolStripMenuItem.Name = "DeutschToolStripMenuItem"
-        Me.DeutschToolStripMenuItem.Size = New System.Drawing.Size(118, 22)
+        Me.DeutschToolStripMenuItem.Size = New System.Drawing.Size(119, 22)
         Me.DeutschToolStripMenuItem.Text = "Deutsch"
         '
         'TürkischToolStripMenuItem
         '
         Me.TürkischToolStripMenuItem.Name = "TürkischToolStripMenuItem"
-        Me.TürkischToolStripMenuItem.Size = New System.Drawing.Size(118, 22)
+        Me.TürkischToolStripMenuItem.Size = New System.Drawing.Size(119, 22)
         Me.TürkischToolStripMenuItem.Text = "Türkisch"
         '
         'NacherfassungToolStripMenuItem
@@ -881,23 +881,33 @@ Partial Class frmHauptfenster
         Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen"
         '
-        'ATGesamtsicherheitVeragAGToolStripMenuItem
-        '
-        Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Name = "ATGesamtsicherheitVeragAGToolStripMenuItem"
-        Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
-        Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Text = "AT | Gesamtsicherheit Verag AG"
-        '
         'DEGesamtsicherheitVeragGmbHToolStripMenuItem
         '
         Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Name = "DEGesamtsicherheitVeragGmbHToolStripMenuItem"
         Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Text = "DE | Gesamtsicherheit Verag GmbH"
+        Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem.Visible = False
+        '
+        'ATGesamtsicherheitVeragAGToolStripMenuItem
+        '
+        Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Name = "ATGesamtsicherheitVeragAGToolStripMenuItem"
+        Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Text = "AT | Gesamtsicherheit Verag AG"
+        Me.ATGesamtsicherheitVeragAGToolStripMenuItem.Visible = False
         '
         'ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem
         '
         Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Name = "ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem"
         Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
         Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Text = "AT | Gesamtsicherheit IMEX CS GmbH"
+        Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Visible = False
+        '
+        'ATGesamtsicherheitVeragCSToolStripMenuItem
+        '
+        Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Name = "ATGesamtsicherheitVeragCSToolStripMenuItem"
+        Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
+        Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Text = "AT | Gesamtsicherheit Verag CS"
+        Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Visible = False
         '
         'StatistikToolStripMenuItem
         '
@@ -1102,31 +1112,31 @@ Partial Class frmHauptfenster
         'ToolStripMenuItem8
         '
         Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8"
-        Me.ToolStripMenuItem8.Size = New System.Drawing.Size(243, 22)
+        Me.ToolStripMenuItem8.Size = New System.Drawing.Size(244, 22)
         Me.ToolStripMenuItem8.Text = "Annahmeblatt IMPORT DE / TR"
         '
         'ToolStripMenuItem9
         '
         Me.ToolStripMenuItem9.Name = "ToolStripMenuItem9"
-        Me.ToolStripMenuItem9.Size = New System.Drawing.Size(243, 22)
+        Me.ToolStripMenuItem9.Size = New System.Drawing.Size(244, 22)
         Me.ToolStripMenuItem9.Text = "Annahmeblatt EXPORT DE / TR"
         '
         'AnnahmeblattIMPORTToolStripMenuItem
         '
         Me.AnnahmeblattIMPORTToolStripMenuItem.Name = "AnnahmeblattIMPORTToolStripMenuItem"
-        Me.AnnahmeblattIMPORTToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
+        Me.AnnahmeblattIMPORTToolStripMenuItem.Size = New System.Drawing.Size(244, 22)
         Me.AnnahmeblattIMPORTToolStripMenuItem.Text = "Annahmeblatt IMPORT DE / SRB"
         '
         'AnnahmeblattEXPORTToolStripMenuItem
         '
         Me.AnnahmeblattEXPORTToolStripMenuItem.Name = "AnnahmeblattEXPORTToolStripMenuItem"
-        Me.AnnahmeblattEXPORTToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
+        Me.AnnahmeblattEXPORTToolStripMenuItem.Size = New System.Drawing.Size(244, 22)
         Me.AnnahmeblattEXPORTToolStripMenuItem.Text = "Annahmeblatt EXPORT DE / SRB"
         '
         'ChecklisteVerwahrlagerToolStripMenuItem
         '
         Me.ChecklisteVerwahrlagerToolStripMenuItem.Name = "ChecklisteVerwahrlagerToolStripMenuItem"
-        Me.ChecklisteVerwahrlagerToolStripMenuItem.Size = New System.Drawing.Size(243, 22)
+        Me.ChecklisteVerwahrlagerToolStripMenuItem.Size = New System.Drawing.Size(244, 22)
         Me.ChecklisteVerwahrlagerToolStripMenuItem.Text = "Checkliste Verwahrlager"
         '
         'ToolStripSeparator13
@@ -1156,7 +1166,7 @@ Partial Class frmHauptfenster
         '
         Me.BREXITToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GVMSUKIMportToolStripMenuItem, Me.GVMSBeschreibungToolStripMenuItem, Me.ToolStripSeparator14, Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem, Me.TicketIBFBeschreibungToolStripMenuItem, Me.IBFStatusToolStripMenuItem, Me.ToolStripSeparator15, Me.FREnveloppeSmartBorderToolStripMenuItem, Me.ToolStripSeparator16, Me.PBNIrelandFähreToolStripMenuItem, Me.ToolStripSeparator20, Me.WARENORTToolStripMenuItem, Me.ToolStripMenuItem14, Me.ToolStripSeparator18, Me.EORIUKGeneriertenToolStripMenuItem, Me.KAPKentAccessPermitToolStripMenuItem})
         Me.BREXITToolStripMenuItem.Name = "BREXITToolStripMenuItem"
-        Me.BREXITToolStripMenuItem.Size = New System.Drawing.Size(55, 20)
+        Me.BREXITToolStripMenuItem.Size = New System.Drawing.Size(56, 20)
         Me.BREXITToolStripMenuItem.Text = "BREXIT"
         Me.BREXITToolStripMenuItem.Visible = False
         '
@@ -1164,140 +1174,140 @@ Partial Class frmHauptfenster
         '
         Me.GVMSUKIMportToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1
         Me.GVMSUKIMportToolStripMenuItem.Name = "GVMSUKIMportToolStripMenuItem"
-        Me.GVMSUKIMportToolStripMenuItem.Size = New System.Drawing.Size(248, 22)
+        Me.GVMSUKIMportToolStripMenuItem.Size = New System.Drawing.Size(249, 22)
         Me.GVMSUKIMportToolStripMenuItem.Text = "GVMS (UK Import)"
         '
         'GVMSBeschreibungToolStripMenuItem
         '
         Me.GVMSBeschreibungToolStripMenuItem.Enabled = False
         Me.GVMSBeschreibungToolStripMenuItem.Name = "GVMSBeschreibungToolStripMenuItem"
-        Me.GVMSBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(248, 22)
+        Me.GVMSBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(249, 22)
         Me.GVMSBeschreibungToolStripMenuItem.Text = "GVMS Beschreibung"
         '
         'ToolStripSeparator14
         '
         Me.ToolStripSeparator14.Name = "ToolStripSeparator14"
-        Me.ToolStripSeparator14.Size = New System.Drawing.Size(245, 6)
+        Me.ToolStripSeparator14.Size = New System.Drawing.Size(246, 6)
         '
         'TicketIBFInlandBorderFacilitiesToolStripMenuItem
         '
         Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1
         Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Name = "TicketIBFInlandBorderFacilitiesToolStripMenuItem"
-        Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Size = New System.Drawing.Size(248, 22)
+        Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Size = New System.Drawing.Size(249, 22)
         Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem.Text = "Ticket IBF (InlandBorderFacilities)"
         '
         'TicketIBFBeschreibungToolStripMenuItem
         '
         Me.TicketIBFBeschreibungToolStripMenuItem.Name = "TicketIBFBeschreibungToolStripMenuItem"
-        Me.TicketIBFBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(248, 22)
+        Me.TicketIBFBeschreibungToolStripMenuItem.Size = New System.Drawing.Size(249, 22)
         Me.TicketIBFBeschreibungToolStripMenuItem.Text = "Ticket IBF Beschreibung"
         '
         'IBFStatusToolStripMenuItem
         '
         Me.IBFStatusToolStripMenuItem.Name = "IBFStatusToolStripMenuItem"
-        Me.IBFStatusToolStripMenuItem.Size = New System.Drawing.Size(248, 22)
+        Me.IBFStatusToolStripMenuItem.Size = New System.Drawing.Size(249, 22)
         Me.IBFStatusToolStripMenuItem.Text = "IBF Status"
         '
         'ToolStripSeparator15
         '
         Me.ToolStripSeparator15.Name = "ToolStripSeparator15"
-        Me.ToolStripSeparator15.Size = New System.Drawing.Size(245, 6)
+        Me.ToolStripSeparator15.Size = New System.Drawing.Size(246, 6)
         '
         'FREnveloppeSmartBorderToolStripMenuItem
         '
         Me.FREnveloppeSmartBorderToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1
         Me.FREnveloppeSmartBorderToolStripMenuItem.Name = "FREnveloppeSmartBorderToolStripMenuItem"
-        Me.FREnveloppeSmartBorderToolStripMenuItem.Size = New System.Drawing.Size(248, 22)
+        Me.FREnveloppeSmartBorderToolStripMenuItem.Size = New System.Drawing.Size(249, 22)
         Me.FREnveloppeSmartBorderToolStripMenuItem.Text = "FR: Enveloppe (SmartBorder)"
         '
         'ToolStripSeparator16
         '
         Me.ToolStripSeparator16.Name = "ToolStripSeparator16"
-        Me.ToolStripSeparator16.Size = New System.Drawing.Size(245, 6)
+        Me.ToolStripSeparator16.Size = New System.Drawing.Size(246, 6)
         '
         'PBNIrelandFähreToolStripMenuItem
         '
         Me.PBNIrelandFähreToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1
         Me.PBNIrelandFähreToolStripMenuItem.Name = "PBNIrelandFähreToolStripMenuItem"
-        Me.PBNIrelandFähreToolStripMenuItem.Size = New System.Drawing.Size(248, 22)
+        Me.PBNIrelandFähreToolStripMenuItem.Size = New System.Drawing.Size(249, 22)
         Me.PBNIrelandFähreToolStripMenuItem.Text = "PBN (Ireland Fähre)"
         '
         'ToolStripSeparator20
         '
         Me.ToolStripSeparator20.Name = "ToolStripSeparator20"
-        Me.ToolStripSeparator20.Size = New System.Drawing.Size(245, 6)
+        Me.ToolStripSeparator20.Size = New System.Drawing.Size(246, 6)
         '
         'WARENORTToolStripMenuItem
         '
         Me.WARENORTToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATFormularZa282ToolStripMenuItem, Me.ATInfoToolStripMenuItem, Me.ToolStripSeparator17, Me.DEFormular0442ToolStripMenuItem, Me.DEInfoToolStripMenuItem})
         Me.WARENORTToolStripMenuItem.Name = "WARENORTToolStripMenuItem"
-        Me.WARENORTToolStripMenuItem.Size = New System.Drawing.Size(248, 22)
+        Me.WARENORTToolStripMenuItem.Size = New System.Drawing.Size(249, 22)
         Me.WARENORTToolStripMenuItem.Text = "REX"
         '
         'ATFormularZa282ToolStripMenuItem
         '
         Me.ATFormularZa282ToolStripMenuItem.Name = "ATFormularZa282ToolStripMenuItem"
-        Me.ATFormularZa282ToolStripMenuItem.Size = New System.Drawing.Size(172, 22)
+        Me.ATFormularZa282ToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
         Me.ATFormularZa282ToolStripMenuItem.Text = "AT Formular Za278"
         '
         'ATInfoToolStripMenuItem
         '
         Me.ATInfoToolStripMenuItem.Name = "ATInfoToolStripMenuItem"
-        Me.ATInfoToolStripMenuItem.Size = New System.Drawing.Size(172, 22)
+        Me.ATInfoToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
         Me.ATInfoToolStripMenuItem.Text = "AT Info"
         '
         'ToolStripSeparator17
         '
         Me.ToolStripSeparator17.Name = "ToolStripSeparator17"
-        Me.ToolStripSeparator17.Size = New System.Drawing.Size(169, 6)
+        Me.ToolStripSeparator17.Size = New System.Drawing.Size(170, 6)
         '
         'DEFormular0442ToolStripMenuItem
         '
         Me.DEFormular0442ToolStripMenuItem.Name = "DEFormular0442ToolStripMenuItem"
-        Me.DEFormular0442ToolStripMenuItem.Size = New System.Drawing.Size(172, 22)
+        Me.DEFormular0442ToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
         Me.DEFormular0442ToolStripMenuItem.Text = "DE Formular 0442"
         '
         'DEInfoToolStripMenuItem
         '
         Me.DEInfoToolStripMenuItem.Name = "DEInfoToolStripMenuItem"
-        Me.DEInfoToolStripMenuItem.Size = New System.Drawing.Size(172, 22)
+        Me.DEInfoToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
         Me.DEInfoToolStripMenuItem.Text = "DE Info"
         '
         'ToolStripMenuItem14
         '
         Me.ToolStripMenuItem14.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem16, Me.ToolStripSeparator19})
         Me.ToolStripMenuItem14.Name = "ToolStripMenuItem14"
-        Me.ToolStripMenuItem14.Size = New System.Drawing.Size(248, 22)
+        Me.ToolStripMenuItem14.Size = New System.Drawing.Size(249, 22)
         Me.ToolStripMenuItem14.Text = "WARENORT"
         '
         'ToolStripMenuItem16
         '
         Me.ToolStripMenuItem16.Name = "ToolStripMenuItem16"
-        Me.ToolStripMenuItem16.Size = New System.Drawing.Size(172, 22)
+        Me.ToolStripMenuItem16.Size = New System.Drawing.Size(173, 22)
         Me.ToolStripMenuItem16.Text = "AT Formular Za283"
         '
         'ToolStripSeparator19
         '
         Me.ToolStripSeparator19.Name = "ToolStripSeparator19"
-        Me.ToolStripSeparator19.Size = New System.Drawing.Size(169, 6)
+        Me.ToolStripSeparator19.Size = New System.Drawing.Size(170, 6)
         '
         'ToolStripSeparator18
         '
         Me.ToolStripSeparator18.Name = "ToolStripSeparator18"
-        Me.ToolStripSeparator18.Size = New System.Drawing.Size(245, 6)
+        Me.ToolStripSeparator18.Size = New System.Drawing.Size(246, 6)
         '
         'EORIUKGeneriertenToolStripMenuItem
         '
         Me.EORIUKGeneriertenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.fragezeichen1
         Me.EORIUKGeneriertenToolStripMenuItem.Name = "EORIUKGeneriertenToolStripMenuItem"
-        Me.EORIUKGeneriertenToolStripMenuItem.Size = New System.Drawing.Size(248, 22)
+        Me.EORIUKGeneriertenToolStripMenuItem.Size = New System.Drawing.Size(249, 22)
         Me.EORIUKGeneriertenToolStripMenuItem.Text = "EORI UK generierten"
         '
         'KAPKentAccessPermitToolStripMenuItem
         '
         Me.KAPKentAccessPermitToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.fragezeichen
         Me.KAPKentAccessPermitToolStripMenuItem.Name = "KAPKentAccessPermitToolStripMenuItem"
-        Me.KAPKentAccessPermitToolStripMenuItem.Size = New System.Drawing.Size(248, 22)
+        Me.KAPKentAccessPermitToolStripMenuItem.Size = New System.Drawing.Size(249, 22)
         Me.KAPKentAccessPermitToolStripMenuItem.Text = "KAP (KentAccessPermit)"
         '
         'mnuFragezeichen
@@ -2046,14 +2056,6 @@ Partial Class frmHauptfenster
         Me.SplitContainer3.SplitterDistance = 164
         Me.SplitContainer3.TabIndex = 3
         '
-        'UsrCntlBenachrichtigungen1
-        '
-        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
-        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(164, 298)
-        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
-        '
         'pnl
         '
         Me.pnl.Controls.Add(Me.Button10)
@@ -3105,11 +3107,13 @@ Partial Class frmHauptfenster
         Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
         Me.UsrCntlTestsystem1.TabIndex = 8
         '
-        'ATGesamtsicherheitVeragCSToolStripMenuItem
+        'UsrCntlBenachrichtigungen1
         '
-        Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Name = "ATGesamtsicherheitVeragCSToolStripMenuItem"
-        Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
-        Me.ATGesamtsicherheitVeragCSToolStripMenuItem.Text = "AT | Gesamtsicherheit Verag CS"
+        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
+        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(164, 298)
+        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
         '
         'frmHauptfenster
         '
diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb
index ce076ef..2491a5f 100644
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -252,6 +252,13 @@ Public Class frmHauptfenster
 
         End If
 
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("GESAMTSICHERHEIT", "AVISO") Then
+            DEGesamtsicherheitVeragGmbHToolStripMenuItem.Visible = True
+            ATGesamtsicherheitVeragAGToolStripMenuItem.Visible = True
+            ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Visible = True
+            ATGesamtsicherheitVeragCSToolStripMenuItem.Visible = True
+        End If
+
 
         Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
             Case "ATILLA" ' Case "VERAG", "IMEX"
@@ -4767,10 +4774,10 @@ Public Class AvisoStatusFunctions
 
         If text <> "" Or text_Freigabe <> "" Then
 
-            Dim f As New frmDokumenteSchicken
+            Dim f As New frmDokumenteSchicken(AVISO)
             f.rtbDokumente.Text = text
             f.rtbSonstigeInfo.Text = text_Freigabe
-
+            f.cbxInfoblattFurDigitalabfertigungDrucken.Checked = (SQL.DLookup("COUNT(*)", "Vermerke", " AvisoID=" & AVISO.AvisoID & " and VermerkeCode=82", "AVISO", 0) > 0)
             f.ShowDialog()
         End If
     End Sub
diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb
index 1dbd502..4c14f4d 100644
--- a/Aviso/usrcntlAktDetails.vb
+++ b/Aviso/usrcntlAktDetails.vb
@@ -2648,6 +2648,20 @@ Public Class usrcntlAktDetails
     Private Sub Button10_Click(sender As Object, e As EventArgs) Handles Button10.Click, Button15.Click
         pnlDetailsRechts.Cursor = Cursors.WaitCursor
 
+
+
+        ' Fahrer zum Zoll!
+        '------------------------------------------------
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("PRINT_zumZOLL") Then
+            If vbYes = MsgBox("Fahrer-Anweisung ""zum Zollamt gehen"" ausdrucken?", vbYesNo) Then
+                Try
+                    Dim path = SDL.FormularManagerNEU.zumZOLL_AVISO(AVISO)
+                    If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, (New System.Drawing.Printing.PrinterSettings).PrinterName)
+                Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try
+            End If
+        End If
+        '------------------------------------------------
+
         Dim loadAttachRg = True ' (sender Is Button15)
 
         Dim ANH_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge)