diff --git a/assets/styles/03-components/article.css b/assets/styles/03-components/article.css
index 2cd0812..0691f43 100644
--- a/assets/styles/03-components/article.css
+++ b/assets/styles/03-components/article.css
@@ -161,3 +161,9 @@ blockquote p {
 article .card {
     margin: 0;
 }
+
+.comments {
+    display: flex;
+    flex-direction: column;
+    gap: var(--spacing-1);
+}
diff --git a/src/Controller/ArticleController.php b/src/Controller/ArticleController.php
index df75c48..266c580 100644
--- a/src/Controller/ArticleController.php
+++ b/src/Controller/ArticleController.php
@@ -104,7 +104,7 @@ class ArticleController  extends AbstractController
 
         $key = new Key();
         $npub = $key->convertPublicKeyToBech32($article->getPubkey());
-        $author = $redisCacheService->getMetadata($npub);
+        $author = $redisCacheService->getMetadata($article->getPubkey());
 
         // determine whether the logged-in user is the author
         $canEdit = false;
diff --git a/src/Controller/AuthorController.php b/src/Controller/AuthorController.php
index 1691b1b..c5b49ed 100644
--- a/src/Controller/AuthorController.php
+++ b/src/Controller/AuthorController.php
@@ -6,6 +6,7 @@ namespace App\Controller;
 
 use App\Service\NostrClient;
 use App\Service\RedisCacheService;
+use App\Util\NostrKeyUtil;
 use Elastica\Query\Terms;
 use Exception;
 use FOS\ElasticaBundle\Finder\FinderInterface;
@@ -22,9 +23,10 @@ class AuthorController extends AbstractController
      * @throws Exception
      */
     #[Route('/p/{npub}/media', name: 'author-media', requirements: ['npub' => '^npub1.*'])]
-    public function media($npub, NostrClient $nostrClient, RedisCacheService $redisCacheService): Response
+    public function media($npub, NostrClient $nostrClient, RedisCacheService $redisCacheService, NostrKeyUtil $keyUtil): Response
     {
-        $author = $redisCacheService->getMetadata($npub);
+
+        $author = $redisCacheService->getMetadata($keyUtil->npubToHex($npub));
 
         // Use paginated cached media events - fetches 200 from relays, serves first 24
         $paginatedData = $redisCacheService->getMediaEventsPaginated($npub, 1, 24);
@@ -113,7 +115,7 @@ class AuthorController extends AbstractController
         $keys = new Key();
         $pubkey = $keys->convertToHex($npub);
 
-        $author = $redisCacheService->getMetadata($npub);
+        $author = $redisCacheService->getMetadata($pubkey);
         // Retrieve long-form content for the author
         try {
             $list = $nostrClient->getLongFormContentForPubkey($npub);
diff --git a/src/Controller/EventController.php b/src/Controller/EventController.php
index 4569804..1d0d9de 100644
--- a/src/Controller/EventController.php
+++ b/src/Controller/EventController.php
@@ -92,13 +92,7 @@ class EventController extends AbstractController
                 $logger->info('Parsed Nostr links from content', ['count' => count($nostrLinks)]);
             }
 
-            // If author is included in the event, get metadata
-            $authorMetadata = null;
-            if (isset($event->pubkey)) {
-                $key = new Key();
-                $npub = $key->convertPublicKeyToBech32($event->pubkey);
-                $authorMetadata = $redisCacheService->getMetadata($npub);
-            }
+            $authorMetadata = $redisCacheService->getMetadata($event->pubkey);
 
             // Render template with the event data and extracted Nostr links
             $response = $this->render('event/index.html.twig', [