diff --git a/Admin/Modules/Home/index.php b/Admin/Modules/Home/index.php
index 392ef63..cb4ecb8 100755
--- a/Admin/Modules/Home/index.php
+++ b/Admin/Modules/Home/index.php
@@ -9,8 +9,9 @@ include ($_SERVER["DOCUMENT_ROOT"]."/Site/checkadmin.php");
 		<h1><b>Administration Center</b></h1>
 		<table widht="100%">
 			<tr>
-				<td width=60%>
+				<td width="250px" style="float: left">
 					<h2>Actions:</h2>
+						<br/>
 						<?php					
 							$moduleid = 0;
 							foreach ($SITE_MODULES_ADMIN as $modul) 
diff --git a/Admin/Modules/Settings/index.php b/Admin/Modules/Settings/index.php
index 0e76643..74d0556 100755
--- a/Admin/Modules/Settings/index.php
+++ b/Admin/Modules/Settings/index.php
@@ -68,12 +68,7 @@ echo "
 					 // Höhere Verzeichnisse nicht anzeigen!
 				 	if ($file != "." && $file != "..") 
 					{
-						$filecut = strpos($file, ".");
-						if($filecut > 0)
-						{
-							$file = substr($file,0,$filecut);
-							echo "<option "; if(db_getconfval("sitetheme")==$file) echo "selected "; echo "value=\"".$file."\">".$file."</option>";
-						}						
+						echo "<option "; if(db_getconfval("sitetheme")==$file) echo "selected "; echo "value=\"".$file."\">".$file."</option>";
 				 	}
 				}
 				 // Verzeichnis schließen
diff --git a/Admin/Modules/Usermanagement/include/adduser_index.php b/Admin/Modules/Usermanagement/include/adduser_index.php
index b05d6dd..8e32b4e 100755
--- a/Admin/Modules/Usermanagement/include/adduser_index.php
+++ b/Admin/Modules/Usermanagement/include/adduser_index.php
@@ -5,8 +5,9 @@ include ($_SERVER["DOCUMENT_ROOT"]."/Site/checkadmin.php");
 <!-- MAIN CONTENT BEGINN ################################################################################ -->
 	      
 <h1><b>User Management</b></h1>
-
+	<br/>
     <h2>Add new User:</h2>
+	<br/>
     <form action="/Admin/Modules/Usermanagement/include/adduser.php" method="post" onsubmit="return chkFormular()"> 
 	<input type="hidden" name="path" size="50" value="<?php echo $moduleurl;?>">
     <table>
diff --git a/Admin/Modules/Usermanagement/include/deleteuser_index.php b/Admin/Modules/Usermanagement/include/deleteuser_index.php
index 3d620a8..4d80192 100755
--- a/Admin/Modules/Usermanagement/include/deleteuser_index.php
+++ b/Admin/Modules/Usermanagement/include/deleteuser_index.php
@@ -3,8 +3,8 @@ include ($_SERVER["DOCUMENT_ROOT"]."/Site/checkadmin.php");
 ?> 
 <!-- MAIN CONTENT BEGINN ################################################################################ -->
 	      
-<h1><b>User Management</b></h1>
-    <h2>Delete User:</h2>
+<h1><b>User Management</b></h1><br/>
+    <h2>Delete User:</h2><br/>
     <form action="/Admin/Modules/Usermanagement/include/deleteuser.php" method="post"> 
 	<input type="hidden" name="path" size="50" value="<?php echo $moduleurl;?>">
     <table>
diff --git a/Admin/Modules/Usermanagement/include/edituser_index.php b/Admin/Modules/Usermanagement/include/edituser_index.php
index 3c740b9..6eeeff8 100755
--- a/Admin/Modules/Usermanagement/include/edituser_index.php
+++ b/Admin/Modules/Usermanagement/include/edituser_index.php
@@ -4,8 +4,8 @@ $nick = $_POST["nickname"];
 ?> 
 <!-- MAIN CONTENT BEGINN ################################################################################ -->
 	      
-<h1><b>User Management</b></h1>
-    <h2>Edit User:</h2>
+<h1><b>User Management</b></h1><br/>
+    <h2>Edit User:</h2><br/>
     <form action="/Admin/Modules/Usermanagement/include/edituser.php" method="post"> 
 	<input type="hidden" name="path" size="50" value="<?php echo $moduleurl;?>">
     <table>
diff --git a/Admin/Modules/Usermanagement/index.php b/Admin/Modules/Usermanagement/index.php
index 1d44e9c..7eb46e5 100755
--- a/Admin/Modules/Usermanagement/index.php
+++ b/Admin/Modules/Usermanagement/index.php
@@ -56,8 +56,9 @@ switch($mode)
 		include ($_SERVER["DOCUMENT_ROOT"]."/Admin/Modules/Usermanagement/include/viewuser_index.php");
 		break;
 	default:
-		echo"<h1><b>User Management</b></h1>   
+		echo"<h1><b>User Management</b></h1><br/>  
 			<h2>Choose an action:</h2>
+			<br/>
 			<p># <a href=\"".$moduleurl."&uebergabe=1\">Add new User</a></p> 
 			<p># <a href=\"".$moduleurl."&uebergabe=2\">Edit User</a></p>
 			<p># <a href=\"".$moduleurl."&uebergabe=3\">Delete User</a></p>
diff --git a/Admin/Modules/VPNconfig/index.php b/Admin/Modules/VPNconfig/index.php
index 75fb833..34c93a6 100755
--- a/Admin/Modules/VPNconfig/index.php
+++ b/Admin/Modules/VPNconfig/index.php
@@ -1,3 +1,6 @@
+<!-- MAIN -->
+<div id="main">	
+	<div class="wrapper">
 <?php
 $moduleurl = $_SERVER["REQUEST_URI"];
 $urlcut = strpos($moduleurl, "&");
@@ -52,8 +55,8 @@ switch($mode)
 		include ($_SERVER["DOCUMENT_ROOT"]."/Admin/Modules/VPNconfig/include/config-edit.php");
 		break;
 	default:
-		echo"<h1><b>VPN Configuration</b></h1>   
-			<h2>Choose an action:</h2>
+		echo"<h1><b>VPN Configuration</b></h1><br/> 
+			<h2>Choose an action:</h2><br/>
 			<p># <a href=\"".$moduleurl."&uebergabe=1\">Status</a></p> 
 			<p># <a href=\"".$moduleurl."&uebergabe=2\">Config</a></p>
 			<p># <a href=\"".$moduleurl."&uebergabe=3\">Certificates</a></p>
@@ -63,3 +66,5 @@ switch($mode)
 		break;		
 }
 ?>
+	</div>
+</div>
\ No newline at end of file