diff --git a/src/routes/stocks/[tickerID]/+layout.svelte b/src/routes/stocks/[tickerID]/+layout.svelte
index 62ea784a..ebb71656 100644
--- a/src/routes/stocks/[tickerID]/+layout.svelte
+++ b/src/routes/stocks/[tickerID]/+layout.svelte
@@ -804,7 +804,7 @@ function handleTypeOfTrade(state:string)
                               : 'bg-[#09090B]'} mt-1 h-[3px] rounded-full w-[2rem]"
                           />
                         </li>
-                        {#if ["nvda", "aapl", "gme"]?.includes($stockTicker?.toLowerCase())}
+                        {#if ["amd", "save", "ba", "adbe", "nflx", "pltr", "msft", "meta", "tsla", "nvda", "aapl", "gme"]?.includes($stockTicker?.toLowerCase())}
                           <li class="cursor-pointer flex flex-col items-center">
                             <a
                               href={`/stocks/${$stockTicker}/metrics`}
diff --git a/src/routes/stocks/[tickerID]/metrics/+layout.svelte b/src/routes/stocks/[tickerID]/metrics/+layout.svelte
index bd87c9a9..7c523858 100644
--- a/src/routes/stocks/[tickerID]/metrics/+layout.svelte
+++ b/src/routes/stocks/[tickerID]/metrics/+layout.svelte
@@ -11,8 +11,11 @@
     subsectionTitles?.map((title) => {
       const key = title
         ?.toLowerCase()
-        ?.replace(/ & /g, "-")
-        ?.replace(/ /g, "-");
+        ?.replace(/&/g, "") // Remove & symbol
+        ?.replace(/\s+/g, "-") // Replace spaces with dash
+        ?.replace(/-{2,}/g, "-") // Replace multiple dashes with single dash
+        ?.replace(/^-|-$/g, "") // Remove leading/trailing dashes
+        ?.trim();
       return [key, key === "overview" ? "" : key];
     }),
   );
@@ -68,9 +71,12 @@
           >
             {#each subsectionTitles?.slice(0, 4) as title}
               {@const sectionKey = title
-                .toLowerCase()
-                .replace(/ & /g, "-")
-                .replace(/ /g, "-")}
+                ?.toLowerCase()
+                ?.replace(/&/g, "") // Remove & symbol
+                ?.replace(/\s+/g, "-") // Replace spaces with dash
+                ?.replace(/-{2,}/g, "-") // Replace multiple dashes with single dash
+                ?.replace(/^-|-$/g, "") // Remove leading/trailing dashes
+                ?.trim()}
               <li class="cursor-pointer flex flex-col items-center">
                 <a
                   href={getHref(sectionKey)}
diff --git a/src/routes/stocks/[tickerID]/metrics/+page.svelte b/src/routes/stocks/[tickerID]/metrics/+page.svelte
index d3be0256..ff1eb57d 100644
--- a/src/routes/stocks/[tickerID]/metrics/+page.svelte
+++ b/src/routes/stocks/[tickerID]/metrics/+page.svelte
@@ -9,18 +9,21 @@
   export let data;
 
   const names = data?.getBusinessMetrics?.revenue?.names || [];
+
   const subsectionTitles = ["Overview", ...names];
 
   const sectionMap = Object.fromEntries(
     subsectionTitles?.map((title) => {
       const key = title
         ?.toLowerCase()
-        ?.replace(/ & /g, "-")
-        ?.replace(/ /g, "-");
+        ?.replace(/&/g, "") // Remove & symbol
+        ?.replace(/\s+/g, "-") // Replace spaces with dash
+        ?.replace(/-{2,}/g, "-") // Replace multiple dashes with single dash
+        ?.replace(/^-|-$/g, "") // Remove leading/trailing dashes
+        ?.trim();
       return [key, key === "overview" ? "" : key];
     }),
   );
-
   const dataset = data?.getBusinessMetrics?.revenue?.history || [];
 
   const geographicDataset = data?.getBusinessMetrics?.geographic?.history || [];
diff --git a/src/routes/stocks/[tickerID]/metrics/[slug]/+page.svelte b/src/routes/stocks/[tickerID]/metrics/[slug]/+page.svelte
index 3e7119af..31e1c28b 100644
--- a/src/routes/stocks/[tickerID]/metrics/[slug]/+page.svelte
+++ b/src/routes/stocks/[tickerID]/metrics/[slug]/+page.svelte
@@ -18,7 +18,13 @@
 
   const names =
     data?.getBusinessMetrics?.revenue?.names?.map((name) =>
-      name?.toLowerCase()?.replace(/[ &]+/g, "-"),
+      name
+        ?.toLowerCase()
+        ?.replace(/&/g, "") // Remove & symbol
+        ?.replace(/\s+/g, "-") // Replace spaces with dash
+        ?.replace(/-{2,}/g, "-") // Replace multiple dashes with single dash
+        ?.replace(/^-|-$/g, "") // Remove leading/trailing dashes
+        ?.trim(),
     ) || [];
 
   let isLoaded = false;