diff --git a/routes.js b/routes.js
index c74467e..843fa41 100644
--- a/routes.js
+++ b/routes.js
@@ -63,8 +63,7 @@ async function iterate(req, res, index) {
     }
 
     let dat = await routesI[cmd].run(req, res, {});
-
-    if (!dat) {
+    if (!dat && !res.headersSent) {
         return await routes.client['e404'].run(req, res, {});
     }
 
diff --git a/static/main.css b/static/main.css
index d7b02f5..ae92813 100644
--- a/static/main.css
+++ b/static/main.css
@@ -19,6 +19,12 @@ body {
     flex-direction: column
 }
 
+.flex-row {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+
 body {
     align-items: center;
     overflow-x: hidden;
@@ -163,7 +169,8 @@ body {
 }
 
 .progressbar,
-.progressbar-div {
+.progressbar-div,
+.avatar-img {
     border-radius: var(--border-radius)
 }
 
diff --git a/views/user-clickable.ejs b/views/user-clickable.ejs
new file mode 100644
index 0000000..9bd527e
--- /dev/null
+++ b/views/user-clickable.ejs
@@ -0,0 +1,10 @@
+<div>
+    <img src='/pfp/<%= user %>.png' class='avatar-img'>
+    <div>
+        <div><b>
+                <a class='link' href='/client/user?id=<%= user %>'>
+                    <%= user %>
+                </a>
+            </b></div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/views/user.ejs b/views/user.ejs
index 41376b1..9f9a9d9 100644
--- a/views/user.ejs
+++ b/views/user.ejs
@@ -20,21 +20,21 @@
             <summary>
                 <%= following.length %> following
             </summary>
-            <% for (let user of following) { %>
-                <a class='link' href='/client/user?id=<%= user.target %>'>
-                    <%= user.target %>
-                </a>
-                <%} %>
+            <div class='flex-row'>
+                <% for (let user of following) { %>
+                    <%- include('user-clickable.ejs', {user: user.username}) %>
+                        <%} %>
+            </div>
         </details>
         <details>
             <summary>
                 <%= followers.length %> followers
             </summary>
-            <% for (let user of followers) { %>
-                <a class='link' href='/client/user?id=<%= user.username %>'>
-                    <%= user.username %>
-                </a>
-                <%} %>
+            <div class='flex-direction: row;'>
+                <% for (let user of followers) { %>
+                    <%- include('user-clickable.ejs', {user: user.username}) %>
+                        <%} %>
+            </div>
         </details>
     </div>
     <h1 class='content-header'>Uploaded Videos</h1>