diff --git a/views/html/users/index.tpl b/views/html/users/index.tpl
index abc310a8..b86a0348 100644
--- a/views/html/users/index.tpl
+++ b/views/html/users/index.tpl
@@ -2,13 +2,8 @@
 <nav class="admin">
 	<li><a href="<?=$linker->link('create', 1)?>"><?=_('Create new user')?></a></li>
 </nav>
-<ul>
+<ol class="cglist">
 	<?php foreach($users as &$user) : ?>
-	<li>
-		<h2><a href="<?=$linker->link(array('user', $user['username']), 1)?>"><?=$user['username']?></a></h2>
-		<details>
-			<summary><?=sprintf(_('registered on %s'),  $dateFormatter->format(new \DateTime($user['created'])))?></summary>
-		</details>
-	</li>
+	<li><a href="<?=$linker->link(array('user', $user['username']), 1)?>"><?=$user['username']?></a><span class="xp"><?=sprintf(_('registered on %s'),  $dateFormatter->format(new \DateTime($user['created'])))?></span></li>
 	<?php endforeach ?>
-</ul>
+</ol>
diff --git a/views/html/users/user.tpl b/views/html/users/user.tpl
index f48afbc3..b5e23aa7 100644
--- a/views/html/users/user.tpl
+++ b/views/html/users/user.tpl
@@ -1,11 +1,11 @@
 <h1><?=_('Users')?></h1>
-<h2><?=$user['username']?></h2>
 <?php if(count(array_intersect(array('admin','moderator'),\hhu\z\controllers\IntermediateController::$user['roles'])) > 0) : ?>
 <nav class="admin">
 	<li><a href="<?=$linker->link('edit', 3)?>"><?=_('Edit user')?></a></li>
 	<li><a href="<?=$linker->link('delete', 3)?>"><?=_('Delete user')?></a></li>
 </nav>
 <?php endif ?>
+<h2><?=$user['username']?></h2>
 <p>
 	<?=sprintf(_('registered on %s'), $dateFormatter->format(new \DateTime($user['created'])))?><br />
 	<?=_('Name')?>: <?=$user['prename']?> <?=$user['surname']?><br />