diff --git a/docs/docs/guides/models/integrate-remote.mdx b/docs/docs/guides/models/integrate-remote.mdx
index 352476e3f..4c48778c5 100644
--- a/docs/docs/guides/models/integrate-remote.mdx
+++ b/docs/docs/guides/models/integrate-remote.mdx
@@ -59,11 +59,12 @@ This guide will show you how to configure Jan as a client and point it to any re
   - `ctx_len`: Defined based on the model's context size.
   - `prompt_template`: Defined based on the model's trained template (e.g., ChatML, Alpaca).
   - To set up the `prompt_template`:
-    1. Visit Hugging Face.
-    2. Locate the model (e.g., [Gemma 7b it](https://huggingface.co/google/gemma-7b-it)).
+    1. Visit [Hugging Face](https://huggingface.co/), an open-source machine learning platform.
+    2. Find the current model that you're using (e.g., [Gemma 7b it](https://huggingface.co/google/gemma-7b-it)).
     3. Review the text and identify the template.
 - In `parameters`, consider the following options. The fields in `parameters` are typically general and can be the same across models. An example is provided below:
 
+
 ```json
 "parameters":{
   "temperature": 0.7,
diff --git a/docs/src/components/HomepagePrimaryFeatures/index.js b/docs/src/components/HomepagePrimaryFeatures/index.js
index 466535107..b06decfb7 100644
--- a/docs/src/components/HomepagePrimaryFeatures/index.js
+++ b/docs/src/components/HomepagePrimaryFeatures/index.js
@@ -12,7 +12,7 @@ export default function HomepagePrimaryFeatures() {
                             <h3>Set up Jan with our guide to install across multiple platform.</h3>
                         </div>
                         <div >
-                            <a href={"/quickstart/install"}>Get Started</a>
+                            <a href={"/guides/install"}>Get Started</a>
                         </div>
                         <div className={styles.cardImage}>
                             <img alt={"Card Image"} src={"/img/homepage-new/rocket.png"} />
@@ -24,7 +24,7 @@ export default function HomepagePrimaryFeatures() {
                             <h3>Explore the available pre-configured AI models. </h3>
                         </div>
                         <div >
-                            <a href={"/quickstart/models-list"}>Support</a>
+                            <a href={"/guides/models-list"}>Support</a>
                         </div>
                         <div className={styles.cardImage}>
                             <img alt={"Card Image"} src={"/img/homepage-new/chat.png"} />
diff --git a/docs/src/components/HomepageSecondaryFeatures/index.js b/docs/src/components/HomepageSecondaryFeatures/index.js
index 95650bf82..9a51624c7 100644
--- a/docs/src/components/HomepageSecondaryFeatures/index.js
+++ b/docs/src/components/HomepageSecondaryFeatures/index.js
@@ -17,7 +17,7 @@ export default function HomepageSecondaryFeatures() {
                             </div>
                         </div>
                         <div className={styles.cardFooter}>
-                            <a href={"/quickstart/"}>Learn Here
+                            <a href={"/guides/"}>Learn Here
                                 {/* <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" fill={"currentColor"}>
                                     <path d="M438.6 278.6c12.5-12.5 12.5-32.8 0-45.3l-160-160c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3L338.8 224 32 224c-17.7 0-32 14.3-32 32s14.3 32 32 32l306.7 0L233.4 393.4c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0l160-160z"/>
                                 </svg> */}
diff --git a/docs/src/components/HomepageTerinaryFeatures/index.js b/docs/src/components/HomepageTerinaryFeatures/index.js
index 44708312e..f7b15a48e 100644
--- a/docs/src/components/HomepageTerinaryFeatures/index.js
+++ b/docs/src/components/HomepageTerinaryFeatures/index.js
@@ -14,9 +14,21 @@ export default function HomepageTerinaryFeatures() {
                         <div className={styles.cardContent}>
                             <p>Dive into the basics and get set up quickly.</p>
                             <ul>
-                                <li>Quickstart</li>
-                                <li>Installation</li>
-                                <li>Pre-configured Models</li>
+                                <li>
+                                    <a href={"/guides/"}>
+                                    Quickstart
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href={"/guides/install/"}>
+                                    Installation
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href={"/guides/models-list/"}>
+                                    Pre-configured Models
+                                    </a>
+                                </li>
                             </ul>
                         </div>
                     </div>
@@ -28,9 +40,21 @@ export default function HomepageTerinaryFeatures() {
                         <div className={styles.cardContent}>
                             <p>Learn the best practices for optimizing thread management and local server use.</p>
                             <ul>
-                                <li>Thread Management</li>
-                                <li>Local Server</li>
-                                <li>Advance Settings</li>
+                                <li>
+                                    <a href={"/guides/start-server/"}>
+                                    Thread Management
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href={"/guides/start-server/"}>
+                                    Local Server
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href={"/guides/advanced-settings/"}>
+                                    Advance Settings
+                                    </a>
+                                </li> 
                             </ul>
                         </div>
                     </div>
@@ -42,9 +66,21 @@ export default function HomepageTerinaryFeatures() {
                         <div className={styles.cardContent}>
                             <p>Explore our key features designed to enhance your experience.</p>
                             <ul>
-                                <li>Advanced Models Setup</li>
-                                <li>Extensions</li>
-                                <li>Integrations</li>
+                                <li>
+                                    <a href={"/category/advanced-models-setup/"}>
+                                    Advanced Models Setup
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href={"/category/extensions/"}>
+                                    Extensions
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href={"/category/integrations/"}>
+                                    Integrations
+                                    </a>
+                                </li> 
                             </ul>
                         </div>
                     </div>
@@ -56,9 +92,21 @@ export default function HomepageTerinaryFeatures() {
                         <div className={styles.cardContent}>
                             <p>Find solutions to common issues, including error codes, frequent errors, and FAQs.</p>
                             <ul>
-                                <li>Error Codes</li>
-                                <li>Common Errors</li>
-                                <li>FAQ</li>
+                                <li>
+                                    <a href={"/category/error-codes/"}>
+                                    Error Codes
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href={"/category/common-error/"}>
+                                    Common Errors
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href={"/category/faq/"}>
+                                    FAQ
+                                    </a>
+                                </li> 
                             </ul>
                         </div>
                     </div>