diff --git a/web/src/components/CommentItem.astro b/web/src/components/CommentItem.astro
index 90114c2..b18c7f8 100644
--- a/web/src/components/CommentItem.astro
+++ b/web/src/components/CommentItem.astro
@@ -150,13 +150,13 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:
     checked={comment.suspicious}
   />
 
-  <div class="comment-header scrollbar-w-none -mt-10 flex items-center gap-2 overflow-auto pt-10 text-sm">
+  <div class="comment-header flex items-center gap-2 text-sm">
     <label for={`collapse-${comment.id.toString()}`} class="cursor-pointer text-zinc-500 hover:text-zinc-300">
       <span class="collapse-symbol text-xs"></span>
       <span class="sr-only">Toggle comment visibility</span>
     </label>
 
-    <span class="flex items-center gap-1">
+    <span class="flex min-w-16 items-center gap-1">
       <UserBadge
         user={comment.author}
         size="md"
@@ -179,7 +179,7 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:
     </span>
 
     {/* User badges - more compact but still with text */}
-    <div class="flex flex-wrap items-center gap-1">
+    <div class="flex w-min grow flex-wrap items-center gap-1">
       {
         comment.author.admin && (
           <BadgeSmall icon="ri:shield-star-fill" color="green" text="Admin" variant="faded" inlineIcon />
diff --git a/web/src/components/ServiceWorkerScript.astro b/web/src/components/ServiceWorkerScript.astro
index b535e85..764e5fc 100644
--- a/web/src/components/ServiceWorkerScript.astro
+++ b/web/src/components/ServiceWorkerScript.astro
@@ -5,13 +5,6 @@
 <script>
   import { registerSW } from 'virtual:pwa-register'
 
-  declare global {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-    interface Window {
-      __SW_REGISTRATION__?: ServiceWorkerRegistration
-    }
-  }
-
   const NO_AUTO_RELOAD_ROUTES = ['/account/welcome', '/500', '/404'] as const satisfies `/${string}`[]
 
   let hasPendingUpdate = false
diff --git a/web/src/env.d.ts b/web/src/env.d.ts
index dfccb95..84a66a4 100644
--- a/web/src/env.d.ts
+++ b/web/src/env.d.ts
@@ -17,6 +17,7 @@ declare global {
 
   interface Window {
     htmx?: typeof htmx
+    __SW_REGISTRATION__?: ServiceWorkerRegistration
   }
 
   namespace PrismaJson {
diff --git a/web/src/styles/global.css b/web/src/styles/global.css
index 361c27f..e5422e5 100644
--- a/web/src/styles/global.css
+++ b/web/src/styles/global.css
@@ -103,10 +103,6 @@
     drop-shadow(0 0 4px color-mix(in oklab, currentColor 60%, transparent));
 }
 
-@utility scrollbar-w-none {
-  scrollbar-width: none;
-}
-
 @utility checkbox-force-checked {
   &:not(:checked) {
     @apply border-transparent! bg-current/50!;