diff --git a/Aviso/frmGesamtsicherheitenNEU.Designer.vb b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
index 8a8d1fd..fcade82 100644
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
@@ -22,13 +22,14 @@ Partial Class frmGesamtsicherheitenNEU
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheitenNEU))
+        Me.components = New System.ComponentModel.Container()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         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()
-        Me.ContextMenuStripGesSicherh = New System.Windows.Forms.ContextMenuStrip()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheitenNEU))
+        Me.ContextMenuStripGesSicherh = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ATBNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.MRNNRÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel2 = New System.Windows.Forms.Panel()
@@ -54,7 +55,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Label18 = New System.Windows.Forms.Label()
         Me.Label17 = New System.Windows.Forms.Label()
         Me.Label16 = New System.Windows.Forms.Label()
-        Me.ContextMenuStripPosSicherheiten = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuStripPosSicherheiten = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ATCMRNNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlSummeGes = New System.Windows.Forms.Panel()
         Me.Label28 = New System.Windows.Forms.Label()
@@ -130,8 +131,8 @@ Partial Class frmGesamtsicherheitenNEU
         Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.btnSave = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.btnClosePanOverlay = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.dgvGesamtsicherheit = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
-        Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.dgvGesamtsicherheit = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.txtPosSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtPosWarenwertGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -164,7 +165,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.ContextMenuStripGesSicherh.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATBNraendernToolStripMenuItem, Me.MRNNRÄndernToolStripMenuItem, Me.LöschenToolStripMenuItem})
         Me.ContextMenuStripGesSicherh.Name = "ContextMenuStrip1"
-        Me.ContextMenuStripGesSicherh.Size = New System.Drawing.Size(201, 92)
+        Me.ContextMenuStripGesSicherh.Size = New System.Drawing.Size(201, 70)
         '
         'ATBNraendernToolStripMenuItem
         '
@@ -190,7 +191,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Panel2.Location = New System.Drawing.Point(0, 287)
         Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(1444, 489)
+        Me.Panel2.Size = New System.Drawing.Size(1684, 489)
         Me.Panel2.TabIndex = 1
         '
         'pnlChangeATCNr
@@ -208,7 +209,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.pnlChangeATCNr.Controls.Add(Me.txtATCaendern)
         Me.pnlChangeATCNr.Controls.Add(Me.Label34)
         Me.pnlChangeATCNr.Controls.Add(Me.FlatButton4)
-        Me.pnlChangeATCNr.Location = New System.Drawing.Point(1051, 42)
+        Me.pnlChangeATCNr.Location = New System.Drawing.Point(1233, 46)
         Me.pnlChangeATCNr.Name = "pnlChangeATCNr"
         Me.pnlChangeATCNr.Size = New System.Drawing.Size(292, 192)
         Me.pnlChangeATCNr.TabIndex = 13
@@ -360,7 +361,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.panOverlay.Controls.Add(Me.Label17)
         Me.panOverlay.Controls.Add(Me.Label16)
         Me.panOverlay.Controls.Add(Me.btnClosePanOverlay)
-        Me.panOverlay.Location = New System.Drawing.Point(485, 15)
+        Me.panOverlay.Location = New System.Drawing.Point(615, 19)
         Me.panOverlay.Name = "panOverlay"
         Me.panOverlay.Size = New System.Drawing.Size(527, 297)
         Me.panOverlay.TabIndex = 2
@@ -465,14 +466,14 @@ Partial Class frmGesamtsicherheitenNEU
         Me.pnlSummeGes.Dock = System.Windows.Forms.DockStyle.Bottom
         Me.pnlSummeGes.Location = New System.Drawing.Point(0, 457)
         Me.pnlSummeGes.Name = "pnlSummeGes"
-        Me.pnlSummeGes.Size = New System.Drawing.Size(1444, 32)
+        Me.pnlSummeGes.Size = New System.Drawing.Size(1684, 32)
         Me.pnlSummeGes.TabIndex = 3
         '
         'Label28
         '
         Me.Label28.AutoSize = True
         Me.Label28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label28.Location = New System.Drawing.Point(1128, 9)
+        Me.Label28.Location = New System.Drawing.Point(1386, 9)
         Me.Label28.Name = "Label28"
         Me.Label28.Size = New System.Drawing.Size(130, 13)
         Me.Label28.TabIndex = 4
@@ -482,7 +483,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label29.AutoSize = True
         Me.Label29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label29.Location = New System.Drawing.Point(909, 9)
+        Me.Label29.Location = New System.Drawing.Point(1167, 9)
         Me.Label29.Name = "Label29"
         Me.Label29.Size = New System.Drawing.Size(103, 13)
         Me.Label29.TabIndex = 2
@@ -490,7 +491,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'txtPosAnzalPosGes
         '
-        Me.txtPosAnzalPosGes.Location = New System.Drawing.Point(830, 6)
+        Me.txtPosAnzalPosGes.Location = New System.Drawing.Point(1088, 6)
         Me.txtPosAnzalPosGes.Name = "txtPosAnzalPosGes"
         Me.txtPosAnzalPosGes.ReadOnly = True
         Me.txtPosAnzalPosGes.Size = New System.Drawing.Size(53, 20)
@@ -498,7 +499,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'txtAnzalPosGes
         '
-        Me.txtAnzalPosGes.Location = New System.Drawing.Point(93, 5)
+        Me.txtAnzalPosGes.Location = New System.Drawing.Point(198, 6)
         Me.txtAnzalPosGes.Name = "txtAnzalPosGes"
         Me.txtAnzalPosGes.ReadOnly = True
         Me.txtAnzalPosGes.Size = New System.Drawing.Size(53, 20)
@@ -508,7 +509,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label27.AutoSize = True
         Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label27.Location = New System.Drawing.Point(479, 9)
+        Me.Label27.Location = New System.Drawing.Point(584, 10)
         Me.Label27.Name = "Label27"
         Me.Label27.Size = New System.Drawing.Size(130, 13)
         Me.Label27.TabIndex = 4
@@ -518,7 +519,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label22.AutoSize = True
         Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label22.Location = New System.Drawing.Point(759, 9)
+        Me.Label22.Location = New System.Drawing.Point(1017, 9)
         Me.Label22.Name = "Label22"
         Me.Label22.Size = New System.Drawing.Size(63, 13)
         Me.Label22.TabIndex = 0
@@ -528,7 +529,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label24.AutoSize = True
         Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label24.Location = New System.Drawing.Point(9, 8)
+        Me.Label24.Location = New System.Drawing.Point(114, 9)
         Me.Label24.Name = "Label24"
         Me.Label24.Size = New System.Drawing.Size(63, 13)
         Me.Label24.TabIndex = 0
@@ -538,7 +539,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label25.AutoSize = True
         Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label25.Location = New System.Drawing.Point(194, 8)
+        Me.Label25.Location = New System.Drawing.Point(299, 9)
         Me.Label25.Name = "Label25"
         Me.Label25.Size = New System.Drawing.Size(103, 13)
         Me.Label25.TabIndex = 2
@@ -550,7 +551,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lblGestellungNr.AutoSize = True
         Me.lblGestellungNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblGestellungNr.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblGestellungNr.Location = New System.Drawing.Point(72, 7)
+        Me.lblGestellungNr.Location = New System.Drawing.Point(312, 7)
         Me.lblGestellungNr.Name = "lblGestellungNr"
         Me.lblGestellungNr.Size = New System.Drawing.Size(177, 24)
         Me.lblGestellungNr.TabIndex = 1
@@ -559,7 +560,7 @@ Partial Class frmGesamtsicherheitenNEU
         'txtPosTime
         '
         Me.txtPosTime.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosTime.Location = New System.Drawing.Point(1261, 204)
+        Me.txtPosTime.Location = New System.Drawing.Point(1282, 200)
         Me.txtPosTime.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosTime.Name = "txtPosTime"
         Me.txtPosTime.Size = New System.Drawing.Size(55, 24)
@@ -568,7 +569,7 @@ Partial Class frmGesamtsicherheitenNEU
         'txtSicherheitTime
         '
         Me.txtSicherheitTime.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSicherheitTime.Location = New System.Drawing.Point(595, 200)
+        Me.txtSicherheitTime.Location = New System.Drawing.Point(594, 200)
         Me.txtSicherheitTime.Margin = New System.Windows.Forms.Padding(0)
         Me.txtSicherheitTime.Name = "txtSicherheitTime"
         Me.txtSicherheitTime.Size = New System.Drawing.Size(55, 24)
@@ -578,7 +579,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.txtPosSicherheitsbetrag.Enabled = False
         Me.txtPosSicherheitsbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosSicherheitsbetrag.Location = New System.Drawing.Point(1422, 204)
+        Me.txtPosSicherheitsbetrag.Location = New System.Drawing.Point(1443, 200)
         Me.txtPosSicherheitsbetrag.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosSicherheitsbetrag.Name = "txtPosSicherheitsbetrag"
         Me.txtPosSicherheitsbetrag.Size = New System.Drawing.Size(104, 24)
@@ -587,7 +588,7 @@ Partial Class frmGesamtsicherheitenNEU
         'txtPosWarenwert
         '
         Me.txtPosWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosWarenwert.Location = New System.Drawing.Point(1319, 204)
+        Me.txtPosWarenwert.Location = New System.Drawing.Point(1340, 200)
         Me.txtPosWarenwert.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosWarenwert.Name = "txtPosWarenwert"
         Me.txtPosWarenwert.Size = New System.Drawing.Size(100, 24)
@@ -597,7 +598,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.txtPositionenCRN.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper
         Me.txtPositionenCRN.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPositionenCRN.Location = New System.Drawing.Point(943, 204)
+        Me.txtPositionenCRN.Location = New System.Drawing.Point(964, 200)
         Me.txtPositionenCRN.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPositionenCRN.Name = "txtPositionenCRN"
         Me.txtPositionenCRN.Size = New System.Drawing.Size(203, 24)
@@ -607,7 +608,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.txtSicherheitSicherheitsbetrag.Enabled = False
         Me.txtSicherheitSicherheitsbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSicherheitSicherheitsbetrag.Location = New System.Drawing.Point(772, 201)
+        Me.txtSicherheitSicherheitsbetrag.Location = New System.Drawing.Point(772, 200)
         Me.txtSicherheitSicherheitsbetrag.Margin = New System.Windows.Forms.Padding(0)
         Me.txtSicherheitSicherheitsbetrag.Name = "txtSicherheitSicherheitsbetrag"
         Me.txtSicherheitSicherheitsbetrag.Size = New System.Drawing.Size(90, 24)
@@ -626,7 +627,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.txtSicherheitATBNr.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper
         Me.txtSicherheitATBNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSicherheitATBNr.Location = New System.Drawing.Point(90, 200)
+        Me.txtSicherheitATBNr.Location = New System.Drawing.Point(60, 200)
         Me.txtSicherheitATBNr.Margin = New System.Windows.Forms.Padding(0)
         Me.txtSicherheitATBNr.Name = "txtSicherheitATBNr"
         Me.txtSicherheitATBNr.Size = New System.Drawing.Size(165, 24)
@@ -638,7 +639,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lblZollsatz.AutoSize = True
         Me.lblZollsatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblZollsatz.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblZollsatz.Location = New System.Drawing.Point(1012, 137)
+        Me.lblZollsatz.Location = New System.Drawing.Point(1252, 137)
         Me.lblZollsatz.Name = "lblZollsatz"
         Me.lblZollsatz.Size = New System.Drawing.Size(85, 16)
         Me.lblZollsatz.TabIndex = 7
@@ -650,7 +651,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lblReferenzwert.AutoSize = True
         Me.lblReferenzwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblReferenzwert.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblReferenzwert.Location = New System.Drawing.Point(1012, 121)
+        Me.lblReferenzwert.Location = New System.Drawing.Point(1252, 121)
         Me.lblReferenzwert.Name = "lblReferenzwert"
         Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16)
         Me.lblReferenzwert.TabIndex = 6
@@ -662,7 +663,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lblSaldo.AutoSize = True
         Me.lblSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblSaldo.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblSaldo.Location = New System.Drawing.Point(1199, 105)
+        Me.lblSaldo.Location = New System.Drawing.Point(1439, 105)
         Me.lblSaldo.Name = "lblSaldo"
         Me.lblSaldo.Size = New System.Drawing.Size(147, 24)
         Me.lblSaldo.TabIndex = 5
@@ -685,9 +686,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.panOben.Controls.Add(Me.lblId)
         Me.panOben.Controls.Add(Me.txtZollsatzueberschreiben)
         Me.panOben.Controls.Add(Me.cbxZollsatzueberschreiben)
-        Me.panOben.Controls.Add(Me.btnNext)
         Me.panOben.Controls.Add(Me.lbloffenerSaldo)
-        Me.panOben.Controls.Add(Me.btnPrev)
         Me.panOben.Controls.Add(Me.Label20)
         Me.panOben.Controls.Add(Me.txtPosNr)
         Me.panOben.Controls.Add(Me.Panel1)
@@ -733,14 +732,14 @@ Partial Class frmGesamtsicherheitenNEU
         Me.panOben.Location = New System.Drawing.Point(0, 0)
         Me.panOben.Margin = New System.Windows.Forms.Padding(0)
         Me.panOben.Name = "panOben"
-        Me.panOben.Size = New System.Drawing.Size(1444, 287)
+        Me.panOben.Size = New System.Drawing.Size(1684, 287)
         Me.panOben.TabIndex = 0
         '
         'Label31
         '
         Me.Label31.AutoSize = True
         Me.Label31.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label31.Location = New System.Drawing.Point(317, 187)
+        Me.Label31.Location = New System.Drawing.Point(312, 187)
         Me.Label31.Name = "Label31"
         Me.Label31.Size = New System.Drawing.Size(79, 13)
         Me.Label31.TabIndex = 57
@@ -750,17 +749,17 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.txtMRNNr.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper
         Me.txtMRNNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtMRNNr.Location = New System.Drawing.Point(297, 200)
+        Me.txtMRNNr.Location = New System.Drawing.Point(270, 200)
         Me.txtMRNNr.Margin = New System.Windows.Forms.Padding(0)
         Me.txtMRNNr.Name = "txtMRNNr"
-        Me.txtMRNNr.Size = New System.Drawing.Size(143, 24)
+        Me.txtMRNNr.Size = New System.Drawing.Size(165, 24)
         Me.txtMRNNr.TabIndex = 27
         '
         'Label19
         '
         Me.Label19.AutoSize = True
         Me.Label19.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label19.Location = New System.Drawing.Point(440, 188)
+        Me.Label19.Location = New System.Drawing.Point(435, 188)
         Me.Label19.Name = "Label19"
         Me.Label19.Size = New System.Drawing.Size(35, 13)
         Me.Label19.TabIndex = 55
@@ -769,7 +768,7 @@ Partial Class frmGesamtsicherheitenNEU
         'txtSPosNr
         '
         Me.txtSPosNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSPosNr.Location = New System.Drawing.Point(443, 201)
+        Me.txtSPosNr.Location = New System.Drawing.Point(438, 200)
         Me.txtSPosNr.Margin = New System.Windows.Forms.Padding(0)
         Me.txtSPosNr.Name = "txtSPosNr"
         Me.txtSPosNr.Size = New System.Drawing.Size(35, 24)
@@ -780,7 +779,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.dtpSicherheitDat.CustomFormat = "''"
         Me.dtpSicherheitDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.dtpSicherheitDat.Format = System.Windows.Forms.DateTimePickerFormat.Custom
-        Me.dtpSicherheitDat.Location = New System.Drawing.Point(483, 200)
+        Me.dtpSicherheitDat.Location = New System.Drawing.Point(478, 200)
         Me.dtpSicherheitDat.Margin = New System.Windows.Forms.Padding(0)
         Me.dtpSicherheitDat.Name = "dtpSicherheitDat"
         Me.dtpSicherheitDat.Size = New System.Drawing.Size(110, 24)
@@ -791,7 +790,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.dtpPosDat.CustomFormat = "''"
         Me.dtpPosDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.dtpPosDat.Format = System.Windows.Forms.DateTimePickerFormat.Custom
-        Me.dtpPosDat.Location = New System.Drawing.Point(1150, 204)
+        Me.dtpPosDat.Location = New System.Drawing.Point(1171, 200)
         Me.dtpPosDat.Margin = New System.Windows.Forms.Padding(0)
         Me.dtpPosDat.Name = "dtpPosDat"
         Me.dtpPosDat.RightToLeft = System.Windows.Forms.RightToLeft.No
@@ -804,7 +803,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lbloffenerWarenwert.AutoSize = True
         Me.lbloffenerWarenwert.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lbloffenerWarenwert.ForeColor = System.Drawing.Color.Red
-        Me.lbloffenerWarenwert.Location = New System.Drawing.Point(153, 109)
+        Me.lbloffenerWarenwert.Location = New System.Drawing.Point(393, 109)
         Me.lbloffenerWarenwert.Name = "lbloffenerWarenwert"
         Me.lbloffenerWarenwert.Size = New System.Drawing.Size(204, 24)
         Me.lbloffenerWarenwert.TabIndex = 51
@@ -828,7 +827,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lblId.AutoSize = True
         Me.lblId.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblId.ForeColor = System.Drawing.Color.Honeydew
-        Me.lblId.Location = New System.Drawing.Point(1289, 7)
+        Me.lblId.Location = New System.Drawing.Point(1529, 7)
         Me.lblId.Name = "lblId"
         Me.lblId.Size = New System.Drawing.Size(29, 24)
         Me.lblId.TabIndex = 0
@@ -838,7 +837,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.cbxZollsatzueberschreiben.AutoSize = True
         Me.cbxZollsatzueberschreiben.ForeColor = System.Drawing.Color.White
-        Me.cbxZollsatzueberschreiben.Location = New System.Drawing.Point(953, 158)
+        Me.cbxZollsatzueberschreiben.Location = New System.Drawing.Point(974, 154)
         Me.cbxZollsatzueberschreiben.Name = "cbxZollsatzueberschreiben"
         Me.cbxZollsatzueberschreiben.Size = New System.Drawing.Size(132, 17)
         Me.cbxZollsatzueberschreiben.TabIndex = 9
@@ -847,13 +846,14 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'btnNext
         '
+        Me.btnNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnNext.BackColor = System.Drawing.Color.White
         Me.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnNext.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnNext.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnNext.Location = New System.Drawing.Point(1492, 111)
+        Me.btnNext.Location = New System.Drawing.Point(1628, 37)
         Me.btnNext.Name = "btnNext"
-        Me.btnNext.Size = New System.Drawing.Size(75, 47)
+        Me.btnNext.Size = New System.Drawing.Size(50, 25)
         Me.btnNext.TabIndex = 8
         Me.btnNext.Text = ">>"
         Me.btnNext.UseVisualStyleBackColor = False
@@ -864,7 +864,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.lbloffenerSaldo.AutoSize = True
         Me.lbloffenerSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lbloffenerSaldo.ForeColor = System.Drawing.Color.Red
-        Me.lbloffenerSaldo.Location = New System.Drawing.Point(153, 137)
+        Me.lbloffenerSaldo.Location = New System.Drawing.Point(393, 137)
         Me.lbloffenerSaldo.Name = "lbloffenerSaldo"
         Me.lbloffenerSaldo.Size = New System.Drawing.Size(253, 24)
         Me.lbloffenerSaldo.TabIndex = 4
@@ -876,9 +876,9 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnPrev.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnPrev.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.btnPrev.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnPrev.Location = New System.Drawing.Point(12, 108)
+        Me.btnPrev.Location = New System.Drawing.Point(9, 40)
         Me.btnPrev.Name = "btnPrev"
-        Me.btnPrev.Size = New System.Drawing.Size(75, 47)
+        Me.btnPrev.Size = New System.Drawing.Size(50, 22)
         Me.btnPrev.TabIndex = 3
         Me.btnPrev.Text = "<<"
         Me.btnPrev.UseVisualStyleBackColor = False
@@ -887,7 +887,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label20.AutoSize = True
         Me.Label20.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label20.Location = New System.Drawing.Point(1155, 237)
+        Me.Label20.Location = New System.Drawing.Point(1176, 233)
         Me.Label20.Name = "Label20"
         Me.Label20.Size = New System.Drawing.Size(25, 13)
         Me.Label20.TabIndex = 42
@@ -897,7 +897,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.txtPosNr.Enabled = False
         Me.txtPosNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosNr.Location = New System.Drawing.Point(1158, 250)
+        Me.txtPosNr.Location = New System.Drawing.Point(1179, 246)
         Me.txtPosNr.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosNr.Name = "txtPosNr"
         Me.txtPosNr.Size = New System.Drawing.Size(37, 24)
@@ -905,6 +905,8 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'Panel1
         '
+        Me.Panel1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight
         Me.Panel1.Controls.Add(Me.cbxRundPosanzeigen)
         Me.Panel1.Controls.Add(Me.btnRundungsdifAusgl)
@@ -912,15 +914,17 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Panel1.Controls.Add(Me.cbx_offene)
         Me.Panel1.Controls.Add(Me.txtSuche)
         Me.Panel1.Controls.Add(Me.Label21)
-        Me.Panel1.Location = New System.Drawing.Point(3, 41)
+        Me.Panel1.Controls.Add(Me.btnPrev)
+        Me.Panel1.Controls.Add(Me.btnNext)
+        Me.Panel1.Location = New System.Drawing.Point(3, 34)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(1578, 61)
+        Me.Panel1.Size = New System.Drawing.Size(1681, 65)
         Me.Panel1.TabIndex = 2
         '
         'cbxRundPosanzeigen
         '
         Me.cbxRundPosanzeigen.AutoSize = True
-        Me.cbxRundPosanzeigen.Location = New System.Drawing.Point(12, 38)
+        Me.cbxRundPosanzeigen.Location = New System.Drawing.Point(9, 22)
         Me.cbxRundPosanzeigen.Name = "cbxRundPosanzeigen"
         Me.cbxRundPosanzeigen.Size = New System.Drawing.Size(169, 17)
         Me.cbxRundPosanzeigen.TabIndex = 52
@@ -929,7 +933,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'btnRundungsdifAusgl
         '
-        Me.btnRundungsdifAusgl.Location = New System.Drawing.Point(1133, 7)
+        Me.btnRundungsdifAusgl.Location = New System.Drawing.Point(1457, 4)
         Me.btnRundungsdifAusgl.Name = "btnRundungsdifAusgl"
         Me.btnRundungsdifAusgl.Size = New System.Drawing.Size(122, 42)
         Me.btnRundungsdifAusgl.TabIndex = 51
@@ -938,7 +942,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'btnNew
         '
-        Me.btnNew.Location = New System.Drawing.Point(1265, 13)
+        Me.btnNew.Location = New System.Drawing.Point(1585, 4)
         Me.btnNew.Name = "btnNew"
         Me.btnNew.Size = New System.Drawing.Size(93, 30)
         Me.btnNew.TabIndex = 50
@@ -948,7 +952,7 @@ Partial Class frmGesamtsicherheitenNEU
         'cbx_offene
         '
         Me.cbx_offene.AutoSize = True
-        Me.cbx_offene.Location = New System.Drawing.Point(12, 19)
+        Me.cbx_offene.Location = New System.Drawing.Point(9, 3)
         Me.cbx_offene.Name = "cbx_offene"
         Me.cbx_offene.Size = New System.Drawing.Size(120, 17)
         Me.cbx_offene.TabIndex = 3
@@ -958,7 +962,7 @@ Partial Class frmGesamtsicherheitenNEU
         'txtSuche
         '
         Me.txtSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSuche.Location = New System.Drawing.Point(208, 19)
+        Me.txtSuche.Location = New System.Drawing.Point(255, 3)
         Me.txtSuche.Margin = New System.Windows.Forms.Padding(0)
         Me.txtSuche.Name = "txtSuche"
         Me.txtSuche.Size = New System.Drawing.Size(243, 24)
@@ -978,7 +982,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label15.AutoSize = True
         Me.Label15.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label15.Location = New System.Drawing.Point(256, 187)
+        Me.Label15.Location = New System.Drawing.Point(226, 187)
         Me.Label15.Name = "Label15"
         Me.Label15.Size = New System.Drawing.Size(25, 13)
         Me.Label15.TabIndex = 14
@@ -987,7 +991,7 @@ Partial Class frmGesamtsicherheitenNEU
         'txtAnzahlPos
         '
         Me.txtAnzahlPos.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtAnzahlPos.Location = New System.Drawing.Point(259, 200)
+        Me.txtAnzahlPos.Location = New System.Drawing.Point(229, 200)
         Me.txtAnzahlPos.Margin = New System.Windows.Forms.Padding(0)
         Me.txtAnzahlPos.Name = "txtAnzahlPos"
         Me.txtAnzahlPos.Size = New System.Drawing.Size(35, 24)
@@ -1038,7 +1042,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label7.AutoSize = True
         Me.Label7.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label7.Location = New System.Drawing.Point(1258, 233)
+        Me.Label7.Location = New System.Drawing.Point(1279, 229)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(41, 13)
         Me.Label7.TabIndex = 43
@@ -1048,7 +1052,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label8.AutoSize = True
         Me.Label8.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label8.Location = New System.Drawing.Point(1320, 191)
+        Me.Label8.Location = New System.Drawing.Point(1341, 187)
         Me.Label8.Name = "Label8"
         Me.Label8.Size = New System.Drawing.Size(59, 13)
         Me.Label8.TabIndex = 22
@@ -1058,7 +1062,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label9.AutoSize = True
         Me.Label9.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label9.Location = New System.Drawing.Point(1423, 191)
+        Me.Label9.Location = New System.Drawing.Point(1444, 187)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(89, 13)
         Me.Label9.TabIndex = 23
@@ -1068,7 +1072,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label10.AutoSize = True
         Me.Label10.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label10.Location = New System.Drawing.Point(1259, 191)
+        Me.Label10.Location = New System.Drawing.Point(1280, 187)
         Me.Label10.Name = "Label10"
         Me.Label10.Size = New System.Drawing.Size(40, 13)
         Me.Label10.TabIndex = 21
@@ -1078,7 +1082,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label11.AutoSize = True
         Me.Label11.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label11.Location = New System.Drawing.Point(1150, 191)
+        Me.Label11.Location = New System.Drawing.Point(1171, 187)
         Me.Label11.Name = "Label11"
         Me.Label11.Size = New System.Drawing.Size(38, 13)
         Me.Label11.TabIndex = 20
@@ -1088,7 +1092,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label12.AutoSize = True
         Me.Label12.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label12.Location = New System.Drawing.Point(1002, 191)
+        Me.Label12.Location = New System.Drawing.Point(1023, 187)
         Me.Label12.Name = "Label12"
         Me.Label12.Size = New System.Drawing.Size(77, 13)
         Me.Label12.TabIndex = 19
@@ -1118,7 +1122,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label4.AutoSize = True
         Me.Label4.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label4.Location = New System.Drawing.Point(779, 188)
+        Me.Label4.Location = New System.Drawing.Point(775, 187)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(89, 13)
         Me.Label4.TabIndex = 18
@@ -1138,7 +1142,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label2.AutoSize = True
         Me.Label2.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label2.Location = New System.Drawing.Point(481, 188)
+        Me.Label2.Location = New System.Drawing.Point(476, 188)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(38, 13)
         Me.Label2.TabIndex = 15
@@ -1148,7 +1152,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label1.AutoSize = True
         Me.Label1.ForeColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.Label1.Location = New System.Drawing.Point(96, 187)
+        Me.Label1.Location = New System.Drawing.Point(66, 187)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(70, 13)
         Me.Label1.TabIndex = 13
@@ -1157,7 +1161,7 @@ Partial Class frmGesamtsicherheitenNEU
         'txtPosFreitext
         '
         Me.txtPosFreitext.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPosFreitext.Location = New System.Drawing.Point(1261, 246)
+        Me.txtPosFreitext.Location = New System.Drawing.Point(1282, 242)
         Me.txtPosFreitext.Margin = New System.Windows.Forms.Padding(0)
         Me.txtPosFreitext.Name = "txtPosFreitext"
         Me.txtPosFreitext.Size = New System.Drawing.Size(264, 24)
@@ -1346,36 +1350,36 @@ Partial Class frmGesamtsicherheitenNEU
         Me.dgvGesamtsicherheit.AKTUALISIERUNGS_INTERVALL = -1
         Me.dgvGesamtsicherheit.AllowUserToAddRows = False
         Me.dgvGesamtsicherheit.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.dgvGesamtsicherheit.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
+        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.WindowText
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvGesamtsicherheit.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5
         Me.dgvGesamtsicherheit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvGesamtsicherheit.ContextMenuStrip = Me.ContextMenuStripGesSicherh
-        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.dgvGesamtsicherheit.DefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvGesamtsicherheit.DefaultCellStyle = DataGridViewCellStyle6
         Me.dgvGesamtsicherheit.Dock = System.Windows.Forms.DockStyle.Left
         Me.dgvGesamtsicherheit.Location = New System.Drawing.Point(0, 0)
         Me.dgvGesamtsicherheit.Name = "dgvGesamtsicherheit"
         Me.dgvGesamtsicherheit.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.dgvGesamtsicherheit.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvGesamtsicherheit.RowHeadersDefaultCellStyle = DataGridViewCellStyle7
         Me.dgvGesamtsicherheit.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
         Me.dgvGesamtsicherheit.Size = New System.Drawing.Size(922, 457)
         Me.dgvGesamtsicherheit.TabIndex = 0
@@ -1385,26 +1389,26 @@ Partial Class frmGesamtsicherheitenNEU
         Me.dgvSicherheitsPos.AKTUALISIERUNGS_INTERVALL = -1
         Me.dgvSicherheitsPos.AllowUserToAddRows = False
         Me.dgvSicherheitsPos.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.dgvSicherheitsPos.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
+        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.dgvSicherheitsPos.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
         Me.dgvSicherheitsPos.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvSicherheitsPos.ContextMenuStrip = Me.ContextMenuStripPosSicherheiten
-        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.dgvSicherheitsPos.DefaultCellStyle = DataGridViewCellStyle5
+        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.dgvSicherheitsPos.DefaultCellStyle = DataGridViewCellStyle2
         Me.dgvSicherheitsPos.Dock = System.Windows.Forms.DockStyle.Right
-        Me.dgvSicherheitsPos.Location = New System.Drawing.Point(688, 0)
+        Me.dgvSicherheitsPos.Location = New System.Drawing.Point(928, 0)
         Me.dgvSicherheitsPos.Name = "dgvSicherheitsPos"
         Me.dgvSicherheitsPos.ReadOnly = True
         Me.dgvSicherheitsPos.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -1426,7 +1430,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtPosSicherheitsbGes._Waehrung = True
         Me.txtPosSicherheitsbGes._WaehrungZeichen = True
         Me.txtPosSicherheitsbGes.ForeColor = System.Drawing.Color.Black
-        Me.txtPosSicherheitsbGes.Location = New System.Drawing.Point(1272, 6)
+        Me.txtPosSicherheitsbGes.Location = New System.Drawing.Point(1530, 6)
         Me.txtPosSicherheitsbGes.MaxLineLength = -1
         Me.txtPosSicherheitsbGes.MaxLines_Warning = ""
         Me.txtPosSicherheitsbGes.MaxLines_Warning_Label = Nothing
@@ -1450,7 +1454,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtSicherheitsbGes._Waehrung = True
         Me.txtSicherheitsbGes._WaehrungZeichen = True
         Me.txtSicherheitsbGes.ForeColor = System.Drawing.Color.Black
-        Me.txtSicherheitsbGes.Location = New System.Drawing.Point(615, 5)
+        Me.txtSicherheitsbGes.Location = New System.Drawing.Point(720, 6)
         Me.txtSicherheitsbGes.MaxLineLength = -1
         Me.txtSicherheitsbGes.MaxLines_Warning = ""
         Me.txtSicherheitsbGes.MaxLines_Warning_Label = Nothing
@@ -1474,7 +1478,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtPosWarenwertGes._Waehrung = True
         Me.txtPosWarenwertGes._WaehrungZeichen = True
         Me.txtPosWarenwertGes.ForeColor = System.Drawing.Color.Black
-        Me.txtPosWarenwertGes.Location = New System.Drawing.Point(1018, 6)
+        Me.txtPosWarenwertGes.Location = New System.Drawing.Point(1276, 6)
         Me.txtPosWarenwertGes.MaxLineLength = -1
         Me.txtPosWarenwertGes.MaxLines_Warning = ""
         Me.txtPosWarenwertGes.MaxLines_Warning_Label = Nothing
@@ -1498,7 +1502,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtWarenwertGes._Waehrung = True
         Me.txtWarenwertGes._WaehrungZeichen = True
         Me.txtWarenwertGes.ForeColor = System.Drawing.Color.Black
-        Me.txtWarenwertGes.Location = New System.Drawing.Point(326, 6)
+        Me.txtWarenwertGes.Location = New System.Drawing.Point(431, 7)
         Me.txtWarenwertGes.MaxLineLength = -1
         Me.txtWarenwertGes.MaxLines_Warning = ""
         Me.txtWarenwertGes.MaxLines_Warning_Label = Nothing
@@ -1523,7 +1527,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtSicherheitDat._WaehrungZeichen = True
         Me.txtSicherheitDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txtSicherheitDat.ForeColor = System.Drawing.Color.Black
-        Me.txtSicherheitDat.Location = New System.Drawing.Point(483, 200)
+        Me.txtSicherheitDat.Location = New System.Drawing.Point(478, 200)
         Me.txtSicherheitDat.MaxLength = 10
         Me.txtSicherheitDat.MaxLineLength = -1
         Me.txtSicherheitDat.MaxLines_Warning = ""
@@ -1549,7 +1553,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtPosDat._WaehrungZeichen = True
         Me.txtPosDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txtPosDat.ForeColor = System.Drawing.Color.Black
-        Me.txtPosDat.Location = New System.Drawing.Point(1148, 204)
+        Me.txtPosDat.Location = New System.Drawing.Point(1169, 200)
         Me.txtPosDat.MaxLength = 10
         Me.txtPosDat.MaxLineLength = -1
         Me.txtPosDat.MaxLines_Warning = ""
@@ -1590,7 +1594,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtZollsatzueberschreiben._WaehrungZeichen = True
         Me.txtZollsatzueberschreiben.Enabled = False
         Me.txtZollsatzueberschreiben.ForeColor = System.Drawing.Color.Black
-        Me.txtZollsatzueberschreiben.Location = New System.Drawing.Point(1091, 156)
+        Me.txtZollsatzueberschreiben.Location = New System.Drawing.Point(1112, 152)
         Me.txtZollsatzueberschreiben.MaxLineLength = -1
         Me.txtZollsatzueberschreiben.MaxLines_Warning = ""
         Me.txtZollsatzueberschreiben.MaxLines_Warning_Label = Nothing
@@ -1607,7 +1611,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnDeletePos.FlatAppearance.BorderSize = 0
         Me.btnDeletePos.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnDeletePos.ForeColor = System.Drawing.Color.Black
-        Me.btnDeletePos.Location = New System.Drawing.Point(1540, 164)
+        Me.btnDeletePos.Location = New System.Drawing.Point(1561, 160)
         Me.btnDeletePos.Name = "btnDeletePos"
         Me.btnDeletePos.Size = New System.Drawing.Size(24, 24)
         Me.btnDeletePos.TabIndex = 24
@@ -1639,7 +1643,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnUpdatePos.FlatAppearance.BorderSize = 0
         Me.btnUpdatePos.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnUpdatePos.ForeColor = System.Drawing.Color.Black
-        Me.btnUpdatePos.Location = New System.Drawing.Point(1540, 245)
+        Me.btnUpdatePos.Location = New System.Drawing.Point(1561, 241)
         Me.btnUpdatePos.Name = "btnUpdatePos"
         Me.btnUpdatePos.Size = New System.Drawing.Size(24, 24)
         Me.btnUpdatePos.TabIndex = 49
@@ -1671,7 +1675,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnAddPos.FlatAppearance.BorderSize = 0
         Me.btnAddPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnAddPos.ForeColor = System.Drawing.Color.Black
-        Me.btnAddPos.Location = New System.Drawing.Point(1540, 203)
+        Me.btnAddPos.Location = New System.Drawing.Point(1561, 199)
         Me.btnAddPos.Name = "btnAddPos"
         Me.btnAddPos.Size = New System.Drawing.Size(24, 24)
         Me.btnAddPos.TabIndex = 39
@@ -1702,7 +1706,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1444, 776)
+        Me.ClientSize = New System.Drawing.Size(1684, 776)
         Me.Controls.Add(Me.Panel2)
         Me.Controls.Add(Me.panOben)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
diff --git a/Aviso/frmGesamtsicherheitenNEU.resx b/Aviso/frmGesamtsicherheitenNEU.resx
index f7d1075..0fbc19e 100644
--- a/Aviso/frmGesamtsicherheitenNEU.resx
+++ b/Aviso/frmGesamtsicherheitenNEU.resx
@@ -120,52 +120,10 @@
   <metadata name="ContextMenuStripGesSicherh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="FlatButton4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
-        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
-        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
-        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
-        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
-        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
-        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
-        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
-        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="FlatButton2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
-        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
-        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
-        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
-        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
-        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
-        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
-        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
-        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="btnClosePanOverlay.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
-        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
-        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
-        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
-        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
-        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
-        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
-        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
-        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
-</value>
-  </data>
   <metadata name="ContextMenuStripPosSicherheiten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>268, 15</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnDeletePos.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -322,6 +280,48 @@
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABVSURBVEhL7c0xDgAgCENR738Ar4uDi7bEECMsdngO
         BPzNzFolGmSbTw+zA9wlCnowouBGQQ9GroN4nELB5/4KRtEnC9wlCnowouBGQQ9G7oKVaJBtAF0U0pEO
         zULyAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="FlatButton4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="FlatButton2.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="btnClosePanOverlay.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHJSURBVEhLvZUxaxVBFIWfRm0STBNQkRQnYI5/IH8g
+        RSxioWnFxk6CWvgXEkljJwgRFKtY2FmmsBFrQUzszQHRBCshKObJwCwsZ+6+2fCMxdecmXM/2H1732A4
+        HA7+J0XQIOK0Z/+CImgQMS3igufjUgQJEVdFPBfxqa9UxKnce+FnbYpAxBURb0UMM72k6RWI2Mydl37e
+        4KVJEU9F/GoJq1IRl0Q8EvG91QmlXvxsoqpUxGURW8H9UOrl5pF0UUhFrIn4GdxteNMpzAM2glIhzT+Q
+        VyL+BHcajkTsjxQeQ/okyJ0DEStVYU9pGuZZmy8i7ok430vYU9rFrohrPq8qHEO6mhaBz+olzNLXwdCI
+        bRHLo/ZwEUSIeBgMj3jgXacITDQv4pmIH8HwiD3/Tp0iaMnOZZkPrVEsh6pQxIyIdduNx6FTWgQiZvMG
+        8SHOhyCrSiPhYxGHwQDnTo9PJkkv1oRecj6KuC1iKt+vSVUT3gpKDd9E3Ag6XdL0v/p+pDAPuBmUv4q4
+        77uxIt0RsVAVBtL0Lpb8jtOS/s5bZ1HEmfadomQDGuldP+siS9+JmPOzRBE46Z2JOOv5KERcFzHheaII
+        TpoiOGn+Arb2yxeUX28vAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb
index 24603c1..2628772 100644
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -169,6 +169,7 @@ Public Class frmGesamtsicherheitenNEU
                         .Columns("gs_posSubNr").HeaderText = "SPos"
                         .Columns("gs_posSubNr").Width = 35
                         .Columns("gs_ATBNr").Width = 130
+                        .Columns("gs_MRNNr").Width = 130
                         .Columns("gs_atr").HeaderText = "ATR"
                         .Columns("gs_atr").Visible = True
                         .Columns("gs_atr").Width = 35
@@ -182,10 +183,10 @@ Public Class frmGesamtsicherheitenNEU
                         Else
                             .Columns("gs_ATBNr").HeaderText = "T1 MRN"
                         End If
+                        .Columns("gs_MRNNr").Width = 150
                         .Columns("gs_ATBNr").Width = 150
                 End Select
 
-                Label1.Text = .Columns("gs_ATBNr").HeaderText
                 changeLabel(currentGesSichRef.brgakto_gs_ATR)
 
                 .Columns("gs_posNr").Width = 35
diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb
index 5991b2b..8cff503 100644
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -7675,8 +7675,8 @@ Public Class frmSendungsdetailsNEU
             For Each s As cSendungen In SENDUNG_LIST
                 'nur Betrag EUR
                 If s.tblSnd_Vorpapier = vorpT1 Then
-                    If s.tblSnd_WarenwertWaehrung = "EUR" AndAlso s.tblSnd_Warenwert > 0 AndAlso s.FilialenNr = SENDUNG_LIST(CURRENT_INDEX).FilialenNr Then
-                        calcWarenwerte += s.tblSnd_Warenwert
+                    If s.tblSnd_WarenwertWaehrung = "EUR" AndAlso s.FilialenNr = SENDUNG_LIST(CURRENT_INDEX).FilialenNr Then
+                        If Not s.tblSnd_Abfertigungsart_ID = 44 Then calcWarenwerte += s.tblSnd_Warenwert
                     Else
                         MsgBox("Bei Sendung " & s.AbfertigungsNr & " ist der Warenwert nicht in EUR angegeben!")
                         Exit Sub
@@ -7686,14 +7686,14 @@ Public Class frmSendungsdetailsNEU
 
             Next
 
-            If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert Is Nothing Then
-                SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert = Math.Round(calcWarenwerte, 2)
+            If txtWarenwert.Text = "" OrElse txtWarenwert.Text = "0,00" Then
+                txtWarenwert.Text = Math.Round(calcWarenwerte, 2)
                 SAVE_ME()
             End If
 
 
 
-            If IsNumeric(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert) AndAlso Math.Round(calcWarenwerte, 2) <> Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2) Then
+            If IsNumeric(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert) AndAlso SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert <> 0 AndAlso Math.Round(calcWarenwerte, 2) <> Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2) Then
                 MsgBox("Warenwert für Gestellung stimmt nicht überein!" & vbNewLine & "Berechnerter Warenwert: " & Math.Round(calcWarenwerte, 2) & vbNewLine & "Eingetragener Warenwert: " & Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2), MsgBoxStyle.Critical)
 
             Else