diff --git a/PostFundManagement.ConsoleUI/src/pages/GovernancePage.tsx b/PostFundManagement.ConsoleUI/src/pages/GovernancePage.tsx
index 5af6179..9ba3a9d 100644
--- a/PostFundManagement.ConsoleUI/src/pages/GovernancePage.tsx
+++ b/PostFundManagement.ConsoleUI/src/pages/GovernancePage.tsx
@@ -11,6 +11,7 @@ import {
   Edit2,
   Mail,
   Shield,
+  ShieldCheck,
   Layers,
   ChevronRight,
   Search,
@@ -24,6 +25,7 @@ import {
   UserPlus,
   ChevronDown,
   ChevronUp,
+  CheckCircle,
   CheckCircle2,
   Loader2,
   Lock,
diff --git a/PostFundManagement.PartnerUI/src/components/dashboard/DashboardPage.tsx b/PostFundManagement.PartnerUI/src/components/dashboard/DashboardPage.tsx
index 0b0b31f..0fc736c 100644
--- a/PostFundManagement.PartnerUI/src/components/dashboard/DashboardPage.tsx
+++ b/PostFundManagement.PartnerUI/src/components/dashboard/DashboardPage.tsx
@@ -1527,7 +1527,7 @@ export function DashboardPage() {
                                 </span>
                               )}
                             </div>
-                            <p className="text-xs text-[#9A95B0] mt-1 line-clamp-2">{stripMarkdown(msg.message)}</p>
+                            <p className="text-xs text-[#9A95B0] mt-1 line-clamp-2">{stripMarkdown(msg.message || '')}</p>
                           </div>
                         </div>
                         <span className="text-xs text-[#9A95B0]/70 shrink-0">
@@ -2171,7 +2171,7 @@ export function DashboardPage() {
               <MessageViewer
                 content={selectedNotification.message || ''}
                 platform={selectedNotification.platform}
-                subject={selectedNotification.subject}
+                subject={selectedNotification.subject || undefined}
               />
             </div>