diff --git a/index.php b/index.php
index 8f06977..05061fd 100644
--- a/index.php
+++ b/index.php
@@ -24,7 +24,8 @@
 <hr />
 
 <div id="gallery">  
-
+  
+  <!-- ADDUSER - Add a new Email account -->
   <b class="switch"><span class="turn_on">Add</span><span class="turn_off">Add</span> an account</b>
   <div class="hide">
     <p>You can add a new Email account your primary and all other domains.<br />
@@ -41,20 +42,7 @@
     </form>
   </div> <!-- /hide -->
 
-  <b class="switch"><span class="turn_on">TEST</span><span class="turn_off">TEST</span> an account</b>
-  <div class="hide">
-    <form action="submit.php" method="post">
-      <label>Username:</label>
-      <input name="user" title="User" />
-      <label>Password:</label>
-      <input name="pass" title="Password" type="password" />
-      <br />
-      <button type="submit" name="action" value="adduser">Add new account</button>
-      <!-- Hidden confirmation box -->
-      <input type="hidden" name="sure" value="yes" />
-    </form>
-  </div> <!-- /hide -->
-
+  <!-- CHANGEPW - Change password of an Email account -->
   <b class="switch"><span class="turn_on">Change</span><span class="turn_off">Change</span> password</b>
   <div class="hide">
     <form action="submit.php" method="post">
@@ -68,63 +56,61 @@
       <input type="hidden" name="sure" value="yes" />
     </form>
   </div> <!-- /hide -->
-  
+
+  <!-- LISTUSERS - List all Email accounts -->
+  <b class="switch">List all Email users</b>
+  <div class="hide">
+    <p>Description</p>
+    <form action="submit.php" method="post">
+      <button type="submit" name="action" value="listusers">List accounts</button>
+      <!-- Hidden confirmation box -->
+      <input type="hidden" name="sure" value="yes" />
+    </form>
+  </div> <!-- /hide -->
+
+  <!-- SIZEALL - Show total sizes of all Email accounts -->
+    <form action="submit.php" method="post">
+      <button type="submit" name="action" value="sizeall">Show size</button>
+      <!-- Hidden confirmation box -->
+      <input type="hidden" name="sure" value="yes" />
+    </form>
+
+  <!-- SIZEUSER - Show size of every folder of a single Email account -->
+    <form action="submit.php" method="post">
+      <label>Username:</label>
+      <input name="user" title="User" />
+      <br />
+      <button type="submit" name="action" value="sizeuser">Show size</button>
+      <!-- Hidden confirmation box -->
+      <input type="hidden" name="sure" value="yes" />
+    </form>
+
+  <!-- USERDETAIL - Detailed info about a single Email account -->
+    <form action="submit.php" method="post">
+      <label>Username:</label>
+      <input name="user" title="User" />
+      <br />
+      <button type="submit" name="action" value="userdetail">Get details</button>
+      <!-- Hidden confirmation box -->
+      <input type="hidden" name="sure" value="yes" />
+    </form>
+
+  <!-- DELUSER - Delete an Email account -->
+    <p>Delete an Email account and all its emails.<br />
+    <warn>THIS OPERATION CANNOT BE UNDONE!<br />
+    ALL EMAILS OF THIS ACCOUNT WILL BE REMOVED!</warn></p>
+    <form action="submit.php" method="post">
+      <label>Username:</label>
+      <input name="user" title="User" />
+      <br />
+      <label for="sure"> 
+        <input type="checkbox" name="sure" value="yes" id="sure">Yes, I'm really sure that I want to delete this account
+      </label> 
+      <button type="submit" name="action" value="deluser">Delete account</button>
+    </form>
+
 </div> <!-- /gallery -->
 
-
-
-<h2 id="listusers">List all Email accounts</h2>
-<form action="submit.php" method="post">
-  <button type="submit" name="action" value="listusers">List accounts</button>
-  <!-- Hidden confirmation box -->
-  <input type="hidden" name="sure" value="yes" />
-</form>
-<hr />
-
-<h2 id="sizeall">Show total sizes of all Email accounts</h2>
-<form action="submit.php" method="post">
-  <button type="submit" name="action" value="sizeall">Show size</button>
-  <!-- Hidden confirmation box -->
-  <input type="hidden" name="sure" value="yes" />
-</form>
-<hr />
-
-<h2 id="sizeuser">Show size of every folder of a single Email account</h2>
-<form action="submit.php" method="post">
-  <label>Username:</label>
-  <input name="user" title="User" />
-  <br />
-  <button type="submit" name="action" value="sizeuser">Show size</button>
-  <!-- Hidden confirmation box -->
-  <input type="hidden" name="sure" value="yes" />
-</form>
-<hr />
-
-<h2 id="userdetail">Detailed info about a single Email account</h2>
-<form action="submit.php" method="post">
-  <label>Username:</label>
-  <input name="user" title="User" />
-  <br />
-  <button type="submit" name="action" value="userdetail">Get details</button>
-  <!-- Hidden confirmation box -->
-  <input type="hidden" name="sure" value="yes" />
-</form>
-<hr />
-
-<h2 id="deluser">Delete an Email account</h2>
-<p>Delete an Email account and all its emails.<br />
-<warn>THIS OPERATION CANNOT BE UNDONE!<br />
-ALL EMAILS OF THIS ACCOUNT WILL BE REMOVED!</warn></p>
-<form action="submit.php" method="post">
-  <label>Username:</label>
-  <input name="user" title="User" />
-  <br />
-  <label for="sure"> 
-    <input type="checkbox" name="sure" value="yes" id="sure">Yes, I'm really sure that I want to delete this account
-  </label> 
-  <button type="submit" name="action" value="deluser">Delete account</button>
-</form>
-<hr />
   
 <p style="font-size:small">This web application has been created by <a href="http://mehl.mx">Max Mehl</a><br />
 The program can be obtained on <a href="http://src.mehl.mx/uberspace-webadmin.git">Git</a> under a GPLv3+ license.</p>