diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index f3660f87..1339f205 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -74,8 +74,8 @@ func funcMap() template.FuncMap {
 		"splitN": func(s, sep string, n int) []string {
 			return strings.SplitN(s, sep, n)
 		},
-		"unescapeHtml": func(s string) template.HTML {
-			return template.HTML(s)
+		"escapeHtml": func(s string) string {
+			return template.HTMLEscapeString(s)
 		},
 		"nl2br": func(text string) template.HTML {
 			return template.HTML(strings.Replace(template.HTMLEscapeString(text), "\n", "<br>", -1))
@@ -269,10 +269,12 @@ func (p *Pages) RepoLog(w io.Writer, params RepoLogParams) error {
 type RepoCommitParams struct {
 	LoggedInUser *auth.User
 	RepoInfo     RepoInfo
+	Active       string
 	types.RepoCommitResponse
 }
 
 func (p *Pages) RepoCommit(w io.Writer, params RepoCommitParams) error {
+	params.Active = "overview"
 	return p.executeRepo("repo/commit", w, params)
 }
 
diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html
index 96da6642..ca4717a5 100644
--- a/appview/pages/templates/layouts/base.html
+++ b/appview/pages/templates/layouts/base.html
@@ -12,11 +12,11 @@
             <title>{{ block "title" . }}tangled{{ end }}</title>
         </head>
         <body class="container mx-auto px-10">
-            <header>
-                {{ block "topbar" . }}
-                    {{ template "layouts/topbar" . }}
-                {{ end }}
-            </header>
+          <header>
+            {{ block "topbar" . }}
+            {{ template "layouts/topbar" . }}
+            {{ end }}
+          </header>
             <main class="content">{{ block "content" . }}{{ end }}</main>
             <script src="/static/lucide.min.js"></script>
             <script>
diff --git a/appview/pages/templates/layouts/repobase.html b/appview/pages/templates/layouts/repobase.html
index 656cad89..3cb5d1ad 100644
--- a/appview/pages/templates/layouts/repobase.html
+++ b/appview/pages/templates/layouts/repobase.html
@@ -2,8 +2,11 @@
 
 {{ define "content" }}
     <section id="repo-header" class="mb-4">
-        <span class="text-xl">{{ .RepoInfo.FullName }}</span>
-        <br/>
+        <p class="text-xl">
+          <a href="/{{ .RepoInfo.OwnerWithAt }}" class="no-underline hover:underline">{{ .RepoInfo.OwnerWithAt }}</a>
+          /
+          <a href="/{{ .RepoInfo.FullName }}" class="no-underline hover:underline">{{ .RepoInfo.Name }}</a>
+        </p>
         <span>
           {{ if .RepoInfo.Description }}
             {{ .RepoInfo.Description }}
diff --git a/appview/pages/templates/repo/blob.html b/appview/pages/templates/repo/blob.html
index 21c6646b..9769a301 100644
--- a/appview/pages/templates/repo/blob.html
+++ b/appview/pages/templates/repo/blob.html
@@ -18,5 +18,5 @@
 {{ if .IsBinary }}<p class="text-center text-gray-400">This is a binary file and will not be displayed.</p>{{ else }}
 <pre class="font-mono text-sm overflow-auto relative text-ellipsis"><code>{{ range $idx, $line := $lines }}<span class="flex">
   <span class="{{ $code_number_style }}" style="min-width: {{$tot_chars}}ch;">{{ add $idx 1 }}</span>
-  <span class="whitespace-pre">{{ unescapeHtml $line }}</span></span>{{ else }}<em class="text-gray-400">this file is empty</em>{{ end }}</code></pre>{{ end}}
+  <span class="whitespace-pre">{{ escapeHtml $line }}</span></span>{{ else }}<em class="text-gray-400">this file is empty</em>{{ end }}</code></pre>{{ end}}
 {{ end }}
diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html
index b00e2bc7..225a4434 100644
--- a/appview/pages/templates/repo/commit.html
+++ b/appview/pages/templates/repo/commit.html
@@ -8,44 +8,44 @@
 {{ $diff := .Diff.Diff }}
 
 <section class="commit">
-  <pre>{{- $commit.Message -}}</pre>
-  <div class="commit-info">
-  {{ $commit.Author.Name }} <a href="mailto:{{ $commit.Author.Email }}" class="commit-email">{{ $commit.Author.Email}}</a>
-  <div>{{ $commit.Author.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" }}</div>
+  <div id="commit-message">
+    {{ $messageParts := splitN $commit.Message "\n\n" 2 }}
+    <div>
+      {{ index $messageParts 0 }}
+      {{ if gt (len $messageParts) 1 }}
+      <p class="mt-1 cursor-text pb-2">{{ nl2br (unwrapText (index $messageParts 1)) }}</p>
+      {{ end }}
+    </div>
   </div>
 
-  <div>
-  <strong>commit</strong>
-  <p><a href="/{{ $repo }}/commit/{{ $commit.This }}" class="commit-hash">
-    {{ slice $commit.This 0 8 }}
-  </a>
+  <p class="text-sm text-gray-500">
+    <a href="mailto:{{ $commit.Author.Email }}" class="no-underline hover:underline text-gray-500">
+      {{ $commit.Author.Name }}
+    </a>
+    &nbsp;·&nbsp;
+    {{ timeFmt $commit.Author.When }}
+    &nbsp;·&nbsp;
+    <span class="font-mono">{{ $stat.FilesChanged }}</span> files <span class="font-mono">(+{{ $stat.Insertions }}, -{{ $stat.Deletions }})</span>
+    &nbsp;·&nbsp;
+    <a href="/{{ $repo }}/commit/{{ $commit.This }}" class="no-underline hover:underline text-gray-500">
+      {{ slice $commit.This 0 8 }}
+    </a>
+    {{ if $commit.Parent }}
+      &lt;--
+      <a href="/{{ $repo }}/commit/{{ $commit.Parent }}" class="no-underline hover:underline text-gray-500">
+        {{ slice $commit.Parent 0 8 }}
+      </a>
+    {{ end }}
   </p>
-  </div>
-
-  {{ if $commit.Parent }}
-  <div>
-  <strong>parent</strong>
-  <p><a href="/{{ $repo }}/commit/{{ $commit.Parent }}" class="commit-hash">
-    {{ slice $commit.Parent 0 8 }}
-  </a></p>
-  </div>
 
-  {{ end }}
   <div class="diff-stat">
-    <div>
-    {{ $stat.FilesChanged }} files changed,
-    {{ $stat.Insertions }} insertions(+),
-    {{ $stat.Deletions }} deletions(-)
-    </div>
-    <div>
-      <br>
-      <strong>jump to</strong>
-      {{ range $diff }}
-      <ul>
+    <br>
+    <strong>jump to</strong>
+    {{ range $diff }}
+    <ul>
       <li><a href="#{{ .Name.New }}">{{ .Name.New }}</a></li>
-      </ul>
-      {{ end }}
-    </div>
+    </ul>
+    {{ end }}
   </div>
 </section>
 <section>
@@ -75,7 +75,7 @@
     {{ if .IsBinary }}
     <p>Not showing binary file.</p>
     {{ else }}
-      <pre>
+      <pre class="overflow-auto">
       {{- range .TextFragments -}}
       <p>{{- .Header -}}</p>
       {{- range .Lines -}}
diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html
index e7931225..cab2fca5 100644
--- a/appview/pages/templates/repo/index.html
+++ b/appview/pages/templates/repo/index.html
@@ -101,7 +101,7 @@
           <div class="text-base cursor-pointer">
             <div>
               <div class="flex items-center gap-1">
-                <a href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}" class="inline no-underline hover:underline hover:text-sky-400">{{ index $messageParts 0 }}</a>
+                <a href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}" class="inline no-underline hover:underline">{{ index $messageParts 0 }}</a>
                 {{ if gt (len $messageParts) 1 }}
                 <button class="text-sm inline rounded-sm bg-gray-300 text-gray-700 px-1 w-fit hover:bg-gray-400"
                       hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')">&hellip;</button>
diff --git a/jetstream/jetstream.go b/jetstream/jetstream.go
index 5f80db47..a90fd6b3 100644
--- a/jetstream/jetstream.go
+++ b/jetstream/jetstream.go
@@ -29,6 +29,9 @@ type JetstreamClient struct {
 }
 
 func (j *JetstreamClient) AddDid(did string) {
+	if did == "" {
+		return
+	}
 	j.mu.Lock()
 	j.cfg.WantedDids = append(j.cfg.WantedDids, did)
 	j.mu.Unlock()
@@ -37,7 +40,11 @@ func (j *JetstreamClient) AddDid(did string) {
 
 func (j *JetstreamClient) UpdateDids(dids []string) {
 	j.mu.Lock()
-	j.cfg.WantedDids = dids
+	for _, did := range dids {
+		if did != "" {
+		}
+		j.cfg.WantedDids = append(j.cfg.WantedDids, did)
+	}
 	j.mu.Unlock()
 	j.reconnectCh <- struct{}{}
 }