diff --git a/ganesh/locales/br.json b/ganesh/locales/br.json
index 7565cd3..37c2aef 100644
--- a/ganesh/locales/br.json
+++ b/ganesh/locales/br.json
@@ -1,15 +1,18 @@
 {
   "Navbar": {
+    "home": "Início",
     "about": "Sobre Nós",
     "us": "Nossos Valores",
     "institute": "Nosso Instituto",
     "university": "Nossa Universidade",
     "content": "Conteúdo",
+    "all": "Todos",
     "articles": "Artigos",
     "activities": "Atividades",
     "tips": "Dicas",
     "videos": "Vídeos",
-    "news": "Notícias"
+    "news": "Notícias",
+    "language": "Idioma"
   },
   "Home": {
     "extragroup": "Grupo Extracurricular",
diff --git a/ganesh/locales/en.json b/ganesh/locales/en.json
index d86ecda..8aad6f4 100644
--- a/ganesh/locales/en.json
+++ b/ganesh/locales/en.json
@@ -1,15 +1,18 @@
 {
   "Navbar": {
+    "home": "Home",
     "about": "About Us",
     "us": "Core Values",
     "institute": "Our Institute",
     "university": "Our University",
     "content": "Content",
+    "all": "All Content",
     "articles": "Articles",
     "activities": "Activities",
     "tips": "Tips",
     "videos": "Videos",
-    "news": "News"
+    "news": "News",
+    "language": "Language"
   },
   "Home": {
     "extragroup": "Extracurricular Group",
@@ -51,7 +54,7 @@
     "introduction3": "The ICMC's vision is to <span class='terminal'>become a worldwide reference in teaching and research</span> contributing decisively to the evolution of knowledge in its areas of expertise, training high-level human resources and supporting the scientific, technological and social development of the region, state and country.",
     "videoTitle": "Representative Video",
     "historyTitle": "History and Infrastructure",
-    "history1": "Established in <span class='terminal'>1971</span>, the Institute of Computer and Mathematical Sciences (ICMC) at the University of São Paulo (USP) spans 18,000 square meters and serves around 2,000 students across eight undergraduate programs and five graduate courses, supported by approximately 150 faculty members and 120 administrative staff. ICMC students receive a robust education that equips them for successful professional careers.",
+    "history1": "<span class='terminal'>Established in 1971</span>, the Institute of Computer and Mathematical Sciences (ICMC) at the University of São Paulo (USP) spans 18,000 square meters and serves around 2,000 students across eight undergraduate programs and five graduate courses, supported by approximately 150 faculty members and 120 administrative staff. ICMC students receive a robust education that equips them for successful professional careers.",
     "history2": "Globally recognized as a center of excellence, ICMC impacts society by training skilled professionals and engaging in cutting-edge research and community outreach.",
     "history3": "Our modern facilities feature extensive green spaces, a library with about 140,000 volumes and 23,000 electronic journals, and state-of-the-art educational environments, including auditoriums and 24-hour open laboratories. The campus provides high-speed wireless internet throughout. Explore ICMC further through our virtual tour.",
     "history4": "Additionally, the USP campus in São Carlos offers various amenities, such as a restaurant, accommodation, transportation, medical and dental services, a daycare center, and a sports facility.",
diff --git a/ganesh/src/components/navbar.tsx b/ganesh/src/components/navbar.tsx
index 071cec5..b8f3a77 100644
--- a/ganesh/src/components/navbar.tsx
+++ b/ganesh/src/components/navbar.tsx
@@ -10,28 +10,6 @@ import { AnimatePresence, motion } from "framer-motion";
 import { Link as IntlLink } from '@/i18n/navigation';
 import { useLocale, useTranslations } from "next-intl";
 
-const links = [
-  { name: 'Home', href: '/' },
-  { name: 'About Us', href: '/about' },
-  { name: 'Content', href: '/content' },
-  { name: 'News', href: '/news' },
-  { name: 'Language', href: '' },
-];
-
-const aboutSubLinks = [
-  { name: "Core Values", href: "/about" },
-  { name: "Our Institute", href: "/about/institute" },
-  { name: "Our University", href: "/about/university" },
-];
-
-const contentSubLinks = [
-  { name: "All Contents", href: "/content" },
-  { name: "Articles", href: "/content/article" },
-  { name: "Activities", href: "/content/activity" },
-  { name: "Tips :)", href: "/content/tip" },
-  // { name: "Videos", href: "/content/video" },
-];
-
 const languageSubLinks = [
   { name: "pt-BR", href: "" },
   { name: "en-US", href: "" },
@@ -54,6 +32,28 @@ export default function Navbar() {
   const t = useTranslations('Navbar');
   const locale = useLocale();
 
+  const links = [
+    { name: t('home'), href: '/' },
+    { name: t('about'), href: '/about' },
+    { name: t('content'), href: '/content' },
+    { name: t('news'), href: '/news' },
+    { name: t('language'), href: '/language' },
+  ];
+
+  const aboutSubLinks = [
+    { name: t('us'), href: "/about" },
+    { name: t('institute'), href: "/about/institute" },
+    { name: t('university'), href: "/about/university" },
+  ];
+
+  const contentSubLinks = [
+    { name: t('all'), href: "/content" },
+    { name: t('articles'), href: "/content/article" },
+    { name: t('activities'), href: "/content/activity" },
+    { name: t('tips'), href: "/content/tip" },
+    // { name: "Videos", href: "/content/video" },
+  ];
+
   return (
     <>
       {!pathname.includes("/admin") && (
@@ -204,7 +204,7 @@ export default function Navbar() {
                 <div className="flex flex-col space-y-4 p-4">
                   {links.map((link, index) => {
                     // For About Us, render a collapsible submenu.
-                    if (link.name === "About Us") {
+                    if (link.href === "/about") {
                       return (
                         <motion.div
                           key={link.href}
@@ -260,7 +260,7 @@ export default function Navbar() {
                     }
 
                     // For Content, render a collapsible submenu.
-                    else if (link.name === "Content") {
+                    else if (link.href === "/content") {
                       return (
                         <motion.div
                           key={link.href}
@@ -316,7 +316,7 @@ export default function Navbar() {
                     }
 
                     // For Content, render a collapsible submenu.
-                    else if (link.name === "Language") {
+                    else if (link.href === "/language") {
                       return (
                         <motion.div
                           key={link.href}