diff --git a/admin/css/apps.css b/admin/css/apps.css
index c6b4f69ebcb..e9049358e51 100644
--- a/admin/css/apps.css
+++ b/admin/css/apps.css
@@ -1,9 +1,14 @@
 /* APPS TABLE */
-table td.date { width:5em; padding:.5em 1em; text-align:right; }
-table td.version, table td.enabled, table td.disabled { padding:.5em 1em; text-align:center; }
+table td.date { width:5em; padding:.5em 1em; text-align:left; }
+table td.version, table td.enabled, table td.disabled { padding:.5em 1em; text-align:left; }
 .preview  { padding:3px; text-align:left; }
-table td.date { width:11em; color:#555555; }
-table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
-table td.name a { padding:6px; text-decoration:none; color:#555555; }
-.type  { text-decoration:none; color:#888888; font-size:.8em; }
-.description  { text-decoration:none; color:#666666; font-size:.9em; }
+table td.date { width:11em; color:#555; }
+table td.selection, table th.selection, table td.fileaction { width:2em; text-align:left; }
+table td.name a { padding:6px; text-decoration:none; color:#555; }
+.type  { text-decoration:none; color:#888; font-size:.8em; }
+.description  { text-decoration:none; color:#666; font-size:.9em; }
+
+ul#apps { width:40em; list-style:none; }
+ul#apps li { display:block; padding:.2em; clear:right; }
+ul#apps em { color:#555; }
+ul#apps input { float:right; }
diff --git a/admin/templates/appsinst.php b/admin/templates/appsinst.php
index d205d95cc34..e845cb451fd 100644
--- a/admin/templates/appsinst.php
+++ b/admin/templates/appsinst.php
@@ -1,20 +1,7 @@
-<table>
-	<thead>
-		<tr>
-			<th><?php echo $l->t( 'Name' ); ?></th>
-			<th><?php echo $l->t( 'Version' ); ?></th>
-			<th><?php echo $l->t( 'Author' ); ?></th>
-			<th><?php echo $l->t( 'Status' ); ?></th>
-		</tr>
-	</thead>
-	<tbody>
-		<?php foreach($_["apps"] as $app): ?>
-			<tr x-uid="<?php echo($app['id']); ?>">
-				<td class="name" width="200"><?php echo($app['name']); ?></td>
-				<td class="version"><?php echo($app['version']); ?></td>
-				<td><?php echo($app['author']); ?></td>
-				<td><input x-use="appenablebutton" type="submit" value="<?php echo $l->t( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" class="appbutton <?php echo( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" /></td>
-			</tr>
-		<?php endforeach; ?>
-	</tbody>
-</table>
+<ul id="apps">
+<?php foreach($_["apps"] as $app): ?>
+	<li x-uid="<?php echo($app['id']); ?>"><strong><?php echo($app['name']); ?></strong> <?php echo($app['version']); ?> <em>by <?php echo($app['author']); ?></em>
+	<input x-use="appenablebutton" type="submit" value="<?php echo $l->t( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" class="appbutton <?php echo( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" />
+	</li>
+<?php endforeach; ?>
+</ul>
diff --git a/admin/templates/users.php b/admin/templates/users.php
index 79a4c712049..c16270edbf4 100644
--- a/admin/templates/users.php
+++ b/admin/templates/users.php
@@ -8,7 +8,7 @@
 				<th></th>
 			</tr>
 		</thead>
-		<tfoot>
+		<tbody>
 			<tr id="createuserform">
 				<form id="createuserdata">
 					<td>
@@ -26,8 +26,6 @@
 					</td>
 				</form>
 			</tr>
-		</tfoot>
-		<tbody>
 			<?php foreach($_["users"] as $user): ?>
 				<tr x-uid="<?php echo $user["name"] ?>">
 					<td x-use="username"><span x-use="usernamediv"><?php echo $user["name"]; ?></span></td>
@@ -44,23 +42,15 @@
 </fieldset>
 
 <fieldset>
-		<legend><?php echo $l->t( 'Groups' ); ?></legend>
+	<legend><?php echo $l->t( 'Groups' ); ?></legend>
 	<table id="grouptable">
-		<thead>
-			<tr>
-				<th><?php echo $l->t( 'Name' ); ?></th>
-				<th></th>
-			</tr>
-		</thead>
-		<tfoot>
+		<tbody>
 			<form id="creategroupdata">
 				<tr>
 					<td><input x-use="creategroupfield" type="text" name="groupname" placeholder="New group" /></td>
 					<td><input type="submit" id="creategroupbutton" value="<?php echo $l->t( 'Create group' ); ?>" /></td>
 				</tr>
 			</form>
-		</tfoot>
-		<tbody>
 			<?php foreach($_["groups"] as $group): ?>
 				<tr x-gid="<?php echo $group["name"]; ?>">
 					<td><?php echo $group["name"] ?></td>
diff --git a/core/css/styles.css b/core/css/styles.css
index 114080f1f10..a0e67b4bde9 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -32,8 +32,9 @@ form#user_settings p label { display:block; float:left; width:35%; padding:0.4em
 form p { padding:0.5em 4em 0.5em 0.5em; text-align:left; }
 form p.form_footer { margin:1em 0 0 0; text-align:right; }
 form label { cursor:pointer; }
-fieldset { padding:1em; background-color:#f7f7f7; border:1px solid #ddd; max-width:600px; margin:2em; }
-legend { padding:.5em; font-size:1.2em; }
+fieldset { padding:1em; width:40em; margin:1em;
+border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f2f2f2; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;}
+legend { padding:.2em; font-size:1.2em; }
 .template{display:none;}
 
 div.controls { width:100%; height:3em; margin:0; background-color:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:2; }