diff --git a/src/content/docs/1.1.1.1/faq.mdx b/src/content/docs/1.1.1.1/faq.mdx
index 34310c8cf34370d..57569899c5f7340 100644
--- a/src/content/docs/1.1.1.1/faq.mdx
+++ b/src/content/docs/1.1.1.1/faq.mdx
@@ -3,7 +3,7 @@ pcx_content_type: faq
 title: FAQ
 structured_data: true
 sidebar:
-  order: 8
+  order: 12
 slug: 1.1.1.1/faq
 
 ---
diff --git a/src/content/docs/1.1.1.1/terms-of-use.mdx b/src/content/docs/1.1.1.1/terms-of-use.mdx
index 070c4e9c2a07d41..2a9687a7bff29f7 100644
--- a/src/content/docs/1.1.1.1/terms-of-use.mdx
+++ b/src/content/docs/1.1.1.1/terms-of-use.mdx
@@ -2,7 +2,7 @@
 pcx_content_type: reference
 title: Terms of use
 sidebar:
-  order: 7
+  order: 10
 slug: 1.1.1.1/terms-of-use
 
 ---
diff --git a/src/content/docs/1.1.1.1/setup/reporting-issues.mdx b/src/content/docs/1.1.1.1/troubleshooting.mdx
similarity index 89%
rename from src/content/docs/1.1.1.1/setup/reporting-issues.mdx
rename to src/content/docs/1.1.1.1/troubleshooting.mdx
index 2499955ad0b1bf8..34405246ec0db15 100644
--- a/src/content/docs/1.1.1.1/setup/reporting-issues.mdx
+++ b/src/content/docs/1.1.1.1/troubleshooting.mdx
@@ -1,18 +1,19 @@
 ---
 pcx_content_type: troubleshooting
-title: Reporting Issues with Cloudflare's DNS Resolver
+title: Troubleshooting
+description: Learn how to diagnose and report issues with Cloudflare's DNS Resolver
 sidebar:
-  order: 3
+  order: 8
 head:
   - tag: title
-    content: Reporting Issues with Cloudflare's DNS Resolver
+    content: Troubleshooting DNS Resolver
 slug: 1.1.1.1/troubleshooting
 
 ---
 
 import { Render } from "~/components"
 
-This guide will help you diagnose and resolve common issues with Cloudflare's DNS Resolver. Before proceeding with manual troubleshooting steps, you can use our [diagnostic tool](https://one.one.one.one/help/) to automatically gather relevant information.
+This guide will help you diagnose and resolve common issues with Cloudflare's DNS Resolver. Before proceeding with manual troubleshooting steps, you can [verify your connection](/1.1.1.1/check/) to automatically gather relevant information.
 
 ## Name resolution issues
 
@@ -136,4 +137,5 @@ If your traceroute fails at the first hop, the issue is likely hardware-related.
 ## Additional resources
 
 - [1.1.1.1 DNS Resolver homepage](https://1.1.1.1)
-- [DNS-over-TLS documentation](/1.1.1.1/encryption/dns-over-tls/)
+- [DNS over TLS documentation](/1.1.1.1/encryption/dns-over-tls/)
+- [Diagnostic tool](https://one.one.one.one/help/)