diff --git a/src/components/HiddenDidDialog.vue b/src/components/HiddenDidDialog.vue
index a94c34aee0..980a38528f 100644
--- a/src/components/HiddenDidDialog.vue
+++ b/src/components/HiddenDidDialog.vue
@@ -48,12 +48,15 @@
                   <span>
                     {{ didInfo(visDid) }}
                     <span v-if="!serverUtil.isEmptyOrHiddenDid(visDid)">
-                      <a :href="`/did/${visDid}`" class="text-blue-500">
+                      <router-link
+                        :to="{ path: '/did/' + encodeURIComponent(visDid) }"
+                        class="text-blue-500"
+                      >
                         <font-awesome
                           icon="arrow-up-right-from-square"
                           class="fa-fw"
                         />
-                      </a>
+                      </router-link>
                     </span>
                   </span>
                 </div>
diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue
index 602373a426..8c0ac55abb 100644
--- a/src/views/ClaimView.vue
+++ b/src/views/ClaimView.vue
@@ -292,12 +292,17 @@
                   <div class="text-sm">
                     {{ didInfo(confirmerId) }}
                     <span v-if="!serverUtil.isEmptyOrHiddenDid(confirmerId)">
-                      <a :href="`/did/${confirmerId}`" class="text-blue-500">
+                      <router-link
+                        :to="{
+                          path: '/did/' + encodeURIComponent(confirmerId),
+                        }"
+                        class="text-blue-500"
+                      >
                         <font-awesome
                           icon="arrow-up-right-from-square"
                           class="fa-fw"
                         />
-                      </a>
+                      </router-link>
                     </span>
                   </div>
                 </div>
@@ -329,12 +334,17 @@
                   <div class="text-sm">
                     {{ didInfo(confsVisibleTo) }}
                     <span v-if="!serverUtil.isEmptyOrHiddenDid(confsVisibleTo)">
-                      <a :href="`/did/${confsVisibleTo}`" class="text-blue-500">
+                      <router-link
+                        :to="{
+                          path: '/did/' + encodeURIComponent(confsVisibleTo),
+                        }"
+                        class="text-blue-500"
+                      >
                         <font-awesome
                           icon="arrow-up-right-from-square"
                           class="fa-fw"
                         />
-                      </a>
+                      </router-link>
                     </span>
                   </div>
                 </div>
@@ -443,12 +453,17 @@
                   <span>
                     {{ didInfo(visDid) }}
                     <span v-if="!serverUtil.isEmptyOrHiddenDid(visDid)">
-                      <a :href="`/did/${visDid}`" class="text-blue-500">
+                      <router-link
+                        :to="{
+                          path: '/did/' + encodeURIComponent(visDid),
+                        }"
+                        class="text-blue-500"
+                      >
                         <font-awesome
                           icon="arrow-up-right-from-square"
                           class="fa-fw"
                         />
-                      </a>
+                      </router-link>
                     </span>
                     <span v-if="veriClaim.publicUrls?.[visDid]"
                       >, found at&nbsp;<a
@@ -925,7 +940,7 @@ export default class ClaimView extends Vue {
       this.apiServer,
       this.axios,
     );
-    if (result.type === "success") {
+    if (result.success) {
       this.$notify(
         {
           group: "alert",
diff --git a/src/views/ConfirmGiftView.vue b/src/views/ConfirmGiftView.vue
index 63c4288fe2..e58882acad 100644
--- a/src/views/ConfirmGiftView.vue
+++ b/src/views/ConfirmGiftView.vue
@@ -407,14 +407,14 @@
           </a>
         </div>
         <div class="mt-2 ml-2">
-          <a
+          <router-link
             v-if="isRegistered"
             class="text-blue-500 cursor-pointer"
-            :href="urlForNewGive"
+            :to="urlForNewGive"
           >
             <font-awesome icon="file-lines" />
             Record a Give Similar to the Original
-          </a>
+          </router-link>
         </div>
       </div>
     </div>
diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue
index 0aaacc988f..bd7b9f7962 100644
--- a/src/views/ProjectViewView.vue
+++ b/src/views/ProjectViewView.vue
@@ -52,16 +52,24 @@
                   icon="user"
                   class="fa-fw text-slate-400"
                 ></font-awesome>
-                {{ issuerInfoObject?.displayName }}
-                <span v-if="!serverUtil.isEmptyOrHiddenDid(issuer)">
-                  <a :href="`/did/${issuer}`" class="text-blue-500">
+                <span class="truncate inline-block max-w-[calc(100%-2rem)]">
+                  {{ issuerInfoObject?.displayName }}
+                </span>
+                <span class="inline-flex items-center">
+                  <router-link
+                    :to="{
+                      path: '/did/' + encodeURIComponent(issuer),
+                    }"
+                    class="text-blue-500 ml-1"
+                    title="See more about this person"
+                  >
                     <font-awesome
                       icon="arrow-up-right-from-square"
                       class="fa-fw"
                     />
-                  </a>
+                  </router-link>
                 </span>
-                <span v-else-if="serverUtil.isHiddenDid(issuer)">
+                <span v-if="serverUtil.isHiddenDid(issuer)" class="ml-1">
                   <font-awesome
                     icon="info-circle"
                     class="fa-fw text-blue-500 cursor-pointer"