diff --git a/_about/index.md b/_about/index.md
index abe0f662..25cbe8b6 100644
--- a/_about/index.md
+++ b/_about/index.md
@@ -5,11 +5,11 @@ nav_order: 1
 has_children: false
 has_toc: false
 nav_exclude: true
+permalink: /about/
 redirect_from:
   - /docs/opensearch/
   - /opensearch/
   - /opensearch/index/
-  - /about/
 ---
 
 {%- comment -%}The `/docs/opensearch/` redirect is specifically to support the UI links in OpenSearch Dashboards 1.0.0.{%- endcomment -%}
@@ -20,7 +20,7 @@ This section contains documentation for OpenSearch and OpenSearch Dashboards.
 
 ## Getting started
 
-- [Intro to OpenSearch]({{site.url}}{{site.baseurl}}/about/intro/)
+- [Intro to OpenSearch]({{site.url}}{{site.baseurl}}/intro/)
 - [Quickstart]({{site.url}}{{site.baseurl}}/quickstart/)
 - [Install OpenSearch]({{site.url}}{{site.baseurl}}/install-and-configure/install-opensearch/index/)
 - [Install OpenSearch Dashboards]({{site.url}}{{site.baseurl}}/install-and-configure/install-dashboards/index/)
diff --git a/_about/intro.md b/_about/intro.md
index 011093e8..40abe68d 100644
--- a/_about/intro.md
+++ b/_about/intro.md
@@ -2,6 +2,7 @@
 layout: default
 title: Intro to OpenSearch
 nav_order: 2
+permalink: /intro/
 ---
 
 # Introduction to OpenSearch
diff --git a/_about/quickstart.md b/_about/quickstart.md
index 8b693645..851293f5 100644
--- a/_about/quickstart.md
+++ b/_about/quickstart.md
@@ -2,9 +2,9 @@
 layout: default
 title: Quickstart
 nav_order: 3
+permalink: /quickstart/
 redirect_from: 
   - /opensearch/install/quickstart/
-  - /quickstart/
 ---
 
 # Quickstart
diff --git a/_im-plugin/ism/policies.md b/_im-plugin/ism/policies.md
index e892baf4..2b9ec15a 100644
--- a/_im-plugin/ism/policies.md
+++ b/_im-plugin/ism/policies.md
@@ -168,7 +168,7 @@ Parameter | Description | Type | Required
 }
 ```
 
-For information about setting replicas, see [Primary and replica shards]({{site.url}}{{site.baseurl}}/about/intro/#primary-and-replica-shards).
+For information about setting replicas, see [Primary and replica shards]({{site.url}}{{site.baseurl}}/intro/#primary-and-replica-shards).
 
 ### shrink
 
diff --git a/_includes/cards.html b/_includes/cards.html
index b2332f62..f5f2c960 100644
--- a/_includes/cards.html
+++ b/_includes/cards.html
@@ -10,14 +10,14 @@
   
   
     <div class="card">
-      <a href="{{site.url}}{{site.baseurl}}/data-prepper/" class='card-link'></a>
+      <a href="{{site.url}}/docs/latest/data-prepper/" class='card-link'></a>
         <p class="heading">Data Prepper</p>
         <p class="description">Prepare your data for OpenSearch</p>
         <button class="last-link" >Documentation &#x2192;</button>
       </div>
   
     <div class="card">
-      <a href="{{site.url}}{{site.baseurl}}/clients/" class='card-link'></a>
+      <a href="{{site.url}}/docs/latest/clients/" class='card-link'></a>
         <p class="heading">Clients</p>
         <p class="description">OpenSearch in your programming language</p>
         <button class="last-link">Documentation &#x2192;</button>
@@ -25,7 +25,7 @@
   
     
     <div class="card">
-      <a href="{{site.url}}{{site.baseurl}}/benchmark/" class='card-link'></a>
+      <a href="{{site.url}}/docs/latest/benchmark/" class='card-link'></a>
         <p class="heading">Benchmark</p>
         <p class="description">Track OpenSearch performance</p>
         <button class="last-link">Documentation &#x2192;</button>
diff --git a/_layouts/default.html b/_layouts/default.html
index be4f224a..cec74cae 100755
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -64,7 +64,7 @@ layout: table_wrappers
             <a href="{{site.url}}{{site.baseurl}}/{{ page.section}}/" class="site-category">{{ page.section-name }}</a>
           {% endif %}
           
-          <a href="{{site.url}}{{site.baseurl}}/" class="back-link">&#x2190; Back to docs home</a>
+          <a href="{{site.url}}/docs/latest/" class="back-link">&#x2190; Back to docs home</a>
           
           {% if page.section == "opensearch" %}
             <version-selector selected="{{ site.data.versions.current }}"></version-selector>
diff --git a/_search-plugins/knn/performance-tuning.md b/_search-plugins/knn/performance-tuning.md
index 26dc2b21..d2cf3c77 100644
--- a/_search-plugins/knn/performance-tuning.md
+++ b/_search-plugins/knn/performance-tuning.md
@@ -99,4 +99,4 @@ The default parameters work on a broader set of use cases, but make sure to run
 
 The standard k-NN query and custom scoring option perform differently. Test with a representative set of documents to see if the search results and latencies match your expectations.
 
-Custom scoring works best if the initial filter reduces the number of documents to no more than 20,000. Increasing shard count can improve latency, but be sure to keep shard size within the [recommended guidelines]({{site.url}}{{site.baseurl}}/about/intro/#primary-and-replica-shards).
+Custom scoring works best if the initial filter reduces the number of documents to no more than 20,000. Increasing shard count can improve latency, but be sure to keep shard size within the [recommended guidelines]({{site.url}}{{site.baseurl}}/intro/#primary-and-replica-shards).