diff --git a/next.config.ts b/next.config.ts
index 695141f..ca7989d 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -13,6 +13,16 @@ const nextConfig: NextConfig = {
   },
   async headers() {
     return [
+      {
+        // Allow clipboard access when embedded in iframes (e.g., on f3nation.com)
+        source: "/:path*",
+        headers: [
+          {
+            key: "Permissions-Policy",
+            value: "clipboard-write=(self \"https://f3nation.com\" \"https://www.f3nation.com\")",
+          },
+        ],
+      },
       {
         source: "/callback/:path*",
         headers: [
diff --git a/src/app/admin/AdminPanel.tsx b/src/app/admin/AdminPanel.tsx
index 7c3ab7e..e79acd8 100644
--- a/src/app/admin/AdminPanel.tsx
+++ b/src/app/admin/AdminPanel.tsx
@@ -82,6 +82,7 @@ import {
 import { getOAuthConfig } from "@/lib/auth";
 import { TiptapEditor } from "@/components/shared/TiptapEditor";
 import { searchEntriesByName } from "@/app/submit/actions";
+import { RichTextDisplay } from "@/components/shared/RichTextDisplay";
 
 interface UserInfo {
   sub: string;
@@ -137,6 +138,8 @@ export default function AdminPanel() {
   const [isRejectDialogOpen, setIsRejectDialogOpen] = useState(false);
   const [rejectionReason, setRejectionReason] = useState("");
   const [submissionToReject, setSubmissionToReject] = useState<number | null>(null);
+  const [adminNotes, setAdminNotes] = useState("");
+  const [resolvedMentions, setResolvedMentions] = useState<Record<string, AnyEntry>>({});
 
   const [lexiconEntriesForDisplay, setLexiconEntriesForDisplay] = useState<
     AnyEntry[]
@@ -469,6 +472,29 @@ export default function AdminPanel() {
     setEditedSubmissionData(JSON.parse(JSON.stringify(submission.data))); // Deep clone
     setIsEditingSubmission(false);
     setOriginalEntryForEditView(null);
+
+    // Load mentioned entries for proper display
+    const mentionedEntryIds = submission.submissionType === "new"
+      ? (submission.data as NewEntrySuggestionData).mentionedEntries || []
+      : (submission.data as EditEntrySuggestionData).changes.mentionedEntries || [];
+
+    if (mentionedEntryIds.length > 0) {
+      const resolved: Record<string, AnyEntry> = {};
+      for (const entryId of mentionedEntryIds) {
+        try {
+          const entry = await fetchEntryById(entryId);
+          if (entry) {
+            resolved[entryId] = entry;
+          }
+        } catch (error) {
+          console.error(`Error loading mentioned entry ${entryId}:`, error);
+        }
+      }
+      setResolvedMentions(resolved);
+    } else {
+      setResolvedMentions({});
+    }
+
     if (submission.submissionType === "edit") {
       setIsLoadingOriginalEntry(true);
       try {
@@ -490,6 +516,9 @@ export default function AdminPanel() {
   };
 
   const handleStartEditingSubmission = () => {
+    if (viewingSubmission) {
+      setAdminNotes(viewingSubmission.adminNotes || "");
+    }
     setIsEditingSubmission(true);
   };
 
@@ -498,6 +527,7 @@ export default function AdminPanel() {
       setEditedSubmissionData(
         JSON.parse(JSON.stringify(viewingSubmission.data)),
       );
+      setAdminNotes(viewingSubmission.adminNotes || "");
     }
     setIsEditingSubmission(false);
   };
@@ -507,6 +537,7 @@ export default function AdminPanel() {
       setViewingSubmission({
         ...viewingSubmission,
         data: editedSubmissionData,
+        adminNotes: adminNotes,
       });
     }
     setIsEditingSubmission(false);
@@ -1066,7 +1097,7 @@ export default function AdminPanel() {
                 </DialogTitle>
                 <DialogDescription>
                   {isEditingSubmission
-                    ? "Make any necessary changes before approving"
+                    ? "Edit any field and optionally add a message for the user"
                     : "Reviewing"}{" "}
                   {viewingSubmission?.submissionType === "new"
                     ? "new entry suggestion"
@@ -1284,13 +1315,10 @@ export default function AdminPanel() {
                               Description
                             </TableCell>
                             <TableCell>
-                              <div
+                              <RichTextDisplay
+                                htmlContent={(viewingSubmission.data as NewEntrySuggestionData).description}
+                                mentionedEntries={resolvedMentions}
                                 className="prose prose-sm max-w-none"
-                                dangerouslySetInnerHTML={{
-                                  __html: (
-                                    viewingSubmission.data as NewEntrySuggestionData
-                                  ).description,
-                                }}
                               />
                             </TableCell>
                           </TableRow>
@@ -1396,131 +1424,123 @@ export default function AdminPanel() {
                     <>
                       {isEditingSubmission && editedSubmissionData ? (
                         <div className="space-y-4">
-                          {(editedSubmissionData as EditEntrySuggestionData)
-                            .changes.name !== undefined && (
-                            <div className="space-y-2">
-                              <Label htmlFor="edit-change-name">Name</Label>
-                              <Input
-                                id="edit-change-name"
-                                value={
-                                  (editedSubmissionData as EditEntrySuggestionData)
-                                    .changes.name || ""
-                                }
-                                onChange={(e) =>
-                                  setEditedSubmissionData({
-                                    ...editedSubmissionData,
-                                    changes: {
-                                      ...(
-                                        editedSubmissionData as EditEntrySuggestionData
-                                      ).changes,
-                                      name: e.target.value,
-                                    },
-                                  } as EditEntrySuggestionData)
-                                }
-                              />
-                            </div>
-                          )}
-                          {(editedSubmissionData as EditEntrySuggestionData)
-                            .changes.description !== undefined && (
-                            <div className="space-y-2">
-                              <Label htmlFor="edit-change-description">
-                                Description
-                              </Label>
-                              <TiptapEditor
-                                value={
-                                  (editedSubmissionData as EditEntrySuggestionData)
-                                    .changes.description || ""
-                                }
-                                onChange={(html) =>
-                                  setEditedSubmissionData({
-                                    ...editedSubmissionData,
-                                    changes: {
-                                      ...(
-                                        editedSubmissionData as EditEntrySuggestionData
-                                      ).changes,
-                                      description: html,
-                                    },
-                                  } as EditEntrySuggestionData)
-                                }
-                                onMentionsChange={(mentions) => {
-                                  setEditedSubmissionData({
-                                    ...editedSubmissionData,
-                                    changes: {
-                                      ...(
-                                        editedSubmissionData as EditEntrySuggestionData
-                                      ).changes,
-                                      mentionedEntries: mentions.map((m) => m.id),
-                                    },
-                                  } as EditEntrySuggestionData);
-                                }}
-                                searchEntries={searchEntriesByName}
-                                placeholder="Edit description..."
-                              />
-                            </div>
-                          )}
-                          {(editedSubmissionData as EditEntrySuggestionData)
-                            .changes.aliases !== undefined && (
+                          <p className="text-sm text-muted-foreground mb-4">
+                            You can edit any field below, not just the user&apos;s suggested changes. Fields marked with * were suggested by the user.
+                          </p>
+
+                          {/* Name - always shown */}
+                          <div className="space-y-2">
+                            <Label htmlFor="edit-change-name">
+                              Name {(editedSubmissionData as EditEntrySuggestionData).changes.name !== undefined && <span className="text-orange-500">*</span>}
+                            </Label>
+                            <Input
+                              id="edit-change-name"
+                              value={
+                                (editedSubmissionData as EditEntrySuggestionData).changes.name !== undefined
+                                  ? (editedSubmissionData as EditEntrySuggestionData).changes.name || ""
+                                  : originalEntryForEditView.name
+                              }
+                              onChange={(e) =>
+                                setEditedSubmissionData({
+                                  ...editedSubmissionData,
+                                  changes: {
+                                    ...(editedSubmissionData as EditEntrySuggestionData).changes,
+                                    name: e.target.value,
+                                  },
+                                } as EditEntrySuggestionData)
+                              }
+                            />
+                          </div>
+
+                          {/* Description - always shown */}
+                          <div className="space-y-2">
+                            <Label htmlFor="edit-change-description">
+                              Description {(editedSubmissionData as EditEntrySuggestionData).changes.description !== undefined && <span className="text-orange-500">*</span>}
+                            </Label>
+                            <TiptapEditor
+                              value={
+                                (editedSubmissionData as EditEntrySuggestionData).changes.description !== undefined
+                                  ? (editedSubmissionData as EditEntrySuggestionData).changes.description || ""
+                                  : originalEntryForEditView.description
+                              }
+                              onChange={(html) =>
+                                setEditedSubmissionData({
+                                  ...editedSubmissionData,
+                                  changes: {
+                                    ...(editedSubmissionData as EditEntrySuggestionData).changes,
+                                    description: html,
+                                  },
+                                } as EditEntrySuggestionData)
+                              }
+                              onMentionsChange={(mentions) => {
+                                setEditedSubmissionData({
+                                  ...editedSubmissionData,
+                                  changes: {
+                                    ...(editedSubmissionData as EditEntrySuggestionData).changes,
+                                    mentionedEntries: mentions.map((m) => m.id),
+                                  },
+                                } as EditEntrySuggestionData);
+                              }}
+                              searchEntries={searchEntriesByName}
+                              placeholder="Edit description..."
+                            />
+                          </div>
+
+                          {/* Aliases - always shown */}
+                          <div className="space-y-2">
+                            <Label htmlFor="edit-change-aliases">
+                              Aliases (comma-separated) {(editedSubmissionData as EditEntrySuggestionData).changes.aliases !== undefined && <span className="text-orange-500">*</span>}
+                            </Label>
+                            <Input
+                              id="edit-change-aliases"
+                              value={
+                                (editedSubmissionData as EditEntrySuggestionData).changes.aliases !== undefined
+                                  ? ((editedSubmissionData as EditEntrySuggestionData).changes.aliases || []).join(", ")
+                                  : (originalEntryForEditView.aliases || []).map(a => a.name).join(", ")
+                              }
+                              onChange={(e) =>
+                                setEditedSubmissionData({
+                                  ...editedSubmissionData,
+                                  changes: {
+                                    ...(editedSubmissionData as EditEntrySuggestionData).changes,
+                                    aliases: e.target.value
+                                      .split(",")
+                                      .map((a) => a.trim())
+                                      .filter(Boolean),
+                                  },
+                                } as EditEntrySuggestionData)
+                              }
+                            />
+                          </div>
+
+                          {/* Tags - for exicon only, always shown */}
+                          {originalEntryForEditView.type === "exicon" && (
                             <div className="space-y-2">
-                              <Label htmlFor="edit-change-aliases">
-                                Aliases (comma-separated)
+                              <Label>
+                                Tags {(editedSubmissionData as EditEntrySuggestionData).changes.tags !== undefined && <span className="text-orange-500">*</span>}
                               </Label>
-                              <Input
-                                id="edit-change-aliases"
-                                value={(
-                                  (editedSubmissionData as EditEntrySuggestionData)
-                                    .changes.aliases || []
-                                ).join(", ")}
-                                onChange={(e) =>
-                                  setEditedSubmissionData({
-                                    ...editedSubmissionData,
-                                    changes: {
-                                      ...(
-                                        editedSubmissionData as EditEntrySuggestionData
-                                      ).changes,
-                                      aliases: e.target.value
-                                        .split(",")
-                                        .map((a) => a.trim())
-                                        .filter(Boolean),
-                                    },
-                                  } as EditEntrySuggestionData)
-                                }
-                              />
-                            </div>
-                          )}
-                          {originalEntryForEditView.type === "exicon" &&
-                            (editedSubmissionData as EditEntrySuggestionData)
-                              .changes.tags !== undefined && (
-                              <div className="space-y-2">
-                                <Label>Tags</Label>
-                                <div className="grid grid-cols-2 sm:grid-cols-3 gap-2 p-4 border rounded-md max-h-48 overflow-y-auto">
-                                  {tags.map((tag) => (
+                              <div className="grid grid-cols-2 sm:grid-cols-3 gap-2 p-4 border rounded-md max-h-48 overflow-y-auto">
+                                {tags.map((tag) => {
+                                  const currentTags = (editedSubmissionData as EditEntrySuggestionData).changes.tags !== undefined
+                                    ? (editedSubmissionData as EditEntrySuggestionData).changes.tags || []
+                                    : (originalEntryForEditView as ExiconEntry).tags.map(t => t.name);
+
+                                  return (
                                     <div
                                       key={tag.id}
                                       className="flex items-center space-x-2"
                                     >
                                       <Checkbox
                                         id={`edit-change-tag-${tag.id}`}
-                                        checked={(
-                                          (
-                                            editedSubmissionData as EditEntrySuggestionData
-                                          ).changes.tags || []
-                                        ).includes(tag.name)}
+                                        checked={currentTags.includes(tag.name)}
                                         onCheckedChange={(checked) => {
-                                          const currentTags =
-                                            (
-                                              editedSubmissionData as EditEntrySuggestionData
-                                            ).changes.tags || [];
                                           const newTags = checked
                                             ? [...currentTags, tag.name]
-                                            : currentTags.filter(
-                                                (t) => t !== tag.name,
-                                              );
+                                            : currentTags.filter((t) => t !== tag.name);
                                           setEditedSubmissionData({
                                             ...editedSubmissionData,
                                             changes: {
-                                              ...(
-                                                editedSubmissionData as EditEntrySuggestionData
-                                              ).changes,
+                                              ...(editedSubmissionData as EditEntrySuggestionData).changes,
                                               tags: newTags,
                                             },
                                           } as EditEntrySuggestionData);
@@ -1533,39 +1553,57 @@ export default function AdminPanel() {
                                         {tag.name}
                                       </Label>
                                     </div>
-                                  ))}
-                                </div>
-                              </div>
-                            )}
-                          {originalEntryForEditView.type === "exicon" &&
-                            (editedSubmissionData as EditEntrySuggestionData)
-                              .changes.videoLink !== undefined && (
-                              <div className="space-y-2">
-                                <Label htmlFor="edit-change-videoLink">
-                                  Video Link
-                                </Label>
-                                <Input
-                                  id="edit-change-videoLink"
-                                  type="url"
-                                  value={
-                                    (editedSubmissionData as EditEntrySuggestionData)
-                                      .changes.videoLink || ""
-                                  }
-                                  onChange={(e) =>
-                                    setEditedSubmissionData({
-                                      ...editedSubmissionData,
-                                      changes: {
-                                        ...(
-                                          editedSubmissionData as EditEntrySuggestionData
-                                        ).changes,
-                                        videoLink: e.target.value,
-                                      },
-                                    } as EditEntrySuggestionData)
-                                  }
-                                  placeholder="https://youtube.com/watch?v=..."
-                                />
+                                  );
+                                })}
                               </div>
-                            )}
+                            </div>
+                          )}
+
+                          {/* Video Link - for exicon only, always shown */}
+                          {originalEntryForEditView.type === "exicon" && (
+                            <div className="space-y-2">
+                              <Label htmlFor="edit-change-videoLink">
+                                Video Link {(editedSubmissionData as EditEntrySuggestionData).changes.videoLink !== undefined && <span className="text-orange-500">*</span>}
+                              </Label>
+                              <Input
+                                id="edit-change-videoLink"
+                                type="url"
+                                value={
+                                  (editedSubmissionData as EditEntrySuggestionData).changes.videoLink !== undefined
+                                    ? (editedSubmissionData as EditEntrySuggestionData).changes.videoLink || ""
+                                    : (originalEntryForEditView as ExiconEntry).videoLink || ""
+                                }
+                                onChange={(e) =>
+                                  setEditedSubmissionData({
+                                    ...editedSubmissionData,
+                                    changes: {
+                                      ...(editedSubmissionData as EditEntrySuggestionData).changes,
+                                      videoLink: e.target.value,
+                                    },
+                                  } as EditEntrySuggestionData)
+                                }
+                                placeholder="https://youtube.com/watch?v=..."
+                              />
+                            </div>
+                          )}
+
+                          {/* Admin Notes */}
+                          <Separator className="my-4" />
+                          <div className="space-y-2">
+                            <Label htmlFor="admin-notes">
+                              Admin Message/Notes (Optional)
+                            </Label>
+                            <p className="text-sm text-muted-foreground">
+                              Add a message to communicate with the user about any additional changes you made or feedback on their submission.
+                            </p>
+                            <Textarea
+                              id="admin-notes"
+                              value={adminNotes}
+                              onChange={(e) => setAdminNotes(e.target.value)}
+                              placeholder="E.g., I updated the description to include more details about proper form..."
+                              rows={4}
+                            />
+                          </div>
                         </div>
                       ) : (
                         <div className="overflow-x-auto border rounded-md">
@@ -1605,22 +1643,17 @@ export default function AdminPanel() {
                                     Description
                                   </TableCell>
                                   <TableCell>
-                                    <div
+                                    <RichTextDisplay
+                                      htmlContent={originalEntryForEditView.description}
+                                      mentionedEntries={originalEntryForEditView.resolvedMentionsData}
                                       className="prose prose-sm max-w-none"
-                                      dangerouslySetInnerHTML={{
-                                        __html: originalEntryForEditView.description,
-                                      }}
                                     />
                                   </TableCell>
                                   <TableCell>
-                                    <div
+                                    <RichTextDisplay
+                                      htmlContent={(viewingSubmission.data as EditEntrySuggestionData).changes.description || ""}
+                                      mentionedEntries={resolvedMentions}
                                       className="prose prose-sm max-w-none"
-                                      dangerouslySetInnerHTML={{
-                                        __html:
-                                          (
-                                            viewingSubmission.data as EditEntrySuggestionData
-                                          ).changes.description || "",
-                                      }}
                                     />
                                   </TableCell>
                                 </TableRow>
diff --git a/src/app/exicon/[entryId]/page.tsx b/src/app/exicon/[entryId]/page.tsx
index 67dc167..89b1545 100644
--- a/src/app/exicon/[entryId]/page.tsx
+++ b/src/app/exicon/[entryId]/page.tsx
@@ -48,7 +48,7 @@ export async function generateMetadata({
   const description =
     exiconEntry.description ||
     `Learn about the ${exiconEntry.name} exercise in the F3 Exicon.`;
-  const url = `https://codex.f3nation.com/exicon/${entryId}`;
+  const url = `https://f3nation.com/exicon/${entryId}`;
   const tags = exiconEntry.tags?.map((tag) => tag.name).join(", ") || "";
 
   return {
diff --git a/src/app/exicon/page.tsx b/src/app/exicon/page.tsx
index 884f38c..af8b677 100644
--- a/src/app/exicon/page.tsx
+++ b/src/app/exicon/page.tsx
@@ -27,7 +27,7 @@ export async function generateMetadata({
         const description =
           entry.description ||
           `Learn about the ${entry.name} exercise in the F3 Exicon.`;
-        const url = `https://codex.f3nation.com/exicon?entryId=${entryId}`;
+        const url = `https://f3nation.com/exicon?entryId=${entryId}`;
         const tags = entry.tags?.map((tag) => tag.name).join(", ") || "";
 
         return {
diff --git a/src/app/lexicon/[entryId]/page.tsx b/src/app/lexicon/[entryId]/page.tsx
index 0c91d4a..90d1c5b 100644
--- a/src/app/lexicon/[entryId]/page.tsx
+++ b/src/app/lexicon/[entryId]/page.tsx
@@ -42,7 +42,7 @@ export async function generateMetadata({
   const description =
     lexiconEntry.description ||
     `Learn about ${lexiconEntry.name} in the F3 Lexicon.`;
-  const url = `https://codex.f3nation.com/lexicon/${entryId}`;
+  const url = `https://f3nation.com/lexicon/${entryId}`;
 
   return {
     title,
diff --git a/src/app/lexicon/page.tsx b/src/app/lexicon/page.tsx
index 4d37b04..dfdd108 100644
--- a/src/app/lexicon/page.tsx
+++ b/src/app/lexicon/page.tsx
@@ -27,7 +27,7 @@ export async function generateMetadata({
         const title = `${entry.name} - F3 Lexicon`;
         const description =
           entry.description || `Learn about ${entry.name} in the F3 Lexicon.`;
-        const url = `https://codex.f3nation.com/lexicon?entryId=${entryId}`;
+        const url = `https://f3nation.com/lexicon?entryId=${entryId}`;
 
         return {
           title,
diff --git a/src/components/shared/CopyEntryButton.tsx b/src/components/shared/CopyEntryButton.tsx
index f62116f..766d803 100644
--- a/src/components/shared/CopyEntryButton.tsx
+++ b/src/components/shared/CopyEntryButton.tsx
@@ -114,11 +114,47 @@ ${cleanDescription}`;
       ? stripHtml(entry.description)
       : "No description available.";
 
-    const allContent = `${entry.name}
+    // Build comprehensive content with formatting
+    const parts: string[] = [];
 
-${cleanDescription}
+    // Title
+    parts.push(`📖 ${entry.name}`);
+    parts.push(""); // Empty line
 
-${url}`;
+    // Type
+    const typeLabel = entry.type === "exicon" ? "Exercise" : "Term";
+    parts.push(`Type: ${typeLabel}`);
+    parts.push(""); // Empty line
+
+    // Description
+    parts.push("Description:");
+    parts.push(cleanDescription);
+    parts.push(""); // Empty line
+
+    // Aliases
+    if (entry.aliases && entry.aliases.length > 0) {
+      const aliasNames = entry.aliases.map((a) => a.name).join(", ");
+      parts.push(`Also known as: ${aliasNames}`);
+      parts.push(""); // Empty line
+    }
+
+    // Tags (only for exicon entries)
+    if (entry.type === "exicon" && entry.tags && entry.tags.length > 0) {
+      const tagNames = entry.tags.map((t) => t.name).join(", ");
+      parts.push(`Tags: ${tagNames}`);
+      parts.push(""); // Empty line
+    }
+
+    // Video Link (only for exicon entries)
+    if (entry.type === "exicon" && entry.videoLink) {
+      parts.push(`Video: ${entry.videoLink}`);
+      parts.push(""); // Empty line
+    }
+
+    // URL
+    parts.push(`Link: ${url}`);
+
+    const allContent = parts.join("\n");
 
     const result = await copyToClipboard(allContent);
 
@@ -127,7 +163,7 @@ ${url}`;
       setTimeout(() => setCopied(false), 2000);
       toast({
         title: "All Details Copied!",
-        description: `${entry.name} name, description, and URL copied to clipboard.`,
+        description: `${entry.name} complete information copied to clipboard.`,
       });
     } else {
       if (isInIframeUtil()) {
diff --git a/src/lib/clipboard.ts b/src/lib/clipboard.ts
index e48898a..15d37a9 100644
--- a/src/lib/clipboard.ts
+++ b/src/lib/clipboard.ts
@@ -9,14 +9,19 @@ export interface CopyResult {
  * for iframe and cross-origin contexts
  */
 export async function copyToClipboard(text: string): Promise<CopyResult> {
+
+
   // Strategy 1: Modern Clipboard API (works in most contexts)
   if (navigator.clipboard && window.isSecureContext) {
     try {
       await navigator.clipboard.writeText(text);
+
       return { success: true, method: "clipboard" };
     } catch (error) {
-      console.warn("Clipboard API failed:", error);
+      console.warn("[Clipboard] Clipboard API failed:", error);
     }
+  } else {
+    console.log("[Clipboard] Clipboard API not available or not secure context");
   }
 
   // Strategy 2: Textarea fallback (works in iframes)
@@ -41,10 +46,13 @@ export async function copyToClipboard(text: string): Promise<CopyResult> {
     document.body.removeChild(textArea);
 
     if (successful) {
+      console.log("[Clipboard] Success via TextArea method");
       return { success: true, method: "textArea" };
+    } else {
+      console.warn("[Clipboard] TextArea execCommand returned false");
     }
   } catch (error) {
-    console.warn("TextArea copy failed:", error);
+    console.warn("[Clipboard] TextArea copy failed:", error);
   }
 
   // Strategy 3: Selection API fallback
@@ -73,15 +81,19 @@ export async function copyToClipboard(text: string): Promise<CopyResult> {
       document.body.removeChild(span);
 
       if (successful) {
+        console.log("[Clipboard] Success via Selection API");
         return { success: true, method: "selection" };
+      } else {
+        console.warn("[Clipboard] Selection execCommand returned false");
       }
     }
 
     document.body.removeChild(span);
   } catch (error) {
-    console.warn("Selection copy failed:", error);
+    console.warn("[Clipboard] Selection copy failed:", error);
   }
 
+  console.error("[Clipboard] All copy methods failed");
   return {
     success: false,
     method: "fallback",
@@ -109,13 +121,19 @@ export function showCopyPrompt(text: string): void {
   const overlay = document.createElement("div");
   overlay.style.cssText = `
     position: fixed;
-    inset: 0;
+    top: 0 !important;
+    left: 0 !important;
+    right: 0 !important;
+    bottom: 0 !important;
+    width: 100% !important;
+    height: 100% !important;
     background: rgba(0, 0, 0, 0.8);
-    z-index: 10000;
+    z-index: 999999;
     display: flex;
     align-items: center;
     justify-content: center;
     padding: 20px;
+    box-sizing: border-box;
   `;
 
   const modal = document.createElement("div");
@@ -125,28 +143,34 @@ export function showCopyPrompt(text: string): void {
     padding: 24px;
     max-width: 500px;
     width: 100%;
+    max-height: 90vh;
+    overflow-y: auto;
     box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
+    position: relative;
+    box-sizing: border-box;
   `;
 
   const textArea = document.createElement("textarea");
   textArea.value = text;
   textArea.style.cssText = `
     width: 100%;
-    height: 60px;
+    min-height: 80px;
+    max-height: 200px;
     margin: 16px 0;
     padding: 8px;
     border: 1px solid #ccc;
     border-radius: 4px;
     font-family: monospace;
     font-size: 14px;
-    resize: none;
+    resize: vertical;
+    box-sizing: border-box;
   `;
   textArea.readOnly = true;
 
   modal.innerHTML = `
-    <h3 style="margin: 0 0 8px 0; font-size: 18px; font-weight: 600;">Copy Link</h3>
+    <h3 style="margin: 0 0 8px 0; font-size: 18px; font-weight: 600;">Copy Content</h3>
     <p style="margin: 0 0 16px 0; color: #666; font-size: 14px;">
-      Please copy the link below manually:
+      Automatic copy failed. Please use the buttons below to copy manually:
     </p>
   `;
 
@@ -158,11 +182,40 @@ export function showCopyPrompt(text: string): void {
     margin-top: 16px;
   `;
 
+  const copyButton = document.createElement("button");
+  copyButton.textContent = "Copy";
+  copyButton.style.cssText = `
+    padding: 8px 16px;
+    background: #007bff;
+    color: white;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    font-size: 14px;
+  `;
+  copyButton.onclick = () => {
+    textArea.select();
+    textArea.setSelectionRange(0, textArea.value.length);
+    try {
+      const successful = document.execCommand("copy");
+      if (successful) {
+        copyButton.textContent = "Copied!";
+        copyButton.style.background = "#28a745";
+        setTimeout(() => {
+          copyButton.textContent = "Copy";
+          copyButton.style.background = "#007bff";
+        }, 2000);
+      }
+    } catch (err) {
+      console.error("Copy failed:", err);
+    }
+  };
+
   const selectButton = document.createElement("button");
   selectButton.textContent = "Select All";
   selectButton.style.cssText = `
     padding: 8px 16px;
-    background: #007bff;
+    background: #6c757d;
     color: white;
     border: none;
     border-radius: 4px;
@@ -178,7 +231,7 @@ export function showCopyPrompt(text: string): void {
   closeButton.textContent = "Close";
   closeButton.style.cssText = `
     padding: 8px 16px;
-    background: #6c757d;
+    background: #dc3545;
     color: white;
     border: none;
     border-radius: 4px;
@@ -189,6 +242,7 @@ export function showCopyPrompt(text: string): void {
     document.body.removeChild(overlay);
   };
 
+  buttonContainer.appendChild(copyButton);
   buttonContainer.appendChild(selectButton);
   buttonContainer.appendChild(closeButton);
   modal.appendChild(textArea);
diff --git a/src/lib/route-utils.ts b/src/lib/route-utils.ts
index 12d6e82..73fde90 100644
--- a/src/lib/route-utils.ts
+++ b/src/lib/route-utils.ts
@@ -45,7 +45,7 @@ export function generateEntryUrl(
 ): string {
   const baseRoute = getEntryBaseUrl(entryType);
   const encodedId = encodeURIComponent(entryId);
-  return `https://codex.f3nation.com/${baseRoute}/${encodedId}`;
+  return `https://f3nation.com/${baseRoute}?entryId=${encodedId}`;
 }
 
 /**