diff --git a/next.config.js b/next.config.js
index 13eecea..1016eba 100755
--- a/next.config.js
+++ b/next.config.js
@@ -18,7 +18,6 @@ module.exports = withPlausibleProxy()({
   },
 });
 
-
 // Injected content via Sentry wizard below
 
 const { withSentryConfig } = require("@sentry/nextjs");
@@ -53,5 +52,5 @@ module.exports = withSentryConfig(
 
     // Automatically tree-shake Sentry logger statements to reduce bundle size
     disableLogger: true,
-  }
+  },
 );
diff --git a/src/app/[[...locale]]/page.tsx b/src/app/[[...locale]]/page.tsx
index 1e5cb44..4303703 100644
--- a/src/app/[[...locale]]/page.tsx
+++ b/src/app/[[...locale]]/page.tsx
@@ -13,7 +13,7 @@ export const metadata: Metadata = {
     title: "Srimad Bhagavad Gita - Free Searchable Online Bhagwat Geeta",
     description:
       "Bhagwat Geeta in Hindi and English. Read Bhagavad Gita online in a simple, beautiful and easy-to-use interface; Gita Saar In Hindi; Bhagavad Gita quotes.",
-    url: "https://bhagavadgita.io/",
+    url: "https://bhagavadgita.io",
     siteName: "Bhagavad Gita",
     images: "https://bhagavadgita.io/static/images/sribhagavadgita.jpg",
     locale: "en_US",
@@ -36,13 +36,13 @@ export const metadata: Metadata = {
   },
   alternates: {
     languages: {
-      en: "https://bhagavadgita.io/",
-      "en-US": "https://bhagavadgita.io/",
-      "en-GB": "https://bhagavadgita.io/",
-      "en-IN": "https://bhagavadgita.io/",
-      hi: "https://bhagavadgita.io/hi/",
+      en: "https://bhagavadgita.io",
+      "en-US": "https://bhagavadgita.io",
+      "en-GB": "https://bhagavadgita.io",
+      "en-IN": "https://bhagavadgita.io",
+      hi: "https://bhagavadgita.io/hi",
     },
-    canonical: "https://bhagavadgita.io/",
+    canonical: "https://bhagavadgita.io",
   },
 };
 
diff --git a/src/app/about/[[...locale]]/constants.ts b/src/app/about/[[...locale]]/constants.ts
index d3bdf5a..ea0e12a 100644
--- a/src/app/about/[[...locale]]/constants.ts
+++ b/src/app/about/[[...locale]]/constants.ts
@@ -23,7 +23,7 @@ export const jsonLdTwo = {
       "@type": "ListItem",
       position: 2,
       item: {
-        "@id": "https://bhagavadgita.io/about/",
+        "@id": "https://bhagavadgita.io/about",
         name: "What is The Bhagavad Gita -  BhagavadGita.io",
       },
     },
diff --git a/src/app/about/[[...locale]]/page.tsx b/src/app/about/[[...locale]]/page.tsx
index ebec129..2642abf 100644
--- a/src/app/about/[[...locale]]/page.tsx
+++ b/src/app/about/[[...locale]]/page.tsx
@@ -14,7 +14,7 @@ export const metadata: Metadata = {
     title: "Srimad Bhagavad Gita - Free Searchable Online Bhagwat Geeta",
     description:
       "Bhagavad Gita, also known as the Gita - the song of lord is a practical guide to one's life that guides one re-organise their life, achieve inner peace and approach supreme lord (the ultimate reality).",
-    url: "https://bhagavadgita.io/about/",
+    url: "https://bhagavadgita.io/about",
     siteName: "Bhagavad Gita",
     images: "https://bhagavadgita.io/static/images/sribhagavadgita.jpg",
     locale: "en_US",
@@ -29,7 +29,7 @@ export const metadata: Metadata = {
     site: "@ShriKrishna",
   },
   alternates: {
-    canonical: "https://bhagavadgita.io/about/",
+    canonical: "https://bhagavadgita.io/about",
   },
 };
 
diff --git a/src/app/acknowledgements/[[...locale]]/constants.ts b/src/app/acknowledgements/[[...locale]]/constants.ts
index 243829f..40106d9 100644
--- a/src/app/acknowledgements/[[...locale]]/constants.ts
+++ b/src/app/acknowledgements/[[...locale]]/constants.ts
@@ -23,7 +23,7 @@ export const jsonLdTwo = {
       "@type": "ListItem",
       position: 2,
       item: {
-        "@id": "https://bhagavadgita.io/acknowledgements/",
+        "@id": "https://bhagavadgita.io/acknowledgements",
         name: "Acknowledgements -  BhagavadGita.io",
       },
     },
diff --git a/src/app/acknowledgements/[[...locale]]/page.tsx b/src/app/acknowledgements/[[...locale]]/page.tsx
index f2fe0fb..6248a20 100644
--- a/src/app/acknowledgements/[[...locale]]/page.tsx
+++ b/src/app/acknowledgements/[[...locale]]/page.tsx
@@ -14,7 +14,7 @@ export const metadata: Metadata = {
     title: "Acknowledgements - Featured Bhagavad Gita Translations",
     description:
       "We extend our heartfelt gratitude to esteemed organizations and individuals for allowing us to feature their invaluable Bhagavad Gita translations and commentaries.",
-    url: "https://bhagavadgita.io/acknowledgements/",
+    url: "https://bhagavadgita.io/acknowledgements",
     siteName: "Bhagavad Gita",
     images: "https://bhagavadgita.io/static/images/sribhagavadgita.jpg",
     locale: "en_US",
@@ -29,7 +29,7 @@ export const metadata: Metadata = {
     site: "@ShriKrishna",
   },
   alternates: {
-    canonical: "https://bhagavadgita.io/acknowledgements/",
+    canonical: "https://bhagavadgita.io/acknowledgements",
   },
 };
 
diff --git a/src/app/quotes/[[...locale]]/QuotesPage.tsx b/src/app/bhagavad-gita-quotes/[[...locale]]/QuotesPage.tsx
similarity index 100%
rename from src/app/quotes/[[...locale]]/QuotesPage.tsx
rename to src/app/bhagavad-gita-quotes/[[...locale]]/QuotesPage.tsx
diff --git a/src/app/quotes/[[...locale]]/constants.ts b/src/app/bhagavad-gita-quotes/[[...locale]]/constants.ts
similarity index 99%
rename from src/app/quotes/[[...locale]]/constants.ts
rename to src/app/bhagavad-gita-quotes/[[...locale]]/constants.ts
index 26231e2..bb38836 100644
--- a/src/app/quotes/[[...locale]]/constants.ts
+++ b/src/app/bhagavad-gita-quotes/[[...locale]]/constants.ts
@@ -127,7 +127,7 @@ export const jsonLdTwo = {
       "@type": "ListItem",
       position: 2,
       item: {
-        "@id": "https://bhagavadgita.io/bhagavad-gita-quotes/",
+        "@id": "https://bhagavadgita.io/bhagavad-gita-quotes",
         name: "Bhagavad Gita Quotes",
       },
     },
diff --git a/src/app/quotes/[[...locale]]/layout.tsx b/src/app/bhagavad-gita-quotes/[[...locale]]/layout.tsx
similarity index 100%
rename from src/app/quotes/[[...locale]]/layout.tsx
rename to src/app/bhagavad-gita-quotes/[[...locale]]/layout.tsx
diff --git a/src/app/quotes/[[...locale]]/page.tsx b/src/app/bhagavad-gita-quotes/[[...locale]]/page.tsx
similarity index 93%
rename from src/app/quotes/[[...locale]]/page.tsx
rename to src/app/bhagavad-gita-quotes/[[...locale]]/page.tsx
index a173e6f..d2feb53 100644
--- a/src/app/quotes/[[...locale]]/page.tsx
+++ b/src/app/bhagavad-gita-quotes/[[...locale]]/page.tsx
@@ -14,7 +14,7 @@ export const metadata: Metadata = {
     title: "Bhagavad Gita Quotes By Krishna - BhagavadGita.io",
     description:
       "100+ Bhagavad Gita Quotes spoken by Lord Krishna in the Bhagavad Gita to Arjuna on the battlefield of the Kurukshetra.",
-    url: "https://bhagavadgita.io/about/",
+    url: "https://bhagavadgita.io/bhagavad-gita-quotes",
     siteName: "Bhagavad Gita",
     images: "https://bhagavadgita.io/static/images/sribhagavadgita.jpg",
     locale: "en_US",
@@ -27,7 +27,7 @@ export const metadata: Metadata = {
     site: "@ShriKrishna",
   },
   alternates: {
-    canonical: "https://bhagavadgita.io/bhagavad-gita-quotes/",
+    canonical: "https://bhagavadgita.io/bhagavad-gita-quotes",
   },
 };
 
diff --git a/src/app/chapter/[chapterNumber]/(chapter)/[[...locale]]/functions.ts b/src/app/chapter/[chapterNumber]/(chapter)/[[...locale]]/functions.ts
index b8d35cc..fcfb26b 100644
--- a/src/app/chapter/[chapterNumber]/(chapter)/[[...locale]]/functions.ts
+++ b/src/app/chapter/[chapterNumber]/(chapter)/[[...locale]]/functions.ts
@@ -14,7 +14,7 @@ export const getJsonLd = (chapterNumber: string, nameTranslated?: string) => ({
       "@type": "ListItem",
       position: 2,
       item: {
-        "@id": `https://bhagavadgita.io/chapter/${chapterNumber}/`,
+        "@id": `https://bhagavadgita.io/chapter/${chapterNumber}`,
         name: `Bhagavad Gita Chapter ${chapterNumber} - ${nameTranslated}`,
         image: "https://bhagavadgita.io/static/images/sribhagavadgita.jpg",
       },
diff --git a/src/app/chapter/[chapterNumber]/(chapter)/[[...locale]]/page.tsx b/src/app/chapter/[chapterNumber]/(chapter)/[[...locale]]/page.tsx
index e7f8e9d..b7031ce 100644
--- a/src/app/chapter/[chapterNumber]/(chapter)/[[...locale]]/page.tsx
+++ b/src/app/chapter/[chapterNumber]/(chapter)/[[...locale]]/page.tsx
@@ -38,7 +38,7 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
       siteName: "Bhagavad Gita",
       locale: "en_US",
       type: "article",
-      authors: "https://www.facebook.com/radhakrishnablog/",
+      authors: "https://www.facebook.com/iiRadhaKrishnaii/",
       tags: ["Krishna", "Bhagavad Gita", "Bhagwad Gita"],
       section: "Bhagavad Gita",
       title: `Bhagavad Gita Chapter ${chapterNumber} - ${chapterData.gita_chapters_by_pk.name_translated} - BhagavadGita.io`,
@@ -62,13 +62,13 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
     },
     alternates: {
       languages: {
-        en: `https://bhagavadgita.io/chapter/${chapterNumber}/`,
-        "en-US": `https://bhagavadgita.io/chapter/${chapterNumber}/`,
-        "en-GB": `https://bhagavadgita.io/chapter/${chapterNumber}/`,
-        "en-IN": `https://bhagavadgita.io/chapter/${chapterNumber}/`,
+        en: `https://bhagavadgita.io/chapter/${chapterNumber}`,
+        "en-US": `https://bhagavadgita.io/chapter/${chapterNumber}`,
+        "en-GB": `https://bhagavadgita.io/chapter/${chapterNumber}`,
+        "en-IN": `https://bhagavadgita.io/chapter/${chapterNumber}`,
         hi: `https://bhagavadgita.io/chapter/${chapterNumber}/hi`,
       },
-      canonical: `https://bhagavadgita.io/chapter/${chapterNumber}/`,
+      canonical: `https://bhagavadgita.io/chapter/${chapterNumber}`,
     },
   };
 }
diff --git a/src/app/chapter/[chapterNumber]/verse/[verseNumber]/[[...locale]]/functions.ts b/src/app/chapter/[chapterNumber]/verse/[verseNumber]/[[...locale]]/functions.ts
index 1dea1ed..c1434d2 100644
--- a/src/app/chapter/[chapterNumber]/verse/[verseNumber]/[[...locale]]/functions.ts
+++ b/src/app/chapter/[chapterNumber]/verse/[verseNumber]/[[...locale]]/functions.ts
@@ -23,7 +23,7 @@ export const getJsonLd = (chapterNumber: string, verseNumber: string) => ({
       "@type": "ListItem",
       position: 3,
       item: {
-        "@id": `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}/`,
+        "@id": `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}`,
         name: `Bhagavad Gita Chapter ${chapterNumber} Verse ${verseNumber}`,
         image: "https://bhagavadgita.io/static/images/sribhagavadgita.jpg",
       },
diff --git a/src/app/chapter/[chapterNumber]/verse/[verseNumber]/[[...locale]]/page.tsx b/src/app/chapter/[chapterNumber]/verse/[verseNumber]/[[...locale]]/page.tsx
index 44f1b43..a586437 100644
--- a/src/app/chapter/[chapterNumber]/verse/[verseNumber]/[[...locale]]/page.tsx
+++ b/src/app/chapter/[chapterNumber]/verse/[verseNumber]/[[...locale]]/page.tsx
@@ -25,7 +25,7 @@ export async function generateMetadata({
   return {
     title: `Bhagavad Gita Chapter ${chapterNumber} Verse ${verseNumber} - BhagavadGita.io`,
     openGraph: {
-      url: `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}/`,
+      url: `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}`,
       siteName: "Bhagavad Gita",
       locale: "en_US",
       type: "article",
@@ -51,13 +51,13 @@ export async function generateMetadata({
     },
     alternates: {
       languages: {
-        en: `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}/`,
-        "en-US": `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}/`,
-        "en-GB": `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}/`,
-        "en-IN": `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}/`,
+        en: `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}`,
+        "en-US": `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}`,
+        "en-GB": `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}`,
+        "en-IN": `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}`,
         hi: `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}/hi`,
       },
-      canonical: `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}/`,
+      canonical: `https://bhagavadgita.io/chapter/${chapterNumber}/verse/${verseNumber}`,
     },
   };
 }
diff --git a/src/app/privacy-policy/[[...locale]]/page.tsx b/src/app/privacy-policy/[[...locale]]/page.tsx
index 76ebe40..07e42ea 100644
--- a/src/app/privacy-policy/[[...locale]]/page.tsx
+++ b/src/app/privacy-policy/[[...locale]]/page.tsx
@@ -116,11 +116,11 @@ export default function PrivacyPolicy() {
                 <strong>Website</strong> refers to BhagavadGita.io, accessible
                 from{" "}
                 <a
-                  href="https://bhagavadgita.io/"
+                  href="https://bhagavadgita.io"
                   rel="external nofollow noopener"
                   target="_blank"
                 >
-                  https://bhagavadgita.io/
+                  https://bhagavadgita.io
                 </a>
               </p>
             </li>
diff --git a/src/components/Headers/IndexHeader.tsx b/src/components/Headers/IndexHeader.tsx
index 0be71aa..258b7fe 100644
--- a/src/components/Headers/IndexHeader.tsx
+++ b/src/components/Headers/IndexHeader.tsx
@@ -109,7 +109,7 @@ const chapters = [
 ];
 
 const mobileNav = [
-  { name: "Quotes", href: "/quotes", current: false },
+  { name: "Quotes", href: "/bhagavad-gita-quotes", current: false },
   { name: "About Gita", href: "/about", current: false },
 ];
 
@@ -225,7 +225,7 @@ export default function IndexHeader({ locale, translate }: Props) {
                 )}
               </Popover>
               <LinkWithLocale
-                href="/quotes"
+                href="/bhagavad-gita-quotes"
                 className="text-base font-medium text-black hover:text-gray-500 focus:outline-none dark:text-white"
               >
                 {translate("Quotes")}