diff --git a/templates/telegram_instant_view.html b/templates/telegram_instant_view.html
index 727ec77..b73ecb2 100644
--- a/templates/telegram_instant_view.html
+++ b/templates/telegram_instant_view.html
@@ -29,15 +29,22 @@
 <article>
   <h1>
     {{ if not (eq "" .Subject) }} {{.Subject}} {{ else }}
-    {{.Metadata.ShortName}} on Nostr: {{ end }}
+    <a href="/{{.Metadata.Npub}}">{{.Metadata.ShortName}}</a> on Nostr: {{ end
+    }}
   </h1>
 
   {{ if not (eq "" .ParentLink) }}
-  <h2>in reply to {{ .ParentLink }}</h2>
-  {{ else if not (eq "" .Summary) }}
-  <h2>{{ .Summary }}</h2>
+  <aside>in reply to {{ .ParentLink }}</aside>
+  {{ end }}
+  <!---->
+  {{ if not (eq "" .Summary) }}
+  <aside>{{ .Summary }}</aside>
   {{ end }}
 
   <!---->
-  {{.Content}}
+  {{.Content}} {{ if not (eq "" .Subject) }}
+  <aside>
+    <a href="/{{.Metadata.Npub}}">{{.Metadata.ShortName}}</a>
+  </aside>
+  {{ end }}
 </article>