diff --git a/pkg/analyzer/authentication.go b/pkg/analyzer/authentication.go
index 310c8f6..14333bd 100644
--- a/pkg/analyzer/authentication.go
+++ b/pkg/analyzer/authentication.go
@@ -153,14 +153,7 @@ func (a *AuthenticationAnalyzer) parseSPFResult(part string) *api.AuthResult {
 		}
 	}
 
-	// Extract details
-	if idx := strings.Index(part, "("); idx != -1 {
-		endIdx := strings.Index(part[idx:], ")")
-		if endIdx != -1 {
-			details := strings.TrimSpace(part[idx+1 : idx+endIdx])
-			result.Details = &details
-		}
-	}
+	result.Details = api.PtrTo(strings.TrimPrefix(part, "spf="))
 
 	return result
 }
diff --git a/web/src/lib/components/AuthenticationCard.svelte b/web/src/lib/components/AuthenticationCard.svelte
index ec043cf..0ac750a 100644
--- a/web/src/lib/components/AuthenticationCard.svelte
+++ b/web/src/lib/components/AuthenticationCard.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
-    import type { Authentication, ReportSummary } from "$lib/api/types.gen";
+    import type { Authentication, DNSResults, ReportSummary } from "$lib/api/types.gen";
 
     interface Props {
         authentication: Authentication;
         authenticationScore?: number;
+        dnsResults?: DNSResults;
     }
 
-    let { authentication, authenticationScore }: Props = $props();
+    let { authentication, authenticationScore, dnsResults }: Props = $props();
 
     function getAuthResultClass(result: string): string {
         switch (result) {
@@ -109,13 +110,19 @@
                                 {authentication.dkim[0].result}
                             </span>
                             {#if authentication.dkim[0].domain}
-                                <div class="text-muted small">{authentication.dkim[0].domain}</div>
+                                <div class="small">
+                                    <strong>Domain:</strong>
+                                    <span class="text-muted">{authentication.dkim[0].domain}</span>
+                                </div>
                             {/if}
                             {#if authentication.dkim[0].selector}
-                                <div class="text-muted small">Selector: {authentication.dkim[0].selector}</div>
+                                <div class="small">
+                                    <strong>Selector:</strong>
+                                    <span class="text-muted">{authentication.dkim[0].selector}</span>
+                                </div>
                             {/if}
-                            {#if authentication.dkim.details}
-                                <pre class="p-2 mb-0 bg-light text-muted small" style="white-space: pre-wrap">{authentication.dkim.details}</pre>
+                            {#if authentication.dkim[0].details}
+                                <pre class="p-2 mb-0 bg-light text-muted small" style="white-space: pre-wrap">{authentication.dkim[0].details}</pre>
                             {/if}
                         </div>
                     {:else}
@@ -141,6 +148,32 @@
                             <span class="text-uppercase ms-2 {getAuthResultClass(authentication.dmarc.result)}">
                                 {authentication.dmarc.result}
                             </span>
+                            {#if authentication.dmarc.domain}
+                                <div class="small">
+                                    <strong>Domain:</strong>
+                                    <span class="text-muted">{authentication.dmarc.domain}</span>
+                                </div>
+                            {/if}
+                            {#snippet DMARCPolicy(policy)}
+                                <div class="small">
+                                    <strong>Policy:</strong>
+                                    <span
+                                        class="fw-bold"
+                                        class:text-success={policy == "reject"}
+                                        class:text-warning={policy == "quarantine"}
+                                        class:text-danger={policy == "none"}
+                                        class:bg-warning={policy != "none" && policy != "quarantine" && policy != "reject"}
+                                    >
+                                        {policy}
+                                    </span>
+                                </div>
+                            {/snippet}
+                            {#if authentication.dmarc.details.indexOf("policy.published-domain-policy=") > 0}
+                                {@const policy = authentication.dmarc.details.replace(/^.*policy.published-domain-policy=([^\s]+).*$/, "$1")}
+                                {@render DMARCPolicy(policy)}
+                            {:else if authentication.dmarc.domain}
+                                {@render DMARCPolicy(dnsResults.dmarc_record.policy)}
+                            {/if}
                             {#if authentication.dmarc.details}
                                 <pre class="p-2 mb-0 bg-light text-muted small" style="white-space: pre-wrap">{authentication.dmarc.details}</pre>
                             {/if}
@@ -161,7 +194,7 @@
             <!-- BIMI (Optional) -->
             <div class="col mb-3">
                 <div class="d-flex align-items-start">
-                    {#if authentication.bimi}
+                    {#if authentication.bimi && authentication.bimi.result != "none"}
                         <i class="bi {getAuthResultIcon(authentication.bimi.result)} {getAuthResultClass(authentication.bimi.result)} me-2 fs-5"></i>
                         <div>
                             <strong>BIMI</strong>
@@ -172,6 +205,18 @@
                                 <pre class="p-2 mb-0 bg-light text-muted small" style="white-space: pre-wrap">{authentication.bimi.details}</pre>
                             {/if}
                         </div>
+                    {:else if authentication.bimi && authentication.bimi.result == "none"}
+                        <i class="bi bi-exclamation-circle-fill text-warning me-2 fs-5"></i>
+                        <div>
+                            <strong>BIMI</strong>
+                            <span class="text-uppercase ms-2 text-warning">
+                                NONE
+                            </span>
+                            <div class="text-muted small">Brand Indicators for Message Identification</div>
+                            {#if authentication.bimi.details}
+                                <pre class="p-2 mb-0 bg-light text-muted small" style="white-space: pre-wrap">{authentication.bimi.details}</pre>
+                            {/if}
+                        </div>
                     {:else}
                         <i class="bi bi-info-circle text-muted me-2 fs-5"></i>
                         <div>
diff --git a/web/src/routes/test/[test]/+page.svelte b/web/src/routes/test/[test]/+page.svelte
index 3af06f9..19d23b8 100644
--- a/web/src/routes/test/[test]/+page.svelte
+++ b/web/src/routes/test/[test]/+page.svelte
@@ -160,6 +160,7 @@
                         <AuthenticationCard
                             authentication={report.authentication}
                             authenticationScore={report.summary?.authentication_score}
+                            dnsResults={report.dns_results}
                         />
                     </div>
                 </div>