diff --git a/components/Navbar.tsx b/components/Navbar.tsx
index ab19176..6c9dc0e 100644
--- a/components/Navbar.tsx
+++ b/components/Navbar.tsx
@@ -115,11 +115,13 @@ const Navbar = ({ navData }: NavbarProps) => {
 
           return (
             <ListItem key={data.id} disablePadding>
-              <ListItemButton>
-                <ListItemIcon></ListItemIcon>
-                <Link
-                  href={route}
-                  locale={language}
+              <Link
+                href={route}
+                locale={language}
+                passHref
+                className={styles.nextLink}
+              >
+                <ListItemButton
                   className={
                     route === currentRoute
                       ? styles.navLinkActive
@@ -128,8 +130,8 @@ const Navbar = ({ navData }: NavbarProps) => {
                 >
                   {/* @ts-ignore: Dynamic property access */}
                   {data[`text_${language}`]}
-                </Link>
-              </ListItemButton>
+                </ListItemButton>
+              </Link>
             </ListItem>
           );
         })}
@@ -141,10 +143,12 @@ const Navbar = ({ navData }: NavbarProps) => {
       <List disablePadding>
         {navForMembers.map((data: any) => (
           <ListItem key={data.id} disablePadding>
-            <ListItemButton>
-              <ListItemIcon></ListItemIcon>
-              <Link
-                href={`/${data.text_en.toLowerCase().replace(" ", "-")}`}
+            <Link
+              href={`/${data.text_en.toLowerCase().replace(" ", "-")}`}
+              passHref
+              className={styles.nextLink}
+            >
+              <ListItemButton
                 className={
                   `/${data.text_en.toLowerCase().replace(" ", "-")}` ===
                   currentRoute
@@ -153,8 +157,8 @@ const Navbar = ({ navData }: NavbarProps) => {
                 }
               >
                 {data[`text_${language}`]}
-              </Link>
-            </ListItemButton>
+              </ListItemButton>
+            </Link>
           </ListItem>
         ))}
       </List>
diff --git a/next.config.mjs b/next.config.mjs
index a99d7bd..366c433 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -1,16 +1,10 @@
-const config = async () => {
-  /**
-   * @type {import('next').NextConfig}
-   */
-  const nextConfig = {
-    output: "export",
-    images: {
-      unoptimized: true,
-    },
-    reactStrictMode: true,
-  };
-
-  return nextConfig;
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  output: "export",
+  images: {
+    unoptimized: true,
+  },
+  reactStrictMode: true,
 };
 
-export default config;
+export default nextConfig;
diff --git a/styles/Navbar.module.css b/styles/Navbar.module.css
index db23214..9a13ca0 100644
--- a/styles/Navbar.module.css
+++ b/styles/Navbar.module.css
@@ -18,10 +18,16 @@
   top: 0;
 }
 
+.nextLink {
+  text-decoration: none;
+  width: 100%;
+}
+
 .navLink {
   text-decoration: none;
   font-size: 1.2rem;
   color: var(--black);
+  padding-left: 3rem;
 }
 
 .navLinkActive {
@@ -29,6 +35,7 @@
   font-size: 1.2rem;
   font-weight: 700;
   color: var(--orange200);
+  padding-left: 3rem;
 }
 
 .languageButton {