diff --git a/src/components/nostr/kinds/MonitorAnnouncementDetailRenderer.tsx b/src/components/nostr/kinds/MonitorAnnouncementDetailRenderer.tsx
index 116570d..df69104 100644
--- a/src/components/nostr/kinds/MonitorAnnouncementDetailRenderer.tsx
+++ b/src/components/nostr/kinds/MonitorAnnouncementDetailRenderer.tsx
@@ -1,5 +1,6 @@
 import { NostrEvent } from "@/types/nostr";
 import { Badge } from "@/components/ui/badge";
+import { Label } from "@/components/ui/label";
 import { UserName } from "../UserName";
 import {
   getMonitorFrequency,
@@ -38,10 +39,10 @@ export function Kind10166DetailRenderer({ event }: { event: NostrEvent }) {
         {/* Monitoring Frequency */}
         {frequency && !isNaN(frequency) && (
           <div className="space-y-2">
-            <h3 className="text-sm font-semibold text-muted-foreground flex items-center gap-2">
+            <Label className="flex items-center gap-2 text-muted-foreground">
               <Clock className="size-4" />
               Publishing Frequency
-            </h3>
+            </Label>
             <div className="p-3 rounded-lg bg-muted/50">
               <span className="text-lg font-semibold">
                 {formatFrequency(frequency)}
@@ -56,10 +57,10 @@ export function Kind10166DetailRenderer({ event }: { event: NostrEvent }) {
         {/* Check Types Performed */}
         {checks.length > 0 && (
           <div className="space-y-2">
-            <h3 className="text-sm font-semibold text-muted-foreground flex items-center gap-2">
+            <Label className="flex items-center gap-2 text-muted-foreground">
               <Activity className="size-4" />
               Check Types ({checks.length})
-            </h3>
+            </Label>
             <div className="flex flex-wrap gap-2">
               {checks.map((check) => (
                 <Badge key={check} variant="secondary" className="px-3 py-1.5">
@@ -73,10 +74,10 @@ export function Kind10166DetailRenderer({ event }: { event: NostrEvent }) {
         {/* Timeout Configurations */}
         {Object.keys(timeouts).length > 0 && (
           <div className="space-y-2">
-            <h3 className="text-sm font-semibold text-muted-foreground flex items-center gap-2">
+            <Label className="flex items-center gap-2 text-muted-foreground">
               <Timer className="size-4" />
               Timeout Configurations
-            </h3>
+            </Label>
             <div className="grid grid-cols-2 md:grid-cols-3 gap-3">
               {Object.entries(timeouts).map(([checkType, timeout]) => (
                 <div
@@ -98,10 +99,10 @@ export function Kind10166DetailRenderer({ event }: { event: NostrEvent }) {
         {/* Geographic Location */}
         {geohash && (
           <div className="space-y-2">
-            <h3 className="text-sm font-semibold text-muted-foreground flex items-center gap-2">
+            <Label className="flex items-center gap-2 text-muted-foreground">
               <MapPin className="size-4" />
               Location
-            </h3>
+            </Label>
             <Badge variant="outline" className="gap-2 px-3 py-1.5">
               <MapPin className="size-4" />
               <span className="font-mono">{geohash}</span>
@@ -113,9 +114,7 @@ export function Kind10166DetailRenderer({ event }: { event: NostrEvent }) {
       {/* Monitor Description */}
       {event.content && event.content.trim() !== "" && (
         <div className="space-y-2 pt-4 border-t">
-          <h3 className="text-sm font-semibold text-muted-foreground">
-            About this Monitor
-          </h3>
+          <Label className="text-muted-foreground">About this Monitor</Label>
           <p className="text-sm whitespace-pre-wrap">{event.content}</p>
         </div>
       )}
diff --git a/src/components/nostr/kinds/MonitorAnnouncementRenderer.tsx b/src/components/nostr/kinds/MonitorAnnouncementRenderer.tsx
index 4fca07f..40a16ec 100644
--- a/src/components/nostr/kinds/MonitorAnnouncementRenderer.tsx
+++ b/src/components/nostr/kinds/MonitorAnnouncementRenderer.tsx
@@ -1,5 +1,10 @@
-import { BaseEventProps, BaseEventContainer } from "./BaseEventRenderer";
+import {
+  BaseEventProps,
+  BaseEventContainer,
+  ClickableEventTitle,
+} from "./BaseEventRenderer";
 import { Badge } from "@/components/ui/badge";
+import { Label } from "@/components/ui/label";
 import {
   getMonitorFrequency,
   getMonitorChecks,
@@ -19,6 +24,11 @@ export function Kind10166Renderer({ event }: BaseEventProps) {
   return (
     <BaseEventContainer event={event}>
       <div className="flex flex-col gap-2">
+        {/* Clickable Title */}
+        <ClickableEventTitle event={event} className="text-base font-semibold">
+          Relay Monitor
+        </ClickableEventTitle>
+
         {/* Monitoring Frequency */}
         {frequency && !isNaN(frequency) && (
           <div className="flex items-center gap-2 text-sm">
@@ -33,10 +43,10 @@ export function Kind10166Renderer({ event }: BaseEventProps) {
         {/* Check Types */}
         {checks.length > 0 && (
           <div className="flex flex-col gap-1.5">
-            <div className="flex items-center gap-2 text-xs text-muted-foreground">
+            <Label className="flex items-center gap-2 text-xs text-muted-foreground">
               <Activity className="size-3" />
-              <span>Monitoring:</span>
-            </div>
+              Monitoring
+            </Label>
             <div className="flex flex-wrap gap-1.5">
               {checks.map((check) => (
                 <Badge
diff --git a/src/components/nostr/kinds/RelayDiscoveryDetailRenderer.tsx b/src/components/nostr/kinds/RelayDiscoveryDetailRenderer.tsx
index d943600..d5a5a00 100644
--- a/src/components/nostr/kinds/RelayDiscoveryDetailRenderer.tsx
+++ b/src/components/nostr/kinds/RelayDiscoveryDetailRenderer.tsx
@@ -1,8 +1,10 @@
 import { NostrEvent } from "@/types/nostr";
 import { RelayLink } from "../RelayLink";
 import { Badge } from "@/components/ui/badge";
+import { Label } from "@/components/ui/label";
 import { JsonViewer } from "@/components/JsonViewer";
 import { UserName } from "../UserName";
+import { NIPBadge } from "@/components/NIPBadge";
 import {
   getRelayUrl,
   getRttMetrics,
@@ -28,6 +30,8 @@ import {
   Tag,
   Filter,
   Clock,
+  CheckCircle,
+  XCircle,
 } from "lucide-react";
 import { cn } from "@/lib/utils";
 import { formatTimestamp } from "@/hooks/useLocale";
@@ -92,10 +96,10 @@ export function Kind30166DetailRenderer({ event }: { event: NostrEvent }) {
         rtt.read !== undefined ||
         rtt.write !== undefined) && (
         <div className="space-y-2">
-          <h3 className="text-sm font-semibold text-muted-foreground flex items-center gap-2">
+          <Label className="flex items-center gap-2 text-muted-foreground">
             <Activity className="size-4" />
             Performance Metrics
-          </h3>
+          </Label>
           <div className="grid grid-cols-3 gap-3">
             {rtt.open !== undefined && !isNaN(rtt.open) && (
               <div className="flex flex-col gap-1 p-3 rounded-lg bg-muted/50">
@@ -124,10 +128,10 @@ export function Kind30166DetailRenderer({ event }: { event: NostrEvent }) {
       {/* Relay Characteristics */}
       {(networkType || relayType || geohash) && (
         <div className="space-y-2">
-          <h3 className="text-sm font-semibold text-muted-foreground flex items-center gap-2">
+          <Label className="flex items-center gap-2 text-muted-foreground">
             <Globe className="size-4" />
             Characteristics
-          </h3>
+          </Label>
           <div className="flex flex-wrap gap-2">
             {networkType && (
               <Badge variant="outline" className="gap-1.5 px-3 py-1">
@@ -156,21 +160,18 @@ export function Kind30166DetailRenderer({ event }: { event: NostrEvent }) {
       {/* Requirements Section */}
       {Object.keys(requirements).length > 0 && (
         <div className="space-y-2">
-          <h3 className="text-sm font-semibold text-muted-foreground flex items-center gap-2">
+          <Label className="flex items-center gap-2 text-muted-foreground">
             <Shield className="size-4" />
             Requirements
-          </h3>
+          </Label>
           <div className="flex flex-col gap-2">
             {requirements.auth !== undefined && (
               <div className="flex items-center gap-2 text-sm">
-                <Lock
-                  className={cn(
-                    "size-4",
-                    requirements.auth
-                      ? "text-orange-600"
-                      : "text-muted-foreground",
-                  )}
-                />
+                {requirements.auth ? (
+                  <Lock className="size-4 text-orange-600" />
+                ) : (
+                  <CheckCircle className="size-4 text-green-600" />
+                )}
                 <span>
                   Authentication{" "}
                   {requirements.auth ? "required" : "not required"}
@@ -179,14 +180,11 @@ export function Kind30166DetailRenderer({ event }: { event: NostrEvent }) {
             )}
             {requirements.payment !== undefined && (
               <div className="flex items-center gap-2 text-sm">
-                <CreditCard
-                  className={cn(
-                    "size-4",
-                    requirements.payment
-                      ? "text-blue-600"
-                      : "text-muted-foreground",
-                  )}
-                />
+                {requirements.payment ? (
+                  <CreditCard className="size-4 text-blue-600" />
+                ) : (
+                  <CheckCircle className="size-4 text-green-600" />
+                )}
                 <span>
                   Payment {requirements.payment ? "required" : "not required"}
                 </span>
@@ -194,14 +192,11 @@ export function Kind30166DetailRenderer({ event }: { event: NostrEvent }) {
             )}
             {requirements.writes !== undefined && (
               <div className="flex items-center gap-2 text-sm">
-                <Zap
-                  className={cn(
-                    "size-4",
-                    requirements.writes
-                      ? "text-green-600"
-                      : "text-muted-foreground",
-                  )}
-                />
+                {requirements.writes ? (
+                  <CheckCircle className="size-4 text-green-600" />
+                ) : (
+                  <XCircle className="size-4 text-red-600" />
+                )}
                 <span>
                   {requirements.writes
                     ? "Write access enabled"
@@ -211,14 +206,11 @@ export function Kind30166DetailRenderer({ event }: { event: NostrEvent }) {
             )}
             {requirements.pow !== undefined && (
               <div className="flex items-center gap-2 text-sm">
-                <Shield
-                  className={cn(
-                    "size-4",
-                    requirements.pow
-                      ? "text-purple-600"
-                      : "text-muted-foreground",
-                  )}
-                />
+                {requirements.pow ? (
+                  <Zap className="size-4 text-purple-600" />
+                ) : (
+                  <CheckCircle className="size-4 text-green-600" />
+                )}
                 <span>
                   Proof of work {requirements.pow ? "required" : "not required"}
                 </span>
@@ -231,18 +223,18 @@ export function Kind30166DetailRenderer({ event }: { event: NostrEvent }) {
       {/* Supported NIPs */}
       {nips.length > 0 && (
         <div className="space-y-2">
-          <h3 className="text-sm font-semibold text-muted-foreground">
+          <Label className="text-muted-foreground">
             Supported NIPs ({nips.length})
-          </h3>
+          </Label>
           <div className="flex flex-wrap gap-1.5">
             {nips.map((nip) => (
-              <Badge
+              <NIPBadge
                 key={nip}
-                variant="secondary"
-                className="font-mono text-xs"
-              >
-                {nip}
-              </Badge>
+                nipNumber={nip.toString().padStart(2, "0")}
+                showName={false}
+                showNIPPrefix={false}
+                className="text-xs"
+              />
             ))}
           </div>
         </div>
@@ -251,10 +243,10 @@ export function Kind30166DetailRenderer({ event }: { event: NostrEvent }) {
       {/* Accepted Kinds */}
       {kinds.accepted.length > 0 && (
         <div className="space-y-2">
-          <h3 className="text-sm font-semibold text-muted-foreground flex items-center gap-2">
+          <Label className="flex items-center gap-2 text-muted-foreground">
             <Filter className="size-4" />
             Accepted Kinds ({kinds.accepted.length})
-          </h3>
+          </Label>
           <div className="flex flex-wrap gap-1.5">
             {kinds.accepted.map((kind) => (
               <Badge key={kind} variant="outline" className="font-mono text-xs">
@@ -268,10 +260,10 @@ export function Kind30166DetailRenderer({ event }: { event: NostrEvent }) {
       {/* Rejected Kinds */}
       {kinds.rejected.length > 0 && (
         <div className="space-y-2">
-          <h3 className="text-sm font-semibold text-muted-foreground flex items-center gap-2">
-            <Filter className="size-4" />
+          <Label className="flex items-center gap-2 text-muted-foreground">
+            <XCircle className="size-4" />
             Rejected Kinds ({kinds.rejected.length})
-          </h3>
+          </Label>
           <div className="flex flex-wrap gap-1.5">
             {kinds.rejected.map((kind) => (
               <Badge
@@ -289,10 +281,10 @@ export function Kind30166DetailRenderer({ event }: { event: NostrEvent }) {
       {/* Topics */}
       {topics.length > 0 && (
         <div className="space-y-2">
-          <h3 className="text-sm font-semibold text-muted-foreground flex items-center gap-2">
+          <Label className="flex items-center gap-2 text-muted-foreground">
             <Tag className="size-4" />
             Topics ({topics.length})
-          </h3>
+          </Label>
           <div className="flex flex-wrap gap-1.5">
             {topics.map((topic, index) => (
               <Badge key={index} variant="secondary" className="text-xs">