diff --git a/login/Change_PW.aspx b/login/Change_PW.aspx
index 91f4b24..479ebd1 100644
--- a/login/Change_PW.aspx
+++ b/login/Change_PW.aspx
@@ -218,40 +218,39 @@
                     </tr>
                     <tr style="border:2px solid #003680; margin:4px auto 4px auto;background-color:rgba(255,255,255,0.5)">
                              <td>                      
-                                <table >
-                                     <tr>
-                                         <td><asp:Image ID="ImageButton1" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:18px"/>
-                                             <asp:Label ID="Label2" runat="server" style="color:#003680;">The Password has to contain:</asp:Label>
-                                         </td>
-                                     </tr>
-                                     <tr>
-                                         <td>
-                                              <asp:Label ID="Label11" runat="server" style="color:#003680;margin-left:22px">1 Uppercase</asp:Label>
-                                         </td>
-                                     </tr>
-                                     <tr>
-                                         <td>
-                                             <asp:Label ID="Label8" runat="server" style="color:#003680;margin-left:22px">1 Downcase </asp:Label>
-                                         </td>
-                                     </tr>
-                                     <tr>
-                                         <td>
-                                             <asp:Label ID="Label9" runat="server" style="color:#003680;margin-left:22px">and one special letter</asp:Label>
-                                         </td>
-                                     </tr>
-                                     <tr>
-                                         <td>
-                                             <asp:Label ID="Label10" runat="server" style="color:#003680;margin-left:22px;margin-right:0px">at an minimal length of 4 and an maximal length of</asp:Label>                                             
-                                         </td>
-                                     </tr>
+                                <table>
                                     <tr>
                                         <td>
-                                            <asp:Label ID="Label12" runat="server" style="color:#003680;margin-left:22px">30 characters.</asp:Label>
+                                            <asp:Image ID="ImageButton1" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:18px"/>
                                         </td>
+                                     </tr>
+                                     <tr>
+                                        <td>
+                                            <asp:Label ID="Label2" runat="server" style="color:#003680;margin-left:22px">The Password has to contain:</asp:Label>
+                                        </td>                                     
                                     </tr>
-                                 </table>       
-                            </td>
-                        </tr>
+                                    </table>
+                                     <ul style="list-style:circle">
+                                         <li>
+                                              <asp:Label ID="Label11" runat="server" style="color:#003680;margin-left:22px">1 Uppercase</asp:Label>
+                                         </li>                                     
+                                    
+                                         <li>
+                                             <asp:Label ID="Label8" runat="server" style="color:#003680;margin-left:22px">1 Downcase </asp:Label>
+                                         </li>                           
+                                         <li>
+                                             <asp:Label ID="Label9" runat="server" style="color:#003680;margin-left:22px">and one special letter</asp:Label>
+                                         </li>                           
+                                         <li>
+                                             <asp:Label ID="Label10" runat="server" style="color:#003680;margin-left:22px;margin-right:0px">at an minimal length of 4 and an maximal length of</asp:Label>                                           
+                                                                             
+                                        
+                                            <asp:Label ID="Label12" runat="server" style="color:#003680;">30 characters.</asp:Label>
+                                        </li>
+                                        </ul>
+                                 </td>
+                                    </tr>
+                                 
                    <tr style="color:#003680;height:56.67px;">
                        <td colspan="4">
                            <asp:TextBox id="txt_Pw" CssClass="bg-key-icon" runat="server" TextMode="Password" Width="250px" Font-Names="Verdana" OnTextChanged="txt_Pw_TextChanged" AutoCompleteType="Disabled" style="margin-left:46px;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" OnClick="this.value='';" Placeholder="Enter Password"></asp:TextBox>
@@ -303,38 +302,39 @@
                                 <asp:Label ID="lbl_Ueberschrift_M" runat="server" Text="Password-Change:" style="margin-left:35px;color:#003681;background-color:none;font-size:26px" Font-Bold="true"></asp:Label>
                              </td>
                           </tr>  
-                         <tr style="border:0.5px solid #003680; background-color:rgba(255,255,255,0.5);height:12px; width:82%">
-                             <td style="width:308px" colspan="2">                                   
-                                 <table style="margin-left:42px;height:auto">
-                                     <tr>
-                                         <td> <asp:ImageButton ID="Image1_M" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:-24px"/>
-                                             <asp:Label ID="Label1" runat="server" style="color:#003680;">The Password has to contain:</asp:Label>
-                                         </td>
+                        <tr style="border:2px solid #003680; width:320px; margin:4px auto 4px auto;background-color:rgba(255,255,255,0.5)">
+                             <td>                      
+                                <table>
+                                    <tr>
+                                        <td>
+                                            <asp:Image ID="Image1" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:18px"/>
+                                        </td>
                                      </tr>
                                      <tr>
-                                         <td>
-                                              <asp:Label ID="Label3" runat="server" style="color:#003680;">1 Uppercase</asp:Label>
-                                         </td>
-                                     </tr>
-                                     <tr>
-                                         <td>
-                                             <asp:Label ID="Label4" runat="server" style="color:#003680;">1 Downcase </asp:Label>
-                                         </td>
-                                     </tr>
-                                     <tr>
-                                         <td>
-                                             <asp:Label ID="Label7" runat="server" style="color:#003680;">and one special letter</asp:Label>
-                                         </td>
-                                     </tr>
-                                     <tr>
-                                         <td>
-                                             <asp:Label ID="Label6" runat="server" style="color:#003680;margin-right:20px">at an minimal length of 4 and an maximal length of</asp:Label>
-                                             <asp:Label ID="Label13" runat="server" style="color:#003680;margin-right:20px">30 characters.</asp:Label>
-                                         </td>
-                                     </tr>
-                                 </table>                         
-                            </td>
-                        </tr>
+                                        <td>
+                                            <asp:Label ID="Label1" runat="server" style="color:#003680;margin-left:22px">The Password has to contain:</asp:Label>
+                                        </td>                                     
+                                    </tr>
+                                    </table>
+                                     <ul style="list-style:circle">
+                                         <li>
+                                              <asp:Label ID="Label3" runat="server" style="color:#003680;margin-left:22px">1 Uppercase</asp:Label>
+                                         </li>                                     
+                                    
+                                         <li>
+                                             <asp:Label ID="Label4" runat="server" style="color:#003680;margin-left:22px">1 Downcase </asp:Label>
+                                         </li>                           
+                                         <li>
+                                             <asp:Label ID="Label5" runat="server" style="color:#003680;margin-left:22px">and one special letter</asp:Label>
+                                         </li>                           
+                                         <li>
+                                             <asp:Label ID="Label6" runat="server" style="color:#003680;margin-left:22px;margin-right:14px">at an minimal length of 4 and an </asp:Label>    
+                                             <asp:Label ID="Label7" runat="server" style="color:#003680;margin-left:62px">maximal length of 30 characters.</asp:Label>
+                                         </li>                                     
+                                        
+                                        </ul>
+                                 </td>
+                                    </tr>
                           <tr style="color:#003680;height:46.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;color:#003680;border-radius: 8px 8px 8px 8px;-webkit-border-radius: 8px;-moz-border-radius: 8px;" Placeholder="Enter Password"></asp:TextBox>