diff --git a/login/Change_PW.aspx b/login/Change_PW.aspx
index 71bf3f9..bcfcad2 100644
--- a/login/Change_PW.aspx
+++ b/login/Change_PW.aspx
@@ -94,7 +94,7 @@
                     justify-content: center;
                     align-items: center;
                     width: 380px;
-                    height: 613px;
+                    height: 513px;
                     margin: 0 auto;
                     margin-left:7%;
                     margin-top:9px;
@@ -102,7 +102,7 @@
                 .container-fluid {                    
                     width: 380px;                    
                     background-color: rgba(255,255,255,0.5);                   
-                    height:613px;    
+                    height:513px;    
                     top:50%;
                     bottom: -4px;
                     left: -195px;
@@ -177,14 +177,14 @@
                     justify-content: center;
                     align-items: center;
                     width: 323px;
-                    height: 613px;
+                    height: 513px;
                     margin: 0 auto;
                     margin-left:10%;                
                 }
                 .container-fluid {                    
                     width: 325px;                    
                     background-color: rgba(255,255,255,0.5);                   
-                    height: 613px;    
+                    height: 513px;    
                     top:50%;
                     bottom: -4px;
                     left: -195px;
@@ -203,8 +203,7 @@
                     background-color: #003680;
                     color: #fff;
                     width: 315px;
-                    height: 32px;
-                    margin-bottom: 0px;
+                    height: 32px;                    
                     margin-left:-15px;
                     padding-inline: 2px 2px;
                     padding: -10px 0px 10px 1px;
@@ -322,7 +321,7 @@
                 </div>
                     <!--Smartphone-Bildschirme-->   
                       <div class="d-md-none"> 
-                              <table id="tbl_main_M" cellpadding="0" style="margin: 10px 4px 1px 2px;border:none;height:50px">
+                              <table id="tbl_main_M" cellpadding="0" style="margin: 10px 4px 1px 2px;border:none;height:40px">
                          <tr style="color:#003680;height:25px;margin-left:105px">
                             <td>                            
                                 <asp:Label ID="lbl_Ueberschrift_M" runat="server" Text="Password-Change:" style="color:#003681;background-color:none;font-size:26px;margin-left:30px" Font-Bold="true"></asp:Label>
@@ -355,7 +354,7 @@
                                         </ul>                                 
                                     </td>                                
                                 </tr>
-                          <tr style="color:#003680;height:46.67px;">
+                          <tr style="color:#003680;height:26.67px;">
                             <td>
                                 <asp:TextBox id="txt_Pw_M" CssClass="bg-key-icon" runat="server" Font-Size="1.125em" ValidationGroup="TXT_val_M" TextMode="Password" Width="245px" Font-Names="Verdana" OnTextChanged="txt_Pw_M_TextChanged" AutoCompleteType="Disabled" style="margin-left:30px;margin-top:20px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Placeholder="Enter Password"></asp:TextBox> 
                                 <span></span></td>
@@ -366,7 +365,7 @@
                                   <asp:RequiredFieldValidator ID="reqPassw1txt_M" runat="server" Enabled="false" ControlToValidate="txt_Pw_M" ErrorMessage="*" ForeColor="Red" Font-Size="18px" Display="Dynamic"></asp:RequiredFieldValidator>
                               </td>
                               </tr>                                 
-                         <tr style="color:#003680;height:36.67px;">
+                         <tr style="color:#003680;height:26.67px;">
                             <td>
                                 <asp:TextBox id="txt_Pw_WH_M" CssClass="bg-key-icon" Width="245px" Font-Size="1.125em" ValidationGroup="TXT_val_WH_M" OnTextChanged="txt_Pw_WH_M_TextChanged" runat="server" TextMode="Password" Font-Names="Verdana" AutoCompleteType="Disabled" style="margin-left:30px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Placeholder="Repeat Password"></asp:TextBox>  
                                 <span></span></td>
@@ -378,12 +377,12 @@
                               <asp:RequiredFieldValidator ID="reqPasswtxt_M" runat="server" Enabled="false" ControlToValidate="txt_Pw_WH_M" ErrorMessage="*" Font-Size="18px" ForeColor="Red" Display="Dynamic"></asp:RequiredFieldValidator>
                           </td>
                       </tr>
-                        <tr style="color:#003680;height:26.67px;">
+                        <tr style="color:#003680;height:36.67px;">
                             <td>    
-                                <asp:Button ID="btn_submitpw_M" runat="server" Text="Change password" OnClick="btn_submitpw_M_Click" Width="290px" style="margin-left:1%;margin-right:auto;border:none;height:40px;margin-top:1px"/>
+                                <asp:Button ID="btn_submitpw_M" runat="server" Text="Change password" OnClick="btn_submitpw_M_Click" Width="290px" style="margin-left:1%;margin-right:auto;border:none;height:40px;margin-top:31px;margin-bottom: 10px;"/>
                             </td>
                         </tr>
-                              <tr style="color:#003680;height:20px;width:306px">
+                              <tr style="color:#003680;height:30px;width:306px">
                             <td>                                                                
                                 <asp:CompareValidator ID="confirmPasswordReq_M" runat="server" Font-Size="18px" ControlToCompare="txt_Pw_M" Enabled="false" ControlToValidate="txt_Pw_WH_M" ValidationGroup="TXT_val_WH_M"  ForeColor="Red" ErrorMessage="Please try again! The passwords didn't match." Display="Dynamic"></asp:CompareValidator>                                
                                 <asp:RegularExpressionValidator ID="regexval_txt_Pw_WH_M" runat="server" Enabled="false" ControlToValidate="txt_Pw_WH_M" ValidationGroup="TXT_val_WH_M" ForeColor="Red" Font-Size="18px" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="The Password has to match the criterias of the info-button." SetFocusOnError="true"></asp:RegularExpressionValidator>