diff --git a/includes/funktion_db_list.php b/includes/funktion_db_list.php
index fbf1c821..8b64297e 100755
--- a/includes/funktion_db_list.php
+++ b/includes/funktion_db_list.php
@@ -1,34 +1,66 @@
 <?PHP
 
-function funktion_db_list($Table_Name) {
-
+function funktion_db_list($Table_Name) 
+{
 	global $con;
 
-$SQL = "SELECT * FROM `".$Table_Name."`";
-$Erg = mysql_query($SQL, $con);
+	$SQL = "SELECT * FROM `".$Table_Name."`";
+	$Erg = mysql_query($SQL, $con);
 
-// anzahl zeilen
-$Zeilen  = mysql_num_rows($Erg);
+	// anzahl zeilen
+	$Zeilen  = mysql_num_rows($Erg);
 
-$Anzahl_Felder = mysql_num_fields($Erg);
+	$Anzahl_Felder = mysql_num_fields($Erg);
 
-echo "<table border=1>";
+	echo "<table border=1>";
 
-echo "<tr>";
-for ($m = 0 ; $m < $Anzahl_Felder ; $m++) {
-  echo "<th>". mysql_field_name($Erg, $m). "</th>";
-  }
-echo "</tr>";
+	echo "<tr>";
+	for ($m = 0 ; $m < $Anzahl_Felder ; $m++)
+	{
+		echo "<th>". mysql_field_name($Erg, $m). "</th>";
+	}
+	echo "</tr>";
 
-for ($n = 0 ; $n < $Zeilen ; $n++) {
-  echo "<tr>";
-  for ($m = 0 ; $m < $Anzahl_Felder ; $m++) {
-    echo "<td>".mysql_result($Erg, $n, $m). "</td>"; 
-  }
-  echo "</tr>";
+	for ($n = 0 ; $n < $Zeilen ; $n++)
+	{
+		echo "<tr>";
+		for ($m = 0 ; $m < $Anzahl_Felder ; $m++)
+		{
+			echo "<td>".mysql_result($Erg, $n, $m). "</td>"; 
+		}
+		echo "</tr>";
+	}
+	echo "</table>";
 }
 
-echo "</table>";
+function funktion_db_element_list_2row( $TopicName, $SQL) 
+{
+	global $con;
+
+	echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
+	echo "<caption>$TopicName</caption>";
+#	echo "\t<tr class=\"contenttopic\"> <td><h1>$TopicName</h1></td> </tr>\n";
+
+	$Erg = mysql_query($SQL, $con);
+	echo mysql_error($con);
+	
+	echo "<tr  class=\"contenttopic\">";
+	for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++)
+	{
+		echo "<th>". mysql_field_name($Erg, $m). "</th>";
+	}
+	echo "</tr>";
+
+	for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++)
+	{
+		echo "<tr class=\"content\">";
+		for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++)
+		{
+			echo "<td>".mysql_result($Erg, $n, $m). "</td>"; 
+		}
+		echo "</tr>";
+	}
+	echo "</table>\n";
 }
 
 ?>
diff --git a/www-ssl/admin/debug.php b/www-ssl/admin/debug.php
index afc394eb..af42dd20 100755
--- a/www-ssl/admin/debug.php
+++ b/www-ssl/admin/debug.php
@@ -30,33 +30,26 @@ funktion_db_list("FAQ");
 echo "Deaktiviert";
 */
 
+echo "<br>\n";
+funktion_db_element_list_2row( "Tshirt-Size aller engel",
+				"SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); 
 
-echo "<h1>Tshirt-Size aller engel</h1>";
-$SQL="SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`";
-$Erg = mysql_query($SQL, $con);
-echo mysql_error($con);
-$rowcount = mysql_num_rows($Erg);
+echo "<br>\n";
+funktion_db_element_list_2row( "Tshirt ausgegeben",
+				"SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); 
 
-for ($i=0; $i<$rowcount; $i++)
-	echo mysql_result($Erg, $i, 1). "x '".  mysql_result($Erg, $i, 0). "'<br>\n";
+echo "<br>\n";
+funktion_db_element_list_2row( "Tshirt nicht  ausgegeben (Gekommen=1)", 
+				"SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`");
 
-echo "<h1>Tshirt ausgegeben</h1>";
-$SQL="SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`";
-$Erg = mysql_query($SQL, $con);
-echo mysql_error($con);
-$rowcount = mysql_num_rows($Erg);
+echo "<br>\n";
+funktion_db_element_list_2row( "Hometown", 
+				"SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`");
 
-for ($i=0; $i<$rowcount; $i++)
-	echo mysql_result($Erg, $i, 1). "x '".  mysql_result($Erg, $i, 0). "'<br>\n";
+echo "<br>\n";
+funktion_db_element_list_2row( "Engeltypen", 
+					"SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`");
 
-echo "<h1>Tshirt nicht  ausgegeben (Gekommen=1)</h1>";
-$SQL="SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`";
-$Erg = mysql_query($SQL, $con);
-echo mysql_error($con);
-$rowcount = mysql_num_rows($Erg);
-
-for ($i=0; $i<$rowcount; $i++)
-	echo mysql_result($Erg, $i, 1). "x '".  mysql_result($Erg, $i, 0). "'<br>\n";
 
 include ("../../includes/footer.php");
 ?>
diff --git a/www-ssl/admin/user.php b/www-ssl/admin/user.php
index 1b99ec4b..a792f864 100755
--- a/www-ssl/admin/user.php
+++ b/www-ssl/admin/user.php
@@ -101,6 +101,15 @@ if (!IsSet($_GET["enterUID"]))
 		"<td>$Gekommen</td><td>$Active</td><td>$Tshirt</td><td></td></tr>\n";
 	echo "\t</table>\n";
 	// Ende Userliste
+
+	echo "<h1>Statistics</h1>";
+	funktion_db_element_list_2row( "Hometown",
+        	                        "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`");
+
+	echo "<br>\n";
+
+	funktion_db_element_list_2row( "Engeltypen",
+                                        "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`");
 }
 else
 {