diff --git a/appview/db/follow.go b/appview/db/follow.go
index c7f50b07..2a18bce3 100644
--- a/appview/db/follow.go
+++ b/appview/db/follow.go
@@ -8,7 +8,7 @@ import (
 type Follow struct {
 	UserDid    string
 	SubjectDid string
-	FollowedAt *time.Time
+	FollowedAt time.Time
 	RKey       string
 }
 
@@ -33,9 +33,9 @@ func (d *DB) GetFollow(userDid, subjectDid string) (*Follow, error) {
 	followedAtTime, err := time.Parse(time.RFC3339, followedAt)
 	if err != nil {
 		log.Println("unable to determine followed at time")
-		follow.FollowedAt = nil
+		follow.FollowedAt = time.Now()
 	} else {
-		follow.FollowedAt = &followedAtTime
+		follow.FollowedAt = followedAtTime
 	}
 
 	return &follow, nil
@@ -110,9 +110,9 @@ func (d *DB) GetAllFollows() ([]Follow, error) {
 		followedAtTime, err := time.Parse(time.RFC3339, followedAt)
 		if err != nil {
 			log.Println("unable to determine followed at time")
-			follow.FollowedAt = nil
+			follow.FollowedAt = time.Now()
 		} else {
-			follow.FollowedAt = &followedAtTime
+			follow.FollowedAt = followedAtTime
 		}
 
 		follows = append(follows, follow)
diff --git a/appview/db/repos.go b/appview/db/repos.go
index 471369f0..a92f6f7c 100644
--- a/appview/db/repos.go
+++ b/appview/db/repos.go
@@ -10,13 +10,13 @@ type Repo struct {
 	Name    string
 	Knot    string
 	Rkey    string
-	Created *time.Time
+	Created time.Time
 }
 
 func (d *DB) GetAllRepos() ([]Repo, error) {
 	var repos []Repo
 
-	rows, err := d.db.Query(`select * from repos`)
+	rows, err := d.db.Query(`select did, name, knot, rkey, created from repos`)
 	if err != nil {
 		return nil, err
 	}
@@ -24,7 +24,7 @@ func (d *DB) GetAllRepos() ([]Repo, error) {
 
 	for rows.Next() {
 		var repo Repo
-		err := scanRepo(rows, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, repo.Created)
+		err := scanRepo(rows, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &repo.Created)
 		if err != nil {
 			return nil, err
 		}
@@ -41,7 +41,7 @@ func (d *DB) GetAllRepos() ([]Repo, error) {
 func (d *DB) GetAllReposByDid(did string) ([]Repo, error) {
 	var repos []Repo
 
-	rows, err := d.db.Query(`select did, name, knot, created from repos where did = ?`, did)
+	rows, err := d.db.Query(`select did, name, knot, rkey, created from repos where did = ?`, did)
 	if err != nil {
 		return nil, err
 	}
@@ -49,7 +49,7 @@ func (d *DB) GetAllReposByDid(did string) ([]Repo, error) {
 
 	for rows.Next() {
 		var repo Repo
-		err := scanRepo(rows, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, repo.Created)
+		err := scanRepo(rows, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &repo.Created)
 		if err != nil {
 			return nil, err
 		}
@@ -73,7 +73,7 @@ func (d *DB) GetRepo(did, name string) (*Repo, error) {
 		return nil, err
 	}
 	createdAtTime, _ := time.Parse(time.RFC3339, createdAt)
-	repo.Created = &createdAtTime
+	repo.Created = createdAtTime
 
 	return &repo, nil
 }
@@ -107,7 +107,7 @@ func (d *DB) CollaboratingIn(collaborator string) ([]Repo, error) {
 
 	for rows.Next() {
 		var repo Repo
-		err := scanRepo(rows, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, repo.Created)
+		err := scanRepo(rows, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &repo.Created)
 		if err != nil {
 			return nil, err
 		}
@@ -129,10 +129,9 @@ func scanRepo(rows *sql.Rows, did, name, knot, rkey *string, created *time.Time)
 
 	createdAtTime, err := time.Parse(time.RFC3339, createdAt)
 	if err != nil {
-		now := time.Now()
-		created = &now
+		*created = time.Now()
 	} else {
-		created = &createdAtTime
+		*created = createdAtTime
 	}
 
 	return nil
diff --git a/appview/db/timeline.go b/appview/db/timeline.go
index 893a8108..7837f227 100644
--- a/appview/db/timeline.go
+++ b/appview/db/timeline.go
@@ -1,6 +1,7 @@
 package db
 
 import (
+	"log"
 	"sort"
 	"time"
 )
@@ -8,7 +9,7 @@ import (
 type TimelineEvent struct {
 	*Repo
 	*Follow
-	EventAt *time.Time
+	EventAt time.Time
 }
 
 func (d *DB) MakeTimeline() ([]TimelineEvent, error) {
@@ -25,6 +26,7 @@ func (d *DB) MakeTimeline() ([]TimelineEvent, error) {
 	}
 
 	for _, repo := range repos {
+		log.Println(repo.Created)
 		events = append(events, TimelineEvent{
 			Repo:    &repo,
 			Follow:  nil,
@@ -41,7 +43,7 @@ func (d *DB) MakeTimeline() ([]TimelineEvent, error) {
 	}
 
 	sort.Slice(events, func(i, j int) bool {
-		return events[i].EventAt.After(*events[j].EventAt)
+		return events[i].EventAt.After(events[j].EventAt)
 	})
 
 	return events, nil
diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 2a08ba0d..a91559ed 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -176,6 +176,7 @@ func (p *Pages) Login(w io.Writer, params LoginParams) error {
 type TimelineParams struct {
 	LoggedInUser *auth.User
 	Timeline     []db.TimelineEvent
+	DidHandleMap map[string]string
 }
 
 func (p *Pages) Timeline(w io.Writer, params TimelineParams) error {
diff --git a/appview/pages/templates/layouts/topbar.html b/appview/pages/templates/layouts/topbar.html
index 97b3bcbd..0081610a 100644
--- a/appview/pages/templates/layouts/topbar.html
+++ b/appview/pages/templates/layouts/topbar.html
@@ -13,14 +13,19 @@
         <a href="/repo/new" hx-boost="true" class="{{ $linkstyle }}">
           <i class="w-6 h-6" data-lucide="plus"></i>
         </a>
-        <a href="/{{ didOrHandle .Did .Handle }}" hx-boost="true" class="{{ $linkstyle }}">
-          {{ didOrHandle .Did .Handle }} 
-        </a>
-        <a href="/logout"class="{{ $linkstyle }}">
-          (logout)
-        </a>
+        <details class="relative inline-block text-left">
+          <summary class="{{ $linkstyle }} cursor-pointer list-none">
+            {{ didOrHandle .Did .Handle }}
+          </summary>
+          <div class="absolute flex flex-col right-0 mt-4 p-2 w-48 bg-white border border-black z-50">
+            <a href="/{{ didOrHandle .Did .Handle }}"class="{{ $linkstyle }}">profile</a>
+            <a href="/knots"class="{{ $linkstyle }}">knots</a>
+            <a href="/settings"class="{{ $linkstyle }}">settings</a>
+            <a href="/logout" class="text-red-400 hover:text-red-700 no-underline">logout</a>
+          </div>
+        </details>
         {{ else }}
-        <a href="/login" hx-boost="true" class="{{ $linkstyle }}">
+        <a href="/login" class="{{ $linkstyle }}">
           login
         </a>
         {{ end }}
diff --git a/appview/pages/templates/timeline.html b/appview/pages/templates/timeline.html
index 22dfcb10..ed89fb6c 100644
--- a/appview/pages/templates/timeline.html
+++ b/appview/pages/templates/timeline.html
@@ -4,35 +4,44 @@
     <h1>Timeline</h1>
 
     {{ range .Timeline }}
+      <div class="relative
+                 px-4
+                 py-2
+                 border-l
+                 border-black
+                 before:content-['']
+                 before:absolute
+                 before:w-1
+                 before:h-1
+                 before:bg-black
+                 before:rounded-full
+                 before:left-[-2.2px]
+                 before:top-1/2
+                 before:-translate-y-1/2
+                 ">
         {{ if .Repo }}
-            <div class="border border-black p-4 m-2 bg-white w-1/2">
-                <div class="flex items-center">
-                    <div class="text-sm text-gray-600">
-                        {{ .Repo.Did }} created
-                    </div>
-                    <div class="px-3">{{ .Repo.Name }}</div>
-                </div>
-
-                <time class="text-sm text-gray-700"
-                    >{{ .Repo.Created | timeFmt }}</time
-                >
-            </div>
+          {{ $userHandle :=  index $.DidHandleMap .Repo.Did }}
+          <div class="flex items-center">
+            <p class="text-gray-600">
+            <a href="/{{ $userHandle }}" class="no-underline hover:underline">{{ $userHandle }}</a>
+            created
+            <a href="/{{ $userHandle }}/{{ .Repo.Name }}" class="no-underline hover:underline">{{ .Repo.Name }}</a>
+            <time class="text-gray-700">{{ .Repo.Created | timeFmt }}</time>
+            </p>
+          </div>
         {{ else if .Follow }}
-            <div class="border border-black p-4 m-2 bg-white w-1/2">
-                <div class="flex items-center">
-                    <div class="text-sm text-gray-600">
-                        {{ .Follow.UserDid }} followed
-                    </div>
-                    <div class="text-sm text-gray-800">
-                        {{ .Follow.SubjectDid }}
-                    </div>
-                </div>
-
-                <time class="text-sm text-gray-700"
-                    >{{ .Follow.FollowedAt | timeFmt }}</time
-                >
-            </div>
+          {{ $userHandle :=  index $.DidHandleMap .Follow.UserDid }}
+          {{ $subjectHandle :=  index $.DidHandleMap .Follow.SubjectDid }}
+          <div class="flex items-center">
+            <p class="text-gray-600">
+            <a href="/{{ $userHandle }}" class="no-underline hover:underline">{{ $userHandle }}</a>
+            followed
+            <a href="/{{ $subjectHandle }}" class="no-underline hover:underline">{{ $subjectHandle }}</a>
+            <time class="text-gray-700">{{ .Follow.FollowedAt | timeFmt }}</time>
+            </p>
+          </div>
         {{ end }}
+      </div>
     {{ end }}
 
 {{ end }}
diff --git a/appview/pages/templates/user/profile.html b/appview/pages/templates/user/profile.html
index be1aa87d..a177ce66 100644
--- a/appview/pages/templates/user/profile.html
+++ b/appview/pages/templates/user/profile.html
@@ -24,7 +24,7 @@
     <div class="text-sm mb-4">
       <span>{{ .ProfileStats.Followers }} followers</span>
       <div class="inline-block px-1 select-none after:content-['·']"></div>
-      <span>following {{ .ProfileStats.Following }}</span>
+      <span>{{ .ProfileStats.Following }} following</span>
     </div>
     <p class="text-xs font-bold py-2">REPOS</p>
     <div id="repos" class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-6">
diff --git a/appview/state/state.go b/appview/state/state.go
index ff956fd9..0c714899 100644
--- a/appview/state/state.go
+++ b/appview/state/state.go
@@ -165,9 +165,31 @@ func (s *State) Timeline(w http.ResponseWriter, r *http.Request) {
 		s.pages.Notice(w, "timeline", "Uh oh! Failed to load timeline.")
 	}
 
+	var didsToResolve []string
+	for _, ev := range timeline {
+		if ev.Repo != nil {
+			didsToResolve = append(didsToResolve, ev.Repo.Did)
+		}
+		if ev.Follow != nil {
+			didsToResolve = append(didsToResolve, ev.Follow.UserDid)
+			didsToResolve = append(didsToResolve, ev.Follow.SubjectDid)
+		}
+	}
+
+	resolvedIds := s.resolver.ResolveIdents(r.Context(), didsToResolve)
+	didHandleMap := make(map[string]string)
+	for _, identity := range resolvedIds {
+		if !identity.Handle.IsInvalidHandle() {
+			didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
+		} else {
+			didHandleMap[identity.DID.String()] = identity.DID.String()
+		}
+	}
+
 	s.pages.Timeline(w, pages.TimelineParams{
 		LoggedInUser: user,
 		Timeline:     timeline,
+		DidHandleMap: didHandleMap,
 	})
 
 	return