diff --git a/src/components/EntitySummaryButton.vue b/src/components/EntitySummaryButton.vue
index 50f25078..96dae340 100644
--- a/src/components/EntitySummaryButton.vue
+++ b/src/components/EntitySummaryButton.vue
@@ -42,8 +42,8 @@ computed CSS properties * * @author Matthew Raymer */
       <p class="text-xs text-slate-500 leading-1 -mb-1 uppercase">
         {{ label }}
       </p>
-      <h3 class="font-semibold truncate">
-        {{ entity?.name || "Unnamed" }}
+      <h3 :class="nameClasses">
+        {{ displayName }}
       </h3>
     </div>
 
@@ -138,6 +138,38 @@ export default class EntitySummaryButton extends Vue {
     return this.editable ? "text-blue-500" : "text-slate-400";
   }
 
+  /**
+   * Computed CSS classes for the entity name
+   */
+  get nameClasses(): string {
+    const baseClasses = "font-semibold truncate";
+    
+    // Add italic styling for special "Unnamed" or entities without set names
+    if (!this.entity?.name || this.entity?.did === "") {
+      return `${baseClasses} italic text-slate-500`;
+    }
+    
+    return baseClasses;
+  }
+
+  /**
+   * Computed display name for the entity
+   */
+  get displayName(): string {
+    // If the entity has a set name, use that name
+    if (this.entity?.name) {
+      return this.entity.name;
+    }
+    
+    // If the entity is the special "Unnamed", use "Unnamed"
+    if (this.entity?.did === "") {
+      return "Unnamed";
+    }
+    
+    // If the entity does not have a set name, but is not the special "Unnamed", use their DID
+    return this.entity?.did;
+  }
+
   /**
    * Handle click event - only call function prop if editable
    * Allows parent to control edit behavior and validation
diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue
index a2ee61df..6979db74 100644
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -226,14 +226,7 @@ export default class GiftedDialog extends Vue {
 
       this.allMyDids = await retrieveAccountDids();
 
-      if (this.giver && !this.giver.name) {
-        this.giver.name = didInfo(
-          this.giver.did,
-          this.activeDid,
-          this.allMyDids,
-          this.allContacts,
-        );
-      }
+
 
       if (
         this.giverEntityType === "project" ||
@@ -457,7 +450,7 @@ export default class GiftedDialog extends Vue {
     if (contact) {
       this.giver = {
         did: contact.did,
-        name: contact.name || contact.did,
+        name: contact.name,
       };
     } else {
       // Only set to "Unnamed" if no giver is currently set
@@ -519,7 +512,7 @@ export default class GiftedDialog extends Vue {
     if (contact) {
       this.receiver = {
         did: contact.did,
-        name: contact.name || contact.did,
+        name: contact.name,
       };
     } else {
       // Only set to "Unnamed" if no receiver is currently set
diff --git a/src/components/PersonCard.vue b/src/components/PersonCard.vue
index 1f3bf595..2c6f439a 100644
--- a/src/components/PersonCard.vue
+++ b/src/components/PersonCard.vue
@@ -25,7 +25,7 @@ conflict detection. * * @author Matthew Raymer */
     </div>
 
     <h3 :class="nameClasses">
-      {{ person.name || person.did || "Unnamed" }}
+      {{ displayName }}
     </h3>
   </li>
 </template>
@@ -98,9 +98,27 @@ export default class PersonCard extends Vue {
       return `${baseClasses} text-slate-400`;
     }
 
+    // Add italic styling for entities without set names
+    if (!this.person.name) {
+      return `${baseClasses} italic text-slate-500`;
+    }
+
     return baseClasses;
   }
 
+  /**
+   * Computed display name for the person
+   */
+  get displayName(): string {
+    // If the entity has a set name, use that name
+    if (this.person.name) {
+      return this.person.name;
+    }
+    
+    // If the entity does not have a set name
+    return this.person.did;
+  }
+
   /**
    * Handle card click - emit if selectable and not conflicted, show warning if conflicted
    */
@@ -114,7 +132,7 @@ export default class PersonCard extends Vue {
           group: "alert",
           type: "warning",
           title: "Cannot Select",
-          text: `You cannot select "${this.person.name || this.person.did || "Unnamed"}" because they are already selected as the ${this.conflictContext}.`,
+          text: `You cannot select "${this.displayName}" because they are already selected as the ${this.conflictContext}.`,
         },
         3000,
       );
diff --git a/src/views/ContactGiftingView.vue b/src/views/ContactGiftingView.vue
index 9ebee31a..2534f551 100644
--- a/src/views/ContactGiftingView.vue
+++ b/src/views/ContactGiftingView.vue
@@ -21,8 +21,8 @@
       <li v-if="shouldShowYouEntity" class="border-b border-slate-300 py-3">
         <h2 class="text-base flex gap-4 items-center">
           <span class="grow flex gap-2 items-center font-medium">
-            <font-awesome icon="hand" class="text-blue-500 text-4xl" />
-            <span class="text-blue-500">You</span>
+            <font-awesome icon="hand" class="text-blue-500 text-4xl shrink-0" />
+            <span class="text-ellipsis overflow-hidden text-blue-500">You</span>
           </span>
           <span class="text-right">
             <button
@@ -40,9 +40,9 @@
           <span class="grow flex gap-2 items-center font-medium">
             <font-awesome
               icon="circle-question"
-              class="text-slate-400 text-4xl"
+              class="text-slate-400 text-4xl shrink-0"
             />
-            <span class="italic text-slate-400">(Unnamed/Unknown)</span>
+            <span class="text-ellipsis overflow-hidden italic text-slate-500">(Unnamed/Unknown)</span>
           </span>
           <span class="text-right">
             <button
@@ -61,14 +61,14 @@
         class="border-b border-slate-300 py-3"
       >
         <h2 class="text-base flex gap-4 items-center">
-          <span class="grow flex gap-2 items-center font-medium">
+          <span class="grow flex gap-2 items-center font-medium overflow-hidden">
             <EntityIcon
               :contact="contact"
               :icon-size="34"
-              class="inline-block align-middle border border-slate-300 rounded-full overflow-hidden"
+              class="inline-block align-middle border border-slate-300 rounded-full overflow-hidden shrink-0"
             />
-            <span v-if="contact.name">{{ contact.name }}</span>
-            <span v-else class="italic text-slate-400">(No name)</span>
+            <span v-if="contact.name" class="text-ellipsis overflow-hidden">{{ contact.name }}</span>
+            <span v-else class="text-ellipsis overflow-hidden italic text-slate-500">{{ contact.did }}</span>
           </span>
           <span class="text-right">
             <button
@@ -208,154 +208,136 @@ export default class ContactGiftingView extends Vue {
   }
 
   openDialog(contact?: GiverReceiverInputInfo | "Unnamed" | "You") {
-    if (contact === "Unnamed") {
-      // Special case: Handle "Unnamed" contacts for both givers and recipients
-      let recipient: GiverReceiverInputInfo;
-      let giver: GiverReceiverInputInfo | undefined;
+    // Determine the selected entity based on contact type
+    const selectedEntity = this.createEntityFromContact(contact);
 
-      if (this.stepType === "giver") {
-        // We're selecting a giver, so preserve the existing recipient from context
-        if (this.recipientEntityType === "project") {
-          recipient = {
-            did: this.recipientProjectHandleId,
-            name: this.recipientProjectName,
-            image: this.recipientProjectImage,
-            handleId: this.recipientProjectHandleId,
-          };
-        } else {
-          // Preserve the existing recipient from context
-          if (this.recipientDid === this.activeDid) {
-            // Recipient was "You"
-            recipient = { did: this.activeDid, name: "You" };
-          } else if (this.recipientDid) {
-            // Recipient was a regular contact
-            recipient = {
-              did: this.recipientDid,
-              name: this.recipientProjectName || "Someone",
-            };
-          } else {
-            // Fallback to "You" if no recipient was previously selected
-            recipient = { did: this.activeDid, name: "You" };
-          }
-        }
-        giver = undefined; // Will be set to "Unnamed" in GiftedDialog
-      } else {
-        // We're selecting a recipient, so recipient is "Unnamed" and giver is preserved from context
-        recipient = { did: "", name: "Unnamed" };
+    // Create giver and recipient based on step type and selected entity
+    const { giver, recipient } = this.createGiverAndRecipient(selectedEntity);
 
-        // Preserve the existing giver from the context
-        if (this.giverEntityType === "project") {
-          giver = {
-            did: this.giverProjectHandleId,
-            name: this.giverProjectName,
-            image: this.giverProjectImage,
-            handleId: this.giverProjectHandleId,
-          };
-        } else if (this.giverDid) {
-          giver = {
-            did: this.giverDid,
-            name: this.giverProjectName || "Someone",
-          };
-        } else {
-          giver = { did: this.activeDid, name: "You" };
-        }
-      }
+    // Open the dialog
+    (this.$refs.giftedDialog as GiftedDialog).open(
+      giver,
+      recipient,
+      this.offerId,
+      this.prompt,
+      this.description,
+      this.amountInput,
+      this.unitCode,
+    );
 
-      (this.$refs.giftedDialog as GiftedDialog).open(
-        giver,
-        recipient,
-        this.offerId,
-        this.prompt,
-        this.description,
-        this.amountInput,
-        this.unitCode,
-      );
+    // Move to Step 2 - entities are already set by the open() call
+    (this.$refs.giftedDialog as GiftedDialog).moveToStep2();
+  }
 
-      // Move to Step 2 - entities are already set by the open() call
-      (this.$refs.giftedDialog as GiftedDialog).moveToStep2();
-    } else {
-      // Regular case: contact is a GiverReceiverInputInfo
-      let giver: GiverReceiverInputInfo;
-      let recipient: GiverReceiverInputInfo;
+  /**
+   * Creates an entity object from the contact parameter
+   */
+  private createEntityFromContact(
+    contact?: GiverReceiverInputInfo | "Unnamed" | "You",
+  ): GiverReceiverInputInfo | undefined {
+    if (contact === "You") {
+      return { did: this.activeDid, name: "You" };
+    } else if (contact === "Unnamed") {
+      return { did: "", name: "Unnamed" };
+    } else if (contact) {
+      // Create a copy of the contact to avoid modifying the original
+      return { ...contact };
+    }
+    return undefined;
+  }
 
-      if (this.stepType === "giver") {
-        // We're selecting a giver, so the contact becomes the giver
-        giver = contact as GiverReceiverInputInfo; // Safe because we know contact is not "Unnamed" or undefined
+  /**
+   * Creates giver and recipient objects based on step type and selected entity
+   */
+  private createGiverAndRecipient(selectedEntity?: GiverReceiverInputInfo): {
+    giver: GiverReceiverInputInfo | undefined;
+    recipient: GiverReceiverInputInfo;
+  } {
+    if (this.stepType === "giver") {
+      // We're selecting a giver, so the selected entity becomes the giver
+      const giver = selectedEntity;
+      const recipient = this.createRecipientFromContext();
+      return { giver, recipient };
+    } else {
+      // We're selecting a recipient, so the selected entity becomes the recipient
+      const recipient = selectedEntity || { did: "", name: "Unnamed" };
+      const giver = this.createGiverFromContext();
+      return { giver, recipient };
+    }
+  }
 
-        // Preserve the existing recipient from the context
-        if (this.recipientEntityType === "project") {
-          recipient = {
-            did: this.recipientProjectHandleId,
-            name: this.recipientProjectName,
-            image: this.recipientProjectImage,
-            handleId: this.recipientProjectHandleId,
-          };
-        } else {
-          // Check if the preserved recipient was "You" or a regular contact
-          if (this.recipientDid === this.activeDid) {
-            // Recipient was "You"
-            recipient = { did: this.activeDid, name: "You" };
-          } else if (this.recipientDid) {
-            // Recipient was a regular contact
-            recipient = {
-              did: this.recipientDid,
-              name: this.recipientProjectName || "Someone",
-            };
-          } else {
-            // Fallback to "Unnamed"
-            recipient = { did: "", name: "Unnamed" };
-          }
-        }
+  /**
+   * Creates recipient object from context (preserves existing recipient)
+   */
+  private createRecipientFromContext(): GiverReceiverInputInfo {
+    if (this.recipientEntityType === "project") {
+      return {
+        did: this.recipientProjectHandleId,
+        name: this.recipientProjectName,
+        image: this.recipientProjectImage,
+        handleId: this.recipientProjectHandleId,
+      };
+    } else {
+      if (this.recipientDid === this.activeDid) {
+        return { did: this.activeDid, name: "You" };
+      } else if (this.recipientDid) {
+        return {
+          did: this.recipientDid,
+          name: this.recipientProjectName,
+        };
       } else {
-        // We're selecting a recipient, so the contact becomes the recipient
-        recipient = contact as GiverReceiverInputInfo; // Safe because we know contact is not "Unnamed" or undefined
-
-        // Preserve the existing giver from the context
-        if (this.giverEntityType === "project") {
-          giver = {
-            did: this.giverProjectHandleId,
-            name: this.giverProjectName,
-            image: this.giverProjectImage,
-            handleId: this.giverProjectHandleId,
-          };
-        } else {
-          // Check if the preserved giver was "You" or a regular contact
-          if (this.giverDid === this.activeDid) {
-            // Giver was "You"
-            giver = { did: this.activeDid, name: "You" };
-          } else if (this.giverDid) {
-            // Giver was a regular contact
-            giver = {
-              did: this.giverDid,
-              name: this.giverProjectName || "Someone",
-            };
-          } else {
-            // Fallback to "Unnamed"
-            giver = { did: "", name: "Unnamed" };
-          }
-        }
+        return { did: "", name: "Unnamed" };
       }
+    }
+  }
 
-      (this.$refs.giftedDialog as GiftedDialog).open(
-        giver,
-        recipient,
-        this.offerId,
-        this.prompt,
-        this.description,
-        this.amountInput,
-        this.unitCode,
-      );
-
-      // Move to Step 2 - entities are already set by the open() call
-      (this.$refs.giftedDialog as GiftedDialog).moveToStep2();
+  /**
+   * Creates giver object from context (preserves existing giver)
+   */
+  private createGiverFromContext(): GiverReceiverInputInfo {
+    if (this.giverEntityType === "project") {
+      return {
+        did: this.giverProjectHandleId,
+        name: this.giverProjectName,
+        image: this.giverProjectImage,
+        handleId: this.giverProjectHandleId,
+      };
+    } else {
+      if (this.giverDid === this.activeDid) {
+        return { did: this.activeDid, name: "You" };
+      } else if (this.giverDid) {
+        return {
+          did: this.giverDid,
+          name: this.giverProjectName,
+        };
+      } else {
+        return { did: "", name: "Unnamed" };
+      }
     }
   }
 
   get shouldShowYouEntity(): boolean {
-    return (
-      this.stepType === "recipient" ||
-      (this.stepType === "giver" && this.isFromProjectView)
-    );
+    if (this.stepType === "giver") {
+      // When selecting a giver, show "You" if the current recipient is not "You"
+      // This prevents selecting yourself as both giver and recipient
+      if (this.recipientEntityType === "project") {
+        // If recipient is a project, we can select "You" as giver
+        return true;
+      } else {
+        // If recipient is a person, check if it's not "You"
+        return this.recipientDid !== this.activeDid;
+      }
+    } else {
+      // When selecting a recipient, show "You" if the current giver is not "You"
+      // This prevents selecting yourself as both giver and recipient
+      if (this.giverEntityType === "project") {
+        // If giver is a project, we can select "You" as recipient
+        return true;
+      } else {
+        // If giver is a person, check if it's not "You"
+        return this.giverDid !== this.activeDid;
+      }
+    }
   }
 }
 </script>