diff --git a/login/CreateUser.aspx b/login/CreateUser.aspx
index 7cb83a8..4b8ae93 100644
--- a/login/CreateUser.aspx
+++ b/login/CreateUser.aspx
@@ -228,33 +228,33 @@
                             </td>
                       </tr>
                         <tr><td colspan="12" style="height:45px">                           
-                            <asp:TextBox ID="txt_Username" CssClass="bg-key-icon" Placeholder="Username" runat="server"></asp:TextBox>
+                            <asp:TextBox ID="txt_Username" CssClass="bg-key-icon" Placeholder="Username" runat="server" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td>
                         </tr>
                         <tr><td colspan="7" style="height:45px">
-                            <asp:TextBox ID="txt_FirstName" CssClass="bg-user-icon" Placeholder="First Name" runat="server" AutoCompleteType="FirstName"></asp:TextBox>
+                            <asp:TextBox ID="txt_FirstName" CssClass="bg-user-icon" Placeholder="First Name" runat="server" AutoCompleteType="FirstName" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td>                           
                             <td colspan="5" align="center" style="height:45px">
-                            <asp:TextBox ID="txt_LastName" CssClass="bg-user-icon" Placeholder="Last Name" runat="server" AutoCompleteType="LastName"></asp:TextBox>
+                            <asp:TextBox ID="txt_LastName" CssClass="bg-user-icon" Placeholder="Last Name" runat="server" AutoCompleteType="LastName" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td></tr>
                         <tr><td colspan="5" align="center" style="height:45px">
-                            <asp:TextBox ID="txt_Street" CssClass="bg-house-icon" Placeholder="Street" runat="server" AutoCompleteType="HomeStreetAddress"></asp:TextBox>
+                            <asp:TextBox ID="txt_Street" CssClass="bg-house-icon" Placeholder="Street" runat="server" AutoCompleteType="HomeStreetAddress" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td>
                            <td colspan="4" align="center" style="height:45px">                                                
-                            <asp:TextBox ID="txt_HouseNr" CssClass="bg-house2-icon" Placeholder="Nr." runat="server" AutoCompleteType="Search" ></asp:TextBox>
+                            <asp:TextBox ID="txt_HouseNr" CssClass="bg-house2-icon" Placeholder="Nr." runat="server" AutoCompleteType="Search" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                              </td>  
                             </tr>
                         <tr>
                             <td colspan="6" align="center" style="height:45px">
-                            <asp:TextBox ID="txt_zipcode" CssClass="bg-house-icon" Placeholder="Zip Code" runat="server" AutoCompleteType="HomeZipCode"></asp:TextBox>
+                            <asp:TextBox ID="txt_zipcode" CssClass="bg-house-icon" Placeholder="Zip Code" runat="server" AutoCompleteType="HomeZipCode" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td>
                             <td colspan="4" style="height:45px">
-                            <asp:TextBox ID="txt_City" CssClass="bg-city-icon" Placeholder="City" runat="server" AutoCompleteType="HomeCity"></asp:TextBox>
+                            <asp:TextBox ID="txt_City" CssClass="bg-city-icon" Placeholder="City" runat="server" AutoCompleteType="HomeCity" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td>                           
                             </tr>                       
                         <tr>
                             <td colspan="12" align="center" style="height:45px">
-                               <asp:TextBox ID="txt_AVISO" CssClass="bg-AVISO-icon" Placeholder="Aviso-ID" runat="server" AutoCompleteType="Search"></asp:TextBox>
+                               <asp:TextBox ID="txt_AVISO" CssClass="bg-AVISO-icon" Placeholder="Aviso-ID" runat="server" AutoCompleteType="Search" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td>
                         </tr>
                         <tr>
@@ -350,33 +350,33 @@
                             </td>
                       </tr>
                         <tr><td colspan="12" style="height:45px">                           
-                            <asp:TextBox ID="txt_Username_M" CssClass="bg-key-icon" Placeholder="Username" runat="server"></asp:TextBox>
+                            <asp:TextBox ID="txt_Username_M" CssClass="bg-key-icon" Placeholder="Username" runat="server" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td>
                         </tr>
                         <tr><td colspan="7" style="height:45px">
-                            <asp:TextBox ID="txt_FirstName_M" CssClass="bg-user-icon" Placeholder="First Name" runat="server" AutoCompleteType="FirstName"></asp:TextBox>
+                            <asp:TextBox ID="txt_FirstName_M" CssClass="bg-user-icon" Placeholder="First Name" runat="server" AutoCompleteType="FirstName" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td>                           
                             <td colspan="5" align="center" style="height:45px">
-                            <asp:TextBox ID="txt_LastName_M" CssClass="bg-user-icon" Placeholder="Last Name" runat="server" AutoCompleteType="LastName"></asp:TextBox>
+                            <asp:TextBox ID="txt_LastName_M" CssClass="bg-user-icon" Placeholder="Last Name" runat="server" AutoCompleteType="LastName" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td></tr>
                         <tr><td colspan="5" align="center" style="height:45px">
-                            <asp:TextBox ID="txt_Street_M" CssClass="bg-house-icon" Placeholder="Street" runat="server" AutoCompleteType="HomeStreetAddress"></asp:TextBox>
+                            <asp:TextBox ID="txt_Street_M" CssClass="bg-house-icon" Placeholder="Street" runat="server" AutoCompleteType="HomeStreetAddress" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td>
                            <td colspan="4" align="center" style="height:45px">                                                
-                            <asp:TextBox ID="txt_HouseNr_M" CssClass="bg-house2-icon" Placeholder="Nr." runat="server" AutoCompleteType="Search" ></asp:TextBox>
+                            <asp:TextBox ID="txt_HouseNr_M" CssClass="bg-house2-icon" Placeholder="Nr." runat="server" AutoCompleteType="Search" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                              </td>  
                             </tr>
                         <tr>
                             <td colspan="6" align="center" style="height:45px">
-                            <asp:TextBox ID="txt_zipcode_M" CssClass="bg-house-icon" Placeholder="Zip Code" runat="server" AutoCompleteType="HomeZipCode"></asp:TextBox>
+                            <asp:TextBox ID="txt_zipcode_M" CssClass="bg-house-icon" Placeholder="Zip Code" runat="server" AutoCompleteType="HomeZipCode" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td>
                             <td colspan="4" style="height:45px">
-                            <asp:TextBox ID="txt_City_M" CssClass="bg-city-icon" Placeholder="City" runat="server" AutoCompleteType="HomeCity"></asp:TextBox>
+                            <asp:TextBox ID="txt_City_M" CssClass="bg-city-icon" Placeholder="City" runat="server" AutoCompleteType="HomeCity" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td>                           
                             </tr>                       
                         <tr>
                             <td colspan="12" align="center" style="height:45px">
-                               <asp:TextBox ID="txt_AVISO_M" CssClass="bg-AVISO-icon" Placeholder="Aviso-ID" runat="server" AutoCompleteType="Search"></asp:TextBox>
+                               <asp:TextBox ID="txt_AVISO_M" CssClass="bg-AVISO-icon" Placeholder="Aviso-ID" runat="server" AutoCompleteType="Search" style="border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>
                             </td>
                         </tr>
                         <tr>
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 79a918b..8af9616 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -299,17 +299,17 @@
             <h2 style="margin-left:94px; margin-top:-4px">Fill in your data here:</h2>
                                              </td></tr>
                <tr style="color:#003680; height:30px;"><td colspan="2">
-                       <asp:TextBox ID="txt_CustomerID" CssClass="bg-UID-icon" runat="server" ValidationGroup="val-desk" SetFocusOnError="true" Width="265" Placeholder="Customer-ID" style="margin-left:45px;color:#003680" Font-Size="1.125em"></asp:TextBox>                                             
+                       <asp:TextBox ID="txt_CustomerID" CssClass="bg-UID-icon" runat="server" ValidationGroup="val-desk" SetFocusOnError="true" Width="265" Placeholder="Customer-ID" style="margin-left:45px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Font-Size="1.125em"></asp:TextBox>                                             
                        <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="txt_CustomerID" SetFocusOnError="true" ForeColor="Red" Text="" ValidationGroup="val-desk"></asp:RequiredFieldValidator>
                     </td></tr>
                 <tr style="color:#003680; height:30px;">                                 
                     <td align="left" colspan="2">  
-                        <asp:TextBox ID="txtEmail" runat="server" Width="265" ValidationGroup="val-desk" ForeColor="Red" Font-Size="1.125em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:45px;color:#003680"/>                    
+                        <asp:TextBox ID="txtEmail" runat="server" Width="265" ValidationGroup="val-desk" ForeColor="Red" Font-Size="1.125em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:45px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"/>                    
                         <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" SetFocusOnError="true" ValidationGroup="val-desk" runat="server" Text="" ForeColor="Red"></asp:RequiredFieldValidator>                                                  
                     </td></tr>
                 <tr style="color:#003680; height:20px;">                                
                      <td align="left" colspan="2"> 
-                    <asp:TextBox ID="txt_Username" runat="server" CssClass="bg-user-icon" ValidationGroup="val-desk" Placeholder="Username" Font-Size="1.125em" Width="265" style="margin-left:45px;color:#003680;margin-bottom:-6px" />
+                    <asp:TextBox ID="txt_Username" runat="server" CssClass="bg-user-icon" ValidationGroup="val-desk" Placeholder="Username" Font-Size="1.125em" Width="265" style="margin-left:45px;color:#003680;margin-bottom:-6px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" />
                         <asp:RequiredFieldValidator ID="valreqtxtusername" SetFocusOnError="true" ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" ForeColor="Red" Text="" ErrorMessage=""></asp:RequiredFieldValidator>           
                 
                      </td></tr>
@@ -342,17 +342,17 @@
                    </td></tr>                
               <tr style="color:#003680;height:40px;">                                
                      <td align="left" colspan="2">  
-                         <asp:TextBox ID="txt_CustomerID_M" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="val-mobil" Width="325" Placeholder="Customer-ID" Font-Size="2.025em" style="margin:0 21px auto 22px"></asp:TextBox>                                             
+                         <asp:TextBox ID="txt_CustomerID_M" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="val-mobil" Width="325" Placeholder="Customer-ID" Font-Size="2.025em" style="margin:0 21px auto 22px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>                                             
                          <asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="txt_CustomerID_M" SetFocusOnError="true" ForeColor="Red" Font-Size="24px" style="margin-left:22px;" ValidationGroup="val-mobil" ErrorMessage=""></asp:RequiredFieldValidator>                                                               
                          </td></tr>
                 <tr style="color:#003680; height:40px;">                                 
                     <td align="left" colspan="2">  
-                        <asp:TextBox ID="txtEmail_M" runat="server" Width="325px" ValidationGroup="val-mobil" Font-Size="2.025em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:25px;color:#003680;margin-bottom:60px"/>                    
+                        <asp:TextBox ID="txtEmail_M" runat="server" Width="325px" ValidationGroup="val-mobil" Font-Size="2.025em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:25px;color:#003680;margin-bottom:60px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"/>                    
                         <asp:RequiredFieldValidator ID="valreqtxtEmail_M" SetFocusOnError="true" ControlToValidate="txtEmail_M" ValidationGroup="val-mobil" runat="server" Text="" ></asp:RequiredFieldValidator>                   
                     </td></tr>
                 <tr style="color:#003680; height:40px;">                                
                      <td align="left" colspan="2"> 
-                    <asp:TextBox ID="txt_Username_M" runat="server" CssClass="bg-user-icon" ValidationGroup="val-mobil" Placeholder="Username" Font-Size="2.025em" Width="325px" style="margin-left:25px;color:#003680" OnClick="this.value='';" />
+                     <asp:TextBox ID="txt_Username_M" runat="server" CssClass="bg-user-icon" ValidationGroup="val-mobil" Placeholder="Username" Font-Size="2.025em" Width="325px" style="margin-left:25px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" OnClick="this.value='';" />
                      <asp:RequiredFieldValidator ID="valreqtxtusername_M" ForeColor="Red" ControlToValidate="txt_Username_M" ValidationGroup="val-mobil" runat="server" Text="" ErrorMessage="" SetFocusOnError="true"></asp:RequiredFieldValidator>                                
                      </td></tr>
                 <tr style="color:#003680; height:50px;">
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index adb271e..1c42e7e 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -286,19 +286,19 @@
                                </tr>                           
                                 <tr style="color:#003680; height:46px;">
                                         <td align="left"  colspan="2">                                                                           
-                                            <asp:TextBox ID="txt_CustomerID" CssClass="bg-UID-icon" runat="server" ValidationGroup="Login" Width="320" Placeholder="Customer-ID" style="margin-left: 22px" Font-Size="1.25em" Height="32px"></asp:TextBox>                                             
+                                            <asp:TextBox ID="txt_CustomerID" CssClass="bg-UID-icon" runat="server" ValidationGroup="Login" Width="320" Placeholder="Customer-ID" style="margin-left: 22px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Font-Size="1.25em" Height="32px"></asp:TextBox>                                             
                                             <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="txt_CustomerID" ForeColor="Red" style="font-size:17px" SetFocusOnError="true" ValidationGroup="Login" ErrorMessage=""></asp:RequiredFieldValidator>                                                                                 
                                         </td>
                                 </tr>  
                                 <tr style="color:#003680; height:46px;">  
                                      <td align="left" colspan="2">                                                                       
-                                           <asp:TextBox ID="UserName" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width="320" ToolTip="The Username is required." ValidationGroup="Login" Font-Size="1.25em" style="margin-left:22px;color:#003680" Placeholder="Username" ></asp:TextBox>                                                
+                                           <asp:TextBox ID="UserName" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width="320" ToolTip="The Username is required." ValidationGroup="Login" Font-Size="1.25em" style="margin-left:22px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Placeholder="Username" ></asp:TextBox>                                                
                                            <asp:RequiredFieldValidator ID="UserNamerequired" ForeColor="Red" Font-Size="17px" runat="server" ControlToValidate="UserName" SetFocusOnError="true" ErrorMessage="" ValidationGroup="Login"></asp:RequiredFieldValidator>                                            
                                      </td>
                                 </tr>
                                <tr style="color:#003680; height:46px;">  
                                      <td align="left" colspan="2">                                        
-                                          <asp:TextBox ID="Password" runat="server" CssClass="bg-key-icon" TextMode="Password" ToolTip="Please enter the Password." Width="320" Font-Size="1.25em" ValidationGroup="Login" MaxLength="30" AutoCompleteType="Disabled" CausesValidation="true" style="margin-left:22px;color:#003680" Placeholder="Password"></asp:TextBox>                                    
+                                          <asp:TextBox ID="Password" runat="server" CssClass="bg-key-icon" TextMode="Password" ToolTip="Please enter the Password." Width="320" Font-Size="1.25em" ValidationGroup="Login" MaxLength="30" AutoCompleteType="Disabled" CausesValidation="true" style="margin-left:22px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Placeholder="Password"></asp:TextBox>                                    
                                           <asp:RequiredFieldValidator ID="Passwordrequired" ForeColor="Red" runat="server" ControlToValidate="Password" Font-Size="17px"  ValidationGroup="Login" SetFocusOnError="true" ErrorMessage=""></asp:RequiredFieldValidator>                                                                                                           
                                      </td>
                                  </tr>       
@@ -340,19 +340,19 @@
                                </tr>                           
                                 <tr style="color:#003680; height:86px">
                                         <td align="left">                                                                           
-                                            <asp:TextBox ID="txt_CustomerID_M" CssClass="bg-UID-icon" runat="server" ValidationGroup="Login_M" Width="325" Placeholder="Customer-ID" Font-Size="2.025em" style="margin-left: 22px;margin-top:20px;"></asp:TextBox>                                             
+                                            <asp:TextBox ID="txt_CustomerID_M" CssClass="bg-UID-icon" runat="server" ValidationGroup="Login_M" Width="325" Placeholder="Customer-ID" Font-Size="2.025em" style="margin-left: 22px;margin-top:20px;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>                                             
                                             <asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="txt_CustomerID_M" SetFocusOnError="true" ForeColor="Red" style="margin-left:22px;font-size:19px" ValidationGroup="Login_M" ErrorMessage=""></asp:RequiredFieldValidator>                                  
                                         </td>
                                 </tr>  
                                 <tr style="color:#003680; height:86px;">  
                                      <td align="left" colspan="2">                                        
-                                        <asp:TextBox id="Username" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "325"  ValidationGroup="Login_M" Placeholder="Username" required="true" Font-Size="2.025em"  style="margin-left:22px;color:#003680"></asp:TextBox>                                                                                     
+                                        <asp:TextBox id="Username" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "325"  ValidationGroup="Login_M" Placeholder="Username" required="true" Font-Size="2.025em"  style="margin-left:22px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;"></asp:TextBox>                                                                                     
                                         <asp:RequiredFieldValidator ID="UserName_M_required" runat="server" ControlToValidate="Username" ErrorMessage="" ForeColor="Red" style="margin-left:22px;font-size:19px" ValidationGroup="Login_M" SetFocusOnError="true"></asp:RequiredFieldValidator>                                   
                                      </td>
                                 </tr>
                                <tr style="color:#003680; height:86px;">  
                                      <td align="left" colspan="2">                                        
-                                        <asp:TextBox ID="Password" runat="server" CssClass="bg-key-icon" TextMode="Password" Tooltip="Please provide the Password" required="true" Width = "325" Font-Size="2.025em" ValidationGroup="Login_M" MaxLength="30" AutoCompleteType="Enabled" CausesValidation="true" style="margin-left:22px;color:#003680" Placeholder="Password" Text="Password"></asp:TextBox>                                    
+                                        <asp:TextBox ID="Password" runat="server" CssClass="bg-key-icon" TextMode="Password" Tooltip="Please provide the Password" required="true" Width = "325" Font-Size="2.025em" ValidationGroup="Login_M" MaxLength="30" AutoCompleteType="Enabled" CausesValidation="true" style="margin-left:22px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Placeholder="Password" Text="Password"></asp:TextBox>                                    
                                          <asp:RequiredFieldValidator ID="Passwordrequired_M" runat="server" SetFocusOnError="true" ControlToValidate="Password" style="margin-left:22px;color:red;" ErrorMessage="" ForeColor="Red" ValidationGroup="Login_M"></asp:RequiredFieldValidator>                                         
                                      </td>
                                  </tr>