diff --git a/index.php b/index.php
index 8f61c1d..680a3bb 100644
--- a/index.php
+++ b/index.php
@@ -25,9 +25,9 @@
 	<?php $x = 0 ?>
 	<?php foreach (findAllUsers($page) as $x => $user): ?>
 		<tr>
-			<td class="gravatar"><img src="//www.gravatar.com/avatar/<?php echo md5($user["username"] . "@php.net")?>.jpg" alt="Picture of <?php $user["name"] ?>"/></td>
-			<td class="username"><a href="/<?php echo $user["username"]?>"><?php echo $user["username"] ?></a></td>
-			<td class="name"><?php echo $user["name"] ?></td>
+			<td class="gravatar"><a href="/<?= $user['username'] ?>"><img src="//www.gravatar.com/avatar/<?php echo md5($user["username"] . "@php.net")?>.jpg" alt="Picture of <?= $user['name'] ?>"/></a></td>
+			<td class="username"><a href="/<?= $user['username']?>"><?= $user['username'] ?></a></td>
+			<td class="name"><a href="/<?= $user['username'] ?>"><?= $user['name'] ?></a></td>
 		</tr>
 	<?php endforeach ?>
 	</tbody>