diff --git a/src/components/AmountInput.vue b/src/components/AmountInput.vue
index a9ffc784..c7f01b61 100644
--- a/src/components/AmountInput.vue
+++ b/src/components/AmountInput.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue, Watch } from "vue-facing-decorator";
+import { Component, Prop, Vue, Watch, Emit } from "vue-facing-decorator";
 
 /**
  * AmountInput - Numeric input with increment/decrement controls
@@ -148,9 +148,17 @@ export default class AmountInput extends Vue {
   private updateValue(newValue: number): void {
     if (newValue !== this.value) {
       this.displayValue = newValue.toString();
-      this.$emit("update:value", newValue);
+      this.emitUpdateValue(newValue);
     }
   }
+
+  /**
+   * Emit update:value event
+   */
+  @Emit("update:value")
+  emitUpdateValue(value: number): number {
+    return value;
+  }
 }
 </script>
 
diff --git a/src/components/EntityGrid.vue b/src/components/EntityGrid.vue
index 80cc2a14..aec9b577 100644
--- a/src/components/EntityGrid.vue
+++ b/src/components/EntityGrid.vue
@@ -75,24 +75,23 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from "vue-facing-decorator";
+import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
 import PersonCard from "./PersonCard.vue";
 import ProjectCard from "./ProjectCard.vue";
 import SpecialEntityCard from "./SpecialEntityCard.vue";
 import ShowAllCard from "./ShowAllCard.vue";
-import { Contact } from "@/interfaces/contact";
-import { PlanData } from "@/interfaces/plan-data";
+import { Contact } from "../db/tables/contacts";
+import { PlanData } from "../interfaces/records";
 
 /**
- * EntityGrid - Unified grid layout for entity selection
+ * EntityGrid - Unified grid layout for displaying people or projects
  * 
  * Features:
- * - Responsive grid layout for people or projects
- * - Special entity handling (You, Unnamed)
+ * - Responsive grid layout for people/projects
+ * - Special entity integration (You, Unnamed)
  * - Conflict detection integration
  * - Empty state messaging
  * - Show All navigation
- * - Configurable display limits
  * - Event delegation for entity selection
  */
 @Component({
@@ -101,7 +100,7 @@ import { PlanData } from "@/interfaces/plan-data";
     ProjectCard,
     SpecialEntityCard,
     ShowAllCard,
-  },
+  }
 })
 export default class EntityGrid extends Vue {
   /** Type of entities to display */
@@ -225,7 +224,7 @@ export default class EntityGrid extends Vue {
    * Handle person selection from PersonCard
    */
   handlePersonSelected(person: Contact): void {
-    this.$emit("entity-selected", {
+    this.emitEntitySelected({
       type: "person",
       data: person,
     });
@@ -235,7 +234,7 @@ export default class EntityGrid extends Vue {
    * Handle project selection from ProjectCard
    */
   handleProjectSelected(project: PlanData): void {
-    this.$emit("entity-selected", {
+    this.emitEntitySelected({
       type: "project",
       data: project,
     });
@@ -245,12 +244,19 @@ export default class EntityGrid extends Vue {
    * Handle special entity selection from SpecialEntityCard
    */
   handleEntitySelected(event: { type: string; entityType: string; data: any }): void {
-    this.$emit("entity-selected", {
+    this.emitEntitySelected({
       type: "special",
       entityType: event.entityType,
       data: event.data,
     });
   }
+
+  // Emit methods using @Emit decorator
+
+  @Emit("entity-selected")
+  emitEntitySelected(data: any): any {
+    return data;
+  }
 }
 </script>
 
diff --git a/src/components/EntitySelectionStep.vue b/src/components/EntitySelectionStep.vue
index 54c57219..fd8da6c6 100644
--- a/src/components/EntitySelectionStep.vue
+++ b/src/components/EntitySelectionStep.vue
@@ -37,10 +37,10 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from "vue-facing-decorator";
+import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
 import EntityGrid from "./EntityGrid.vue";
-import { Contact } from "@/interfaces/contact";
-import { PlanData } from "@/interfaces/plan-data";
+import { Contact } from "../db/tables/contacts";
+import { PlanData } from "../interfaces/records";
 
 /**
  * Entity selection event data structure
@@ -66,7 +66,7 @@ interface EntitySelectionEvent {
 @Component({
   components: {
     EntityGrid,
-  },
+  }
 })
 export default class EntitySelectionStep extends Vue {
   /** Type of step: 'giver' or 'recipient' */
@@ -215,7 +215,7 @@ export default class EntitySelectionStep extends Vue {
    * Handle entity selection from EntityGrid
    */
   handleEntitySelected(event: EntitySelectionEvent): void {
-    this.$emit("entity-selected", {
+    this.emitEntitySelected({
       stepType: this.stepType,
       ...event,
     });
@@ -225,7 +225,19 @@ export default class EntitySelectionStep extends Vue {
    * Handle cancel button click
    */
   handleCancel(): void {
-    this.$emit("cancel");
+    this.emitCancel();
+  }
+
+  // Emit methods using @Emit decorator
+
+  @Emit("entity-selected")
+  emitEntitySelected(data: any): any {
+    return data;
+  }
+
+  @Emit("cancel")
+  emitCancel(): void {
+    // No return value needed
   }
 }
 </script>
diff --git a/src/components/EntitySummaryButton.vue b/src/components/EntitySummaryButton.vue
index d7a8ee8e..6e25389b 100644
--- a/src/components/EntitySummaryButton.vue
+++ b/src/components/EntitySummaryButton.vue
@@ -58,10 +58,10 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from "vue-facing-decorator";
+import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
 import EntityIcon from "./EntityIcon.vue";
 import ProjectIcon from "./ProjectIcon.vue";
-import { Contact } from "@/interfaces/contact";
+import { Contact } from "../db/tables/contacts";
 
 /**
  * Entity interface for both person and project entities
@@ -87,7 +87,7 @@ interface EntityData {
   components: {
     EntityIcon,
     ProjectIcon,
-  },
+  }
 })
 export default class EntitySummaryButton extends Vue {
   /** Entity data to display */
@@ -118,12 +118,19 @@ export default class EntitySummaryButton extends Vue {
    */
   handleClick(): void {
     if (this.editable) {
-      this.$emit("edit-requested", {
+      this.emitEditRequested({
         entityType: this.entityType,
         entity: this.entity,
       });
     }
   }
+
+  // Emit methods using @Emit decorator
+
+  @Emit("edit-requested")
+  emitEditRequested(data: any): any {
+    return data;
+  }
 }
 </script>
 
diff --git a/src/components/GiftDetailsStep.vue b/src/components/GiftDetailsStep.vue
index b6ab6330..b3d1299f 100644
--- a/src/components/GiftDetailsStep.vue
+++ b/src/components/GiftDetailsStep.vue
@@ -109,7 +109,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue, Watch } from "vue-facing-decorator";
+import { Component, Prop, Vue, Watch, Emit } from "vue-facing-decorator";
 import EntitySummaryButton from "./EntitySummaryButton.vue";
 import AmountInput from "./AmountInput.vue";
 import { RouteLocationRaw } from "vue-router";
@@ -141,7 +141,7 @@ interface EntityData {
   components: {
     EntitySummaryButton,
     AmountInput,
-  },
+  }
 })
 export default class GiftDetailsStep extends Vue {
   /** Giver entity data */
@@ -299,7 +299,7 @@ export default class GiftDetailsStep extends Vue {
    * Handle description input changes
    */
   handleDescriptionChange(): void {
-    this.$emit("update:description", this.localDescription);
+    this.emitUpdateDescription(this.localDescription);
   }
 
   /**
@@ -307,21 +307,21 @@ export default class GiftDetailsStep extends Vue {
    */
   handleAmountChange(newAmount: number): void {
     this.localAmount = newAmount;
-    this.$emit("update:amount", newAmount);
+    this.emitUpdateAmount(newAmount);
   }
 
   /**
    * Handle unit code selection changes
    */
   handleUnitCodeChange(): void {
-    this.$emit("update:unitCode", this.localUnitCode);
+    this.emitUpdateUnitCode(this.localUnitCode);
   }
 
   /**
    * Handle giver edit request
    */
   handleEditGiver(): void {
-    this.$emit("edit-entity", {
+    this.emitEditEntity({
       entityType: "giver",
       currentEntity: this.giver,
     });
@@ -331,7 +331,7 @@ export default class GiftDetailsStep extends Vue {
    * Handle recipient edit request
    */
   handleEditRecipient(): void {
-    this.$emit("edit-entity", {
+    this.emitEditEntity({
       entityType: "recipient",
       currentEntity: this.receiver,
     });
@@ -341,7 +341,7 @@ export default class GiftDetailsStep extends Vue {
    * Handle explain data info click
    */
   handleExplainData(): void {
-    this.$emit("explain-data");
+    this.emitExplainData();
   }
 
   /**
@@ -349,7 +349,7 @@ export default class GiftDetailsStep extends Vue {
    */
   handleSubmit(): void {
     if (!this.hasConflict) {
-      this.$emit("submit", {
+      this.emitSubmit({
         description: this.localDescription,
         amount: this.localAmount,
         unitCode: this.localUnitCode,
@@ -361,7 +361,44 @@ export default class GiftDetailsStep extends Vue {
    * Handle cancel button click
    */
   handleCancel(): void {
-    this.$emit("cancel");
+    this.emitCancel();
+  }
+
+  // Emit methods using @Emit decorator
+
+  @Emit("update:description")
+  emitUpdateDescription(description: string): string {
+    return description;
+  }
+
+  @Emit("update:amount")
+  emitUpdateAmount(amount: number): number {
+    return amount;
+  }
+
+  @Emit("update:unitCode")
+  emitUpdateUnitCode(unitCode: string): string {
+    return unitCode;
+  }
+
+  @Emit("edit-entity")
+  emitEditEntity(data: any): any {
+    return data;
+  }
+
+  @Emit("explain-data")
+  emitExplainData(): void {
+    // No return value needed
+  }
+
+  @Emit("submit")
+  emitSubmit(data: any): any {
+    return data;
+  }
+
+  @Emit("cancel")
+  emitCancel(): void {
+    // No return value needed
   }
 }
 </script>
diff --git a/src/components/PersonCard.vue b/src/components/PersonCard.vue
index d0d25c50..488e5772 100644
--- a/src/components/PersonCard.vue
+++ b/src/components/PersonCard.vue
@@ -42,26 +42,27 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from "vue-facing-decorator";
+import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
 import EntityIcon from "./EntityIcon.vue";
-import { Contact } from "@/interfaces/contact";
+import { Contact } from "../db/tables/contacts";
 
 /**
- * PersonCard - Displays a person entity with selection capability
+ * PersonCard - Individual person display with selection capability
  * 
  * Features:
- * - Shows person avatar using EntityIcon
- * - Handles selection states (selectable, conflicted, disabled)
- * - Displays time icon overlay for contacts
+ * - Person avatar using EntityIcon
+ * - Selection states (selectable, conflicted, disabled)
+ * - Time icon overlay for contacts
+ * - Click event handling
  * - Emits click events for parent handling
  */
 @Component({
   components: {
     EntityIcon,
-  },
+  }
 })
 export default class PersonCard extends Vue {
-  /** Person entity to display */
+  /** Contact data to display */
   @Prop({ required: true })
   person!: Contact;
 
@@ -69,25 +70,22 @@ export default class PersonCard extends Vue {
   @Prop({ default: true })
   selectable!: boolean;
 
-  /** Whether selecting this person would create a conflict */
+  /** Whether this person would create a conflict if selected */
   @Prop({ default: false })
   conflicted!: boolean;
 
-  /** Whether to show the time icon overlay */
-  @Prop({ default: true })
+  /** Whether to show time icon overlay */
+  @Prop({ default: false })
   showTimeIcon!: boolean;
 
   /**
-   * Computed CSS classes for the card container
+   * Computed CSS classes for the card
    */
   get cardClasses(): string {
-    const baseClasses = "block";
-    
     if (!this.selectable || this.conflicted) {
-      return `${baseClasses} cursor-not-allowed opacity-50`;
+      return "opacity-50 cursor-not-allowed";
     }
-    
-    return `${baseClasses} cursor-pointer`;
+    return "cursor-pointer hover:bg-slate-50";
   }
 
   /**
@@ -108,9 +106,16 @@ export default class PersonCard extends Vue {
    */
   handleClick(): void {
     if (this.selectable && !this.conflicted) {
-      this.$emit("person-selected", this.person);
+      this.emitPersonSelected(this.person);
     }
   }
+
+  // Emit methods using @Emit decorator
+
+  @Emit("person-selected")
+  emitPersonSelected(person: Contact): Contact {
+    return person;
+  }
 }
 </script>
 
diff --git a/src/components/ProjectCard.vue b/src/components/ProjectCard.vue
index 21812b95..f423ded6 100644
--- a/src/components/ProjectCard.vue
+++ b/src/components/ProjectCard.vue
@@ -32,11 +32,11 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from "vue-facing-decorator";
+import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
 import ProjectIcon from "./ProjectIcon.vue";
-import { PlanData } from "@/interfaces/records";
-import { Contact } from "@/db/tables/contacts";
-import { didInfo } from "@/libs/endorserServer";
+import { PlanData } from "../interfaces/records";
+import { Contact } from "../db/tables/contacts";
+import { didInfo } from "../libs/endorserServer";
 
 /**
  * ProjectCard - Displays a project entity with selection capability
@@ -50,7 +50,7 @@ import { didInfo } from "@/libs/endorserServer";
 @Component({
   components: {
     ProjectIcon,
-  },
+  }
 })
 export default class ProjectCard extends Vue {
   /** Project entity to display */
@@ -85,7 +85,14 @@ export default class ProjectCard extends Vue {
    * Handle card click - emit project selection
    */
   handleClick(): void {
-    this.$emit("project-selected", this.project);
+    this.emitProjectSelected(this.project);
+  }
+
+  // Emit methods using @Emit decorator
+
+  @Emit("project-selected")
+  emitProjectSelected(project: PlanData): PlanData {
+    return project;
   }
 }
 </script>
diff --git a/src/components/SpecialEntityCard.vue b/src/components/SpecialEntityCard.vue
index 59850f85..59b476cc 100644
--- a/src/components/SpecialEntityCard.vue
+++ b/src/components/SpecialEntityCard.vue
@@ -23,6 +23,7 @@
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-facing-decorator";
+import { Emit } from "vue-facing-decorator";
 
 /**
  * SpecialEntityCard - Displays special entities with selection capability
@@ -34,7 +35,9 @@ import { Component, Prop, Vue } from "vue-facing-decorator";
  * - Emits selection events with entity data
  * - Configurable styling based on entity type
  */
-@Component
+@Component({
+  emits: ['entity-selected']
+})
 export default class SpecialEntityCard extends Vue {
   /** Type of special entity */
   @Prop({ required: true })
@@ -120,13 +123,20 @@ export default class SpecialEntityCard extends Vue {
    */
   handleClick(): void {
     if (this.selectable && !this.conflicted) {
-      this.$emit("entity-selected", {
+      this.emitEntitySelected({
         type: "special",
         entityType: this.entityType,
         data: this.entityData,
       });
     }
   }
+
+  // Emit methods using @Emit decorator
+
+  @Emit("entity-selected")
+  emitEntitySelected(data: any): any {
+    return data;
+  }
 }
 </script>