diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index ad046ef57..9ef2f2bbb 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -145,6 +145,7 @@ type ProfilePageParams struct {
 	CollaboratingRepos []db.Repo
 	ProfileStats       ProfileStats
 	FollowStatus       db.FollowStatus
+	DidHandleMap       map[string]string
 }
 
 type ProfileStats struct {
diff --git a/appview/pages/templates/layouts/repobase.html b/appview/pages/templates/layouts/repobase.html
index 4220dd1d5..770e2e463 100644
--- a/appview/pages/templates/layouts/repobase.html
+++ b/appview/pages/templates/layouts/repobase.html
@@ -29,10 +29,13 @@
                         hx-boost="true"
                     >
                         <div
-                            class="px-4 py-2 mr-1 text-black min-w-[80px] text-center relative group-hover:bg-gray-200 rounded-t
-                         {{ if eq $.Active $key }}
+                            class="px-4 py-1 mr-1 text-black min-w-[80px] text-center relative rounded-t
+                             {{ if eq $.Active $key }}
                                 {{ $activeTabStyles }}
-                            {{ end }}"
+                             {{ else }}
+                                group-hover:bg-gray-200
+                             {{ end }}
+                             "
                         >
                             {{ $key }}
                         </div>
diff --git a/appview/pages/templates/user/profile.html b/appview/pages/templates/user/profile.html
index c6d69b098..fb34b56f0 100644
--- a/appview/pages/templates/user/profile.html
+++ b/appview/pages/templates/user/profile.html
@@ -58,8 +58,8 @@
         class="py-4 px-6 drop-shadow-sm rounded bg-white"
         >
         <div id="repo-card-name" class="font-medium">
-          <a href="/{{ .Did }}/{{ .Name }}">
-            @{{ .Did }}/{{ .Name }}
+          <a href="/{{ index $.DidHandleMap .Did }}/{{ .Name }}">
+            {{ index $.DidHandleMap .Did }}/{{ .Name }}
           </a>
         </div>
         <div
diff --git a/appview/state/repo.go b/appview/state/repo.go
index b1342b606..5601a3cda 100644
--- a/appview/state/repo.go
+++ b/appview/state/repo.go
@@ -219,8 +219,6 @@ func (s *State) RepoTree(w http.ResponseWriter, r *http.Request) {
 	baseTreeLink := path.Join(f.OwnerDid(), f.RepoName, "tree", ref, treePath)
 	baseBlobLink := path.Join(f.OwnerDid(), f.RepoName, "blob", ref, treePath)
 
-	log.Println(result)
-
 	s.pages.RepoTree(w, pages.RepoTreeParams{
 		LoggedInUser: user,
 		BreadCrumbs:  breadcrumbs,
diff --git a/appview/state/state.go b/appview/state/state.go
index 519c7e0a3..8e6121491 100644
--- a/appview/state/state.go
+++ b/appview/state/state.go
@@ -642,6 +642,19 @@ func (s *State) ProfilePage(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.Printf("getting collaborating repos for %s: %s", ident.DID.String(), err)
 	}
+	var didsToResolve []string
+	for _, r := range collaboratingRepos {
+		didsToResolve = append(didsToResolve, r.Did)
+	}
+	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()
+		}
+	}
 
 	followers, following, err := s.db.GetFollowerFollowing(ident.DID.String())
 	if err != nil {
@@ -665,6 +678,7 @@ func (s *State) ProfilePage(w http.ResponseWriter, r *http.Request) {
 			Following: following,
 		},
 		FollowStatus: db.FollowStatus(followStatus),
+		DidHandleMap: didHandleMap,
 	})
 }
 
diff --git a/tailwind.config.js b/tailwind.config.js
index fd733cdd5..2ee36e5ad 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -10,7 +10,7 @@ module.exports = {
         md: "650px",
         lg: "900px",
         xl: "1100px",
-        "2xl": "1300x",
+        "2xl": "1300px"
       },
     },
     extend: {