diff --git a/package.json b/package.json
index 19dc488e5..e9919f3e9 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "app:intl:extract": "pnpm run --filter=@modrinth/app-frontend intl:extract",
     "blog:fix": "turbo run fix --filter=@modrinth/blog",
     "pages:build": "NITRO_PRESET=cloudflare-pages pnpm --filter frontend run build",
+    "moderation:fix": "turbo run fix --filter=@modrinth/moderation",
     "build": "turbo run build --continue",
     "lint": "turbo run lint --continue",
     "test": "turbo run test --continue",
diff --git a/packages/moderation/data/messages/checklist-text/license/id.md b/packages/moderation/data/messages/checklist-text/license/id.md
deleted file mode 100644
index 37e3ac376..000000000
--- a/packages/moderation/data/messages/checklist-text/license/id.md
+++ /dev/null
@@ -1 +0,0 @@
-**License id:** %PROJECT_LICENSE_ID% \
diff --git a/packages/moderation/data/messages/checklist-text/license/link.md b/packages/moderation/data/messages/checklist-text/licensing.md
similarity index 50%
rename from packages/moderation/data/messages/checklist-text/license/link.md
rename to packages/moderation/data/messages/checklist-text/licensing.md
index ff5f4c4c3..87b7d0783 100644
--- a/packages/moderation/data/messages/checklist-text/license/link.md
+++ b/packages/moderation/data/messages/checklist-text/licensing.md
@@ -1 +1,2 @@
+**License id:** %PROJECT_LICENSE_ID% \
 **License Link:** %PROJECT_LICENSE_URL%
diff --git a/packages/moderation/data/messages/checklist-text/links/donation/donation.md b/packages/moderation/data/messages/checklist-text/links/donation/donation.md
index 154b77d20..fce119787 100644
--- a/packages/moderation/data/messages/checklist-text/links/donation/donation.md
+++ b/packages/moderation/data/messages/checklist-text/links/donation/donation.md
@@ -1 +1 @@
-> **{PLATFORM}:** {URL}
+> **{PLATFORM}:** {URL}<br />
diff --git a/packages/moderation/data/messages/checklist-text/links/donation/donations.md b/packages/moderation/data/messages/checklist-text/links/donation/donations.md
index 7dc9615c1..29f39bade 100644
--- a/packages/moderation/data/messages/checklist-text/links/donation/donations.md
+++ b/packages/moderation/data/messages/checklist-text/links/donation/donations.md
@@ -1 +1,2 @@
-<u>**Donation Links:**</u>
+<br />
+<u>**Donation Links:**</u><br />
diff --git a/packages/moderation/data/stages/license.ts b/packages/moderation/data/stages/license.ts
index 6a8ff0fdd..9ae50173e 100644
--- a/packages/moderation/data/stages/license.ts
+++ b/packages/moderation/data/stages/license.ts
@@ -20,14 +20,7 @@ const licensesNotRequiringSource: string[] = [
 
 const licenseStage: Stage = {
   title: 'Is this license and link valid?',
-  text: async (project) => {
-    let text = ''
-    text += (await import('../messages/checklist-text/license/id.md?raw')).default
-    if (project.license.url)
-      text += (await import('../messages/checklist-text/license/link.md?raw')).default
-
-    return text
-  },
+  text: async () => (await import('../messages/checklist-text/licensing.md?raw')).default,
   id: 'license',
   icon: BookTextIcon,
   guidance_url: 'https://modrinth.com/legal/rules#miscellaneous',
@@ -55,33 +48,24 @@ const licenseStage: Stage = {
         },
       ],
     },
-    //    {
-    //      id: 'license_no_source',
-    //      type: 'conditional-button',
-    //      label: 'No Source',
-    //      fallbackWeight: 602,
-    //      suggestedStatus: 'rejected',
-    //      severity: 'medium',
-    //      fallbackMessage: async () => (await import('../messages/license/no_source.md?raw')).default,
-    //      messageVariants: [
-    //        {
-    //          conditions: {
-    //            requiredActions: ['reupload_unclear_fork'],
-    //          },
-    //          weight: 602,
-    //          message: async () => (await import('../messages/license/no_source-fork.md?raw')).default,
-    //        },
-    //      ],
-    //    },
     {
       id: 'license_no_source',
-      type: 'button',
+      type: 'conditional-button',
       label: 'No Source',
-      weight: 602,
       suggestedStatus: 'rejected',
       severity: 'medium',
       shouldShow: (project) => !licensesNotRequiringSource.includes(project.license.id),
-      message: async () => (await import('../messages/license/no_source.md?raw')).default,
+      messageVariants: [
+        {
+          conditions: {
+            excludedActions: ['license_no_source-fork'],
+          },
+          weight: 602,
+          message: async () => (await import('../messages/license/no_source.md?raw')).default,
+        },
+      ],
+      fallbackWeight: 602,
+      fallbackMessage: async () => '',
       enablesActions: [
         {
           id: 'license_no_source-fork',