diff --git a/Customers/Customers.master b/Customers/Customers.master
index 1c718ec..59d8609 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -581,7 +581,7 @@
                                                                               </div>                            
              
                                            <div class="dropdown" id="dropdownbtnmain"  style="position: absolute; top:5px; right:197px; width:210px;z-index:1032; margin-right:-2px;">
-                                                  <button class="dropbtn" class="btn btn-primary" id="dropbtnbtnbtn" style="height:50px; width:205px;right:-194px;white-space:nowrap" 
+                                                  <button class="dropbtn btn btn-primary" id="dropbtnbtnbtn" style="height:50px; width:205px;right:-194px;white-space:nowrap">
                                                   <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381; width:30px;height:50px;white-space:nowrap"><img src="../images/samples/default-avatar.jpg"; width="15"; /><a data-bs-toggle="modal" data-bs-target="#exampleModal"><asp:LoginName class="pointer" ID="LoginName2" runat="server" style="margin-left:6px"/></a></button>
                                               </button>                                                
                                               <ul class="dropdown-content" id="dropdownmenuecont" style="width:210px;right:-198px;top:-1px;z-index:1032;margin-right:-2px;position:absolute;padding-top:-15px">                           
diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index 99a5213..756b069 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -81,8 +81,7 @@
                     border-radius: .3rem;
                     outline: 0
                 }
-            }
-        }
+            }       
     </style>    
      <!-- Bootstrap CSS -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
@@ -108,7 +107,7 @@
                 });
             });            
         </script>
-         </html>
+        </html>
 </asp:Content> 
 
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server" EnableViewState="true">
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index a6e0c19..0dede4b 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -277,8 +277,9 @@ Partial Class CustomsAviso
             pickdate1.Text = erster.ToUniversalTime.ToString("yyyy-MM-dd")
             pickdate2.Text = Date.Now.ToUniversalTime.ToString("yyyy-MM-dd")
         Else
-            VERAG_VARIABLES.seterrorcount(20)
-            Console.WriteLine(VERAG_VARIABLES.geterrornumb() + "The User is not authenticated to this page. Please login again!", vbAbort, "Error User")
+            'VERAG_VARIABLES.seterrorcount(20)
+            'Console.WriteLine(VERAG_VARIABLES.geterrornumb() + "The User is not authenticated to this page. Please login again!", vbAbort, "Error User")
+            FormsAuthentication.RedirectToLoginPage()
         End If
     End Sub
 
diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx
index dec4360..a7c2bc8 100644
--- a/Customers/Invoices.aspx
+++ b/Customers/Invoices.aspx
@@ -221,7 +221,7 @@
                         </div>
                     </div>
                     <div id="Abstand_laenger" style="height:/*24px*/ 1.873536299765808vh;"></div>
-                                <asp:Button ID="btn_b" CssClass="btn btn-primary" runat="server" CausesValidation="false" Text="Erhalte Rechnungen" />
+                                <asp:Button ID="btn_b" CssClass="btn-primary" runat="server" CausesValidation="false" Text="Erhalte Rechnungen" OnClick="btn_b_Click" style="background-color:#fff;color:#043381;height:30px;width:221px;font-size:1.33em;"/>
                            <div id="Abstand_lang" style="height: /*32px*/ 2.498048399687744vh;"></div> 
                        <div class="g-3">        
                             <div id="conovertab">
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb
index c2c98ae..294139e 100644
--- a/Customers/Invoices.aspx.vb
+++ b/Customers/Invoices.aspx.vb
@@ -21,18 +21,20 @@ Partial Class Customers_Default3
     Dim provider As CultureInfo = CultureInfo.InvariantCulture
 
     Protected Sub Page_Load(ByVal sender As Object, ByVal e As EventArgs)
+        Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms
         VERAG_VARIABLES.initerrorcount()
 
         If Not Me.Page.User.Identity.IsAuthenticated Then
             FormsAuthentication.RedirectToLoginPage()
         Else
-            If String.IsNullOrEmpty(Request.QueryString("P1")) = False Then
-                Kdnrtext = Request.QueryString("P1")
-            ElseIf String.IsNullOrEmpty(Session.Item("CustomerID")) = False Then
-                Kdnrtext = Session.Item("CustomerID").ToString
-            Else
-                lbl_status.Text = "Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!"
-            End If
+            Try
+                Kdnrtext = Session.Item("CustomerID")
+            Catch
+                Response.Redirect("Error.aspx&P1=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt("Invoices.aspx"))
+            End Try
+
+            DataBind()
+
             Dim confirmValue As String = hidField.Value
             'Script für Schließen wirklich verlassen Meldung auf der Masterseite für diese Seite zu registrieren und nicht ueberall
             Dim csm1 As ClientScriptManager = Page.ClientScript
@@ -48,13 +50,12 @@ Partial Class Customers_Default3
                 csm1.RegisterClientScriptBlock(cstype, "Startup", string1)
             End If
 
-            DataBind()
             tbl_Header_row.TableSection = TableRowSection.TableHeader
 
             If (Page.IsPostBack) Then
                 Page.MaintainScrollPositionOnPostBack = True
 
-                If valreq_pickdate1.IsValid Or valreq_pickdate2.IsValid Then
+                If valreq_pickdate1.IsValid And valreq_pickdate2.IsValid Then
                     datevon = Date.Parse(pickdate1.Text)
                     datebis = Date.Parse(pickdate2.Text)
                 End If
@@ -82,10 +83,14 @@ Partial Class Customers_Default3
     End Sub
 
     Private Sub addrows()
-        dt = Session.Item("datatbl")
+        If Not IsNothing(Session.Item("datatbl")) Then
+            dt = Session.Item("datatbl")
+        Else
+
+        End If
         Session.Item("mytable") = Nothing
         normaltable.Rows.Clear()
-        If Session.Item("mytable") = Nothing Then
+        If Not dt Is Nothing Then
             Dim header As TableHeaderRow = New TableHeaderRow()
             header.Cells.Add(tbl_HeaderCellIndex)
             header.Cells.Add(tbl_HeaderCell_ReNr)
@@ -297,7 +302,7 @@ Partial Class Customers_Default3
         dt = Nothing
         Session.Add("mytable", Nothing)
         If Session.Item("mytable") = Nothing Then
-            If Not String.IsNullOrEmpty(txt_Absender.Text) Then
+            If txt_Absender.Text IsNot "" Then
                 txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 regex_txt_Absender.Enabled = True
                 regex_txt_Absender.Validate()
@@ -315,7 +320,7 @@ Partial Class Customers_Default3
                     lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation"
                 End Try
             End If
-            If String.IsNullOrEmpty(txt_Empfaenger.Text) = False Then
+            If txt_Empfaenger.Text IsNot "" Then
                 txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 regex_txt_Empfaenger.Enabled = True
                 regex_txt_Empfaenger.Validate()
@@ -333,7 +338,7 @@ Partial Class Customers_Default3
                     lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation"
                 End Try
             End If
-            If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = False Then
+            If txt_KdNrAuftrag.Text IsNot "" Then
                 txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 regex_txt_KdNrAuftrag.Enabled = True
                 regex_txt_KdNrAuftrag.Validate()
@@ -351,7 +356,7 @@ Partial Class Customers_Default3
                     lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation"
                 End Try
             End If
-            If String.IsNullOrEmpty(txt_LKW.Text) = False Then
+            If txt_LKW.Text IsNot "" Then
                 txt_LKW.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 regex_txt_LKW.Enabled = True
                 regex_txt_LKW.Validate()
@@ -369,7 +374,7 @@ Partial Class Customers_Default3
                     lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation"
                 End Try
             End If
-            If String.IsNullOrEmpty(txt_ReNr.Text) = False Then
+            If txt_ReNr.Text IsNot "" Then
                 txt_ReNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 regex_txt_ReNr.Enabled = True
                 regex_txt_ReNr.Validate()
@@ -388,7 +393,7 @@ Partial Class Customers_Default3
                     lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error invoice number validation"
                 End Try
             End If
-            If String.IsNullOrEmpty(txt_Absender_M.Text) = False Then
+            If txt_Absender_M.Text IsNot "" Then
                 txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 regex_txt_Absender_M.Enabled = True
                 regex_txt_Absender_M.Validate()
@@ -406,7 +411,7 @@ Partial Class Customers_Default3
                     lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation"
                 End Try
             End If
-            If String.IsNullOrEmpty(txt_Empfaenger_M.Text) = False Then
+            If txt_Empfaenger_M.Text IsNot "" Then
                 txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 regex_txt_Empaenger_M.Enabled = True
                 regex_txt_Empaenger_M.Validate()
@@ -424,7 +429,7 @@ Partial Class Customers_Default3
                     lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation"
                 End Try
             End If
-            If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) = False Then
+            If txt_KdNrAuftrag_M.Text IsNot "" Then
                 txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 regex_txt_KdNrAuftrag_M.Enabled = True
                 regex_txt_KdNrAuftrag_M.Validate()
@@ -442,7 +447,7 @@ Partial Class Customers_Default3
                     lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation"
                 End Try
             End If
-            If String.IsNullOrEmpty(txt_LKW_M.Text) = False Then
+            If txt_LKW_M.Text IsNot "" Then
                 txt_LKW_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 regex_txt_LKW_M.Enabled = True
                 regex_txt_LKW_M.Validate()
@@ -460,7 +465,7 @@ Partial Class Customers_Default3
                     lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation"
                 End Try
             End If
-            If String.IsNullOrEmpty(txt_ReNr_M.Text) = False Then
+            If txt_ReNr_M.Text IsNot "" Then
                 txt_ReNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 regex_txt_ReNr_M.Enabled = True
                 regex_txt_ReNr_M.Validate()
@@ -485,8 +490,8 @@ Partial Class Customers_Default3
                     Dim erster = New Date(Now().Year, Now.Month, 1)
                     datevon = erster
                     datebis = Date.Parse(Now.ToShortDateString)
-                    pickdate1.Text = datevon.ToShortDateString
-                    pickdate2.Text = datebis.ToShortDateString
+                    pickdate1.Text = erster.ToUniversalTime.ToString("yyyy-MM-dd")
+                    pickdate2.Text = Date.Now.ToUniversalTime.ToString("yyyy-MM-dd")
                 Catch ex As Exception
                     VERAG_VARIABLES.seterrorcount(14)
                     lbl_status.ForeColor = Drawing.Color.Red