diff --git a/src/lib/AccountComponent.svelte b/src/lib/AccountComponent.svelte
index cee7fc7..4c987c8 100644
--- a/src/lib/AccountComponent.svelte
+++ b/src/lib/AccountComponent.svelte
@@ -3,7 +3,9 @@
     const { account }: { account: AccountMetadata } = $props();
     import { Config } from "../../config";
 </script>
-<div id="accountContainer">
+
+<a id="link" href="{Config.FRONTEND_URL}/profile/{account.did}">
+    <div id="accountContainer">
         {#if account.avatarCid}
             <img
                 id="avatar"
@@ -11,8 +13,12 @@
                 src="{Config.PDS_URL}/xrpc/com.atproto.sync.getBlob?did={account.did}&cid={account.avatarCid}"
             />
         {/if}
-        <div id="accountName">{account.displayName || account.did}</div>
-</div>
+        <div id="accountName">
+            {account.displayName || account.handle || account.did}
+        </div>
+    </div>
+</a>
+
 <style>
     #accountContainer {
         display: flex;
@@ -28,7 +34,7 @@
     #accountName {
         margin-left: 10px;
         font-size: 0.9em;
-        
+
         /* replace overflow with ellipsis */
         overflow: hidden;
         text-overflow: ellipsis;
@@ -40,4 +46,4 @@
         height: 50px;
         border-radius: 50%;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/lib/PostComponent.svelte b/src/lib/PostComponent.svelte
index 3af49c0..f077582 100644
--- a/src/lib/PostComponent.svelte
+++ b/src/lib/PostComponent.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Post } from "./pdsfetch";
-  import { Config } from "../../config"
+  import { Config } from "../../config";
   let { post }: { post: Post } = $props();
 </script>
 
@@ -13,10 +13,17 @@
         alt="avatar of {post.displayName}"
       />
     {/if}
-    <div id="headerText">{post.displayName} | {post.authorHandle} | {post.timenotstamp}</div>
+    <div id="headerText">
+      <a href="{Config.FRONTEND_URL}/profile/{post.authorDid}"
+        >{post.displayName} ( {post.authorHandle} )</a
+      >
+      |
+      <a href="{Config.FRONTEND_URL}/profile/{post.authorDid}/post/{post.cid}"
+        >{post.timenotstamp}</a
+      >
+    </div>
   </div>
   <div id="postContent">
-    <p>{post.text}</p>
     {#if post.replyingUri}
       <a
         id="replyingText"
@@ -24,6 +31,8 @@
           .replyingUri.rkey}">replying to {post.replyingUri.repo}</a
       >
     {/if}
+    <p>{post.text}</p>
+
     {#if post.quotingUri}
       <a
         id="quotingText"
diff --git a/src/lib/pdsfetch.ts b/src/lib/pdsfetch.ts
index 33a4345..ed24c45 100644
--- a/src/lib/pdsfetch.ts
+++ b/src/lib/pdsfetch.ts
@@ -31,6 +31,7 @@ interface atUriObject {
 class Post {
   authorDid: string;
   authorAvatarCid: string | null;
+  postCid: string;
   authorHandle: string;
   displayName: string;
   text: string;
@@ -45,6 +46,7 @@ class Post {
     record: ComAtprotoRepoListRecords.Record,
     account: AccountMetadata,
   ) {
+    this.postCid = record.cid;
     this.authorDid = account.did;
     this.authorAvatarCid = account.avatarCid;
     this.authorHandle = account.handle;