diff --git a/doc/docs/get-started/echokit-box.md b/doc/docs/get-started/echokit-box.md
index ce4100d..1d2f1a1 100644
--- a/doc/docs/get-started/echokit-box.md
+++ b/doc/docs/get-started/echokit-box.md
@@ -10,7 +10,7 @@ This guide walks you through setting up your **EchoKit Box**, which comes pre-as
 
 ## Get familiar with the buttons
 
-Let’s take a moment to get familiar with the common buttons and ports. The image below gives you a clear overview of them. Learn more about [the buttons on EchoKit Box](../hardware/echokit-box-buttons.md).
+Let’s take a moment to get familiar with the common buttons and ports. The image below gives you a clear overview of them. Learn more about [the buttons on EchoKit Box](../hardware/buttons-echokit-box.md).
 
 ![](echokit-box-buttons.jpg)
 
diff --git a/doc/docs/hardware/_category_.json b/doc/docs/hardware/_category_.json
index 4f4b0b4..9cd67cd 100644
--- a/doc/docs/hardware/_category_.json
+++ b/doc/docs/hardware/_category_.json
@@ -1,8 +1,8 @@
 {
-  "label": "Build your Hardware",
-  "position": 3,
+  "label": "Work with your device",
+  "position": 4,
   "link": {
     "type": "generated-index",
-    "description": "Flash your Hardware"
+    "description": "Assemble the hardware components, build and flash the firmware, understand the buttons"
   }
 }
diff --git a/doc/docs/hardware/adopt-your-harware.md b/doc/docs/hardware/adopt-your-hardware.md
similarity index 58%
rename from doc/docs/hardware/adopt-your-harware.md
rename to doc/docs/hardware/adopt-your-hardware.md
index fe2bb5e..b125bfe 100644
--- a/doc/docs/hardware/adopt-your-harware.md
+++ b/doc/docs/hardware/adopt-your-hardware.md
@@ -1,7 +1,7 @@
 ---
-sidebar_position: 3
+sidebar_position: 12
 ---
 
 # Advanced: Adapting to Your Hardware
 
-Coming soon!
\ No newline at end of file
+Coming soon!
diff --git a/doc/docs/hardware/assemble-echokit.md b/doc/docs/hardware/assemble-echokit.md
index 3e4a3f8..37b494f 100644
--- a/doc/docs/hardware/assemble-echokit.md
+++ b/doc/docs/hardware/assemble-echokit.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 1
+sidebar_position: 2
 ---
 
 # Assemble EchoKit DIY
diff --git a/doc/docs/hardware/echokit-box-buttons.md b/doc/docs/hardware/buttons-echokit-box.md
similarity index 100%
rename from doc/docs/hardware/echokit-box-buttons.md
rename to doc/docs/hardware/buttons-echokit-box.md
diff --git a/doc/docs/hardware/flash-firmware.md b/doc/docs/hardware/flash-firmware.md
index b9d7b04..a1c6f8c 100644
--- a/doc/docs/hardware/flash-firmware.md
+++ b/doc/docs/hardware/flash-firmware.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 2
+sidebar_position: 1
 ---
 
 # Flash the firmware
diff --git a/doc/docs/hardware/understand-the-firmware.md b/doc/docs/hardware/understand-the-firmware.md
index 1a63312..61910cc 100644
--- a/doc/docs/hardware/understand-the-firmware.md
+++ b/doc/docs/hardware/understand-the-firmware.md
@@ -1,7 +1,7 @@
 ---
-sidebar_position: 2
+sidebar_position: 11
 ---
 
 # Understand the EchoKit Device
 
-Coming soon
\ No newline at end of file
+Coming soon
diff --git a/doc/docs/server/_category_.json b/doc/docs/server/_category_.json
index b1127e5..c8aac06 100644
--- a/doc/docs/server/_category_.json
+++ b/doc/docs/server/_category_.json
@@ -1,8 +1,8 @@
 {
   "label": "Set Up EchoKit Server",
-  "position": 4,
+  "position": 3,
   "link": {
     "type": "generated-index",
-    "description": "In this chapter, you’ll learn how to set up and confirure the EchoKit server."
+    "description": "In this chapter, you’ll learn how to set up and configure the EchoKit server."
   }
 }
diff --git a/echokit_box.html b/echokit_box.html
index 6f7382d..43b75d3 100644
--- a/echokit_box.html
+++ b/echokit_box.html
@@ -711,7 +711,7 @@ <h1>EchoKit: Educational Voice AI Toolkit for Students and Builders</h1>
                     
                     <div class="cta-buttons">
                         <a href="https://buy.stripe.com/6oU3cwaPpdVN6l02TH63K0g" class="cta-button" onclick="trackTwitterCheckout(event)">Buy EchoKit</a>
-                        <a href="https://forms.gle/MagV8UfLNYYLnCqi6" target="_blank" class="cta-button cta-secondary">Bulk order</a>
+                        <a href="/docs/get-started/echokit-box" target="_blank" class="cta-button cta-secondary">Quick start</a>
                     </div>
                 </div>
 
@@ -770,7 +770,7 @@ <h2>What Our Users Say</h2>
                     </div>
                 </div>
                 <a href="https://x.com/saiyampathak/status/1990995395917590885" target="_blank" style="display: inline-flex; align-items: center; gap: 6px; padding: 8px 16px; background: #f8f9fa; color: #1da1f2; text-decoration: none; border-radius: 30px; font-weight: 500; font-size: 0.9rem; transition: all 0.3s; border: 1px solid #eee; margin-top: 15px;">
-                    <span>View on Twitter</span>
+                    <span>View on x (twitter)</span>
                 </a>
             </div>
             
@@ -788,7 +788,7 @@ <h2>What Our Users Say</h2>
                     </div>
                 </div>
                 <a href="https://x.com/mfranz_on/status/1991120018852270250" target="_blank" style="display: inline-flex; align-items: center; gap: 6px; padding: 8px 16px; background: #f8f9fa; color: #1da1f2; text-decoration: none; border-radius: 30px; font-weight: 500; font-size: 0.9rem; transition: all 0.3s; border: 1px solid #eee; margin-top: 15px;">
-                    <span>View on Twitter</span>
+                    <span>View on x (twitter)</span>
                 </a>
             </div>
         </div>
@@ -1192,7 +1192,7 @@ <h3 style="color: #06b6d4; font-size: 1.5rem; margin-bottom: 15px; font-weight:
             </p>
             <div style="display: flex; align-items: center; justify-content: space-between; margin-top: auto;">
                 <span style="font-size: 1.8rem; font-weight: 800; color: #0682d4;">Free</span>
-                <a href="https://echokit.dev/echokit_web.html" style="padding: 12px 24px; background: linear-gradient(135deg, #0688d4 0%, #a108b2 100%); color: white; text-decoration: none; border-radius: 50px; font-weight: 600; transition: all 0.3s; display: inline-block;">
+                <a href="https://funvoice.echokit.dev/" style="padding: 12px 24px; background: linear-gradient(135deg, #0688d4 0%, #a108b2 100%); color: white; text-decoration: none; border-radius: 50px; font-weight: 600; transition: all 0.3s; display: inline-block;">
                     Chat now →
                 </a>
             </div>
diff --git a/echokit_diy.html b/echokit_diy.html
index 04f8dcc..adf4006 100644
--- a/echokit_diy.html
+++ b/echokit_diy.html
@@ -768,7 +768,7 @@ <h1>EchoKit: Educational Voice AI Toolkit for Students and Builders</h1>
                     <a href="https://pay.x402labs.dev/echokit_diy" 
                        class="cta-button" 
                        onclick="trackInitiateCheckout(event)">Pay with USDC</a>
-                    <a href="/docs/quick-start" target="_blank" class="cta-button cta-secondary">Quick start</a>
+                    <a href="/docs/get-started/echokit-diy" target="_blank" class="cta-button cta-secondary">Quick start</a>
                 </div>
             </div>
 
diff --git a/index.html b/index.html
index 90c7fa2..f13a483 100644
--- a/index.html
+++ b/index.html
@@ -841,7 +841,7 @@
                     <a href="#features">Features</a>
                     <a href="#benefits">Benefits</a>
                     <a href="#opensource">Open Source</a>
-                    <a href="https://echokit.dev/docs/quick-start">Get started</a>
+                    <a href="https://echokit.dev/docs/category/quick-start">Get started</a>
                 </div>
             </nav>
         </header>