diff --git a/pages/user.go b/pages/user.go
index 05b0355..0a9cc4b 100644
--- a/pages/user.go
+++ b/pages/user.go
@@ -1,7 +1,6 @@
 package pages
 
 import (
-	"fmt"
 	"strconv"
 
 	"codeberg.org/rimgo/rimgo/utils"
@@ -97,8 +96,6 @@ func HandleUserComments(c *fiber.Ctx) error {
 		return err
 	}
 
-	fmt.Println(comments[0].Post.Cover.Url) //FIXME:debug
-
 	return c.Render("userComments", fiber.Map{
 		"user":     user,
 		"comments": comments,
diff --git a/views/partials/contextComment.hbs b/views/partials/contextComment.hbs
index 1faf833..5d06633 100644
--- a/views/partials/contextComment.hbs
+++ b/views/partials/contextComment.hbs
@@ -1,39 +1,30 @@
-<div class="flex flex-col gap-2">
-  <img src="{{this.Post.Cover.Url}}" alt="">
-  <!-- https://codeberg.org/orangix/rimgo/src/branch/main/pages/user.go#L100
-  The URL prints properly here, why doesn't it appear?
-  
-  Also TODO, covers can be videos, ???? -->
-  <div class="flex gap-2 items-center">
-    {{#noteq this.User.Username "[deleted]"}}
-    <img src="{{this.User.Avatar}}" class="rounded-full" width="24" height="24" loading="lazy">
-    <a href="/user/{{this.User.Username}}">
-      <p class="whitespace-nowrap text-ellipsis overflow-hidden"><b>{{this.User.Username}}</b></p>
-    </a>
-    {{/noteq}}
-    {{#equal this.User.Username "[deleted]"}}
-    <p class="whitespace-nowrap text-ellipsis overflow-hidden"><b>[deleted]</b></p>
-    {{/equal}}
-  </div>
-  <div>
-    <p>{{{this.Comment}}}</p>
-    <div class="flex gap-2">
-      <span title="{{this.CreatedAt}}">{{this.RelTime}}</span>
-      {{#if this.DeletedAt}}
-      <span class="text-md">(deleted {{this.DeletedAt}})</span>
-      {{/if}}
-      |
-      <img class="invert icon" src="/static/icons/PhArrowFatUp.svg" alt="Likes" width="24px" height="24px">
-      {{this.Upvotes}}
-      <img class="invert icon" src="/static/icons/PhArrowFatDown.svg" alt="Dislikes" width="24px" height="24px">
-      {{this.Downvotes}}
+<a href="{{Post.Link}}">
+  <div class="flex flex-row gap-2 w-full bg-slate-600 p-2 rounded-lg">
+    <img class="object-cover hidden sm:block w-[80px] h-[100px] rounded-lg" src="{{this.Post.Cover.Url}}" alt="">
+    <div class="flex flex-col gap-2">
+      <div class="flex gap-2 items-center">
+        {{#noteq this.User.Username "[deleted]"}}
+        <img src="{{this.User.Avatar}}" class="rounded-full" width="24" height="24" loading="lazy">
+        <p class="whitespace-nowrap text-ellipsis overflow-hidden"><b>{{this.User.Username}}</b></p>
+        {{/noteq}}
+        {{#equal this.User.Username "[deleted]"}}
+        <p class="whitespace-nowrap text-ellipsis overflow-hidden"><b>[deleted]</b></p>
+        {{/equal}}
+      </div>
+      <div>
+        <p>{{{this.Comment}}}</p>
+        <div class="flex gap-2">
+          <span title="{{this.CreatedAt}}">{{this.RelTime}}</span>
+          {{#if this.DeletedAt}}
+          <span class="text-md">(deleted {{this.DeletedAt}})</span>
+          {{/if}}
+          |
+          <img class="invert icon" src="/static/icons/PhArrowFatUp.svg" alt="Likes" width="24px" height="24px">
+          {{this.Upvotes}}
+          <img class="invert icon" src="/static/icons/PhArrowFatDown.svg" alt="Dislikes" width="24px" height="24px">
+          {{this.Downvotes}}
+        </div>
+      </div>
     </div>
   </div>
-  {{#if this.Comments}}
-  <div class="ml-4 p-2 border-solid border-l-2 border-slate-400">
-    {{#each this.Comments}}
-    {{> partials/comment }}
-    {{/each}}
-  </div>
-  {{/if}}
-</div>
\ No newline at end of file
+</a>
\ No newline at end of file
diff --git a/views/user.hbs b/views/user.hbs
index 0243e1b..2213f59 100644
--- a/views/user.hbs
+++ b/views/user.hbs
@@ -21,6 +21,11 @@
         <h2 class="font-bold text-2xl">{{user.Username}}</h2>
         <p>{{user.Points}} pts · {{user.CreatedAt}}</p>
       </div>
+      <hr class="sm:border-0 flex-grow">
+      <div class="flex flex-col sm:items-end">
+        <a href="/user/{{user.Username}}"><b>Submissions</b></a>
+        <a href="/user/{{user.Username}}/comments">Comments</a>
+      </div>
     </div>
     <p class="mt-2">{{user.Bio}}</p>
   </header>
diff --git a/views/userComments.hbs b/views/userComments.hbs
index c7be3e4..662c73a 100644
--- a/views/userComments.hbs
+++ b/views/userComments.hbs
@@ -21,6 +21,11 @@
         <h2 class="font-bold text-2xl">{{user.Username}}</h2>
         <p>{{user.Points}} pts · {{user.CreatedAt}}</p>
       </div>
+      <hr class="sm:border-0 flex-grow">
+      <div class="flex flex-col sm:items-end">
+        <a href="/user/{{user.Username}}">Submissions</a>
+        <a href="/user/{{user.Username}}/comments"><b>Comments</b></a>
+      </div>
     </div>
     <p class="mt-2">{{user.Bio}}</p>
   </header>