diff --git a/src/components/Event/Container.tsx b/src/components/Event/Container.tsx
index e8b0816..8a8c313 100644
--- a/src/components/Event/Container.tsx
+++ b/src/components/Event/Container.tsx
@@ -116,6 +116,7 @@ const Container: React.FC<Props> = ({ events, faculty }) => {
             {(selectedFaculty !== 0 || searchQuery !== "") && (
               <motion.button
                 className="group absolute right-0 flex items-center justify-center p-2 text-center"
+                key="clear"
                 onClick={handleClear}
                 initial={{ opacity: 0, x: 0 }}
                 animate={{ opacity: 1, x: "30%" }}
diff --git a/src/components/Faculties/Selector.tsx b/src/components/Faculties/Selector.tsx
index c4e0c43..18471b0 100644
--- a/src/components/Faculties/Selector.tsx
+++ b/src/components/Faculties/Selector.tsx
@@ -49,6 +49,7 @@ const Selector: FC<Props> = ({
               <motion.button
                 className="group absolute right-0 flex items-center justify-center p-2 text-center"
                 onClick={handleClear}
+                key="clear"
                 initial={{ x: 0 }}
                 animate={{ x: "100%" }}
                 exit={{ x: 0 }}
diff --git a/src/components/Nav.tsx b/src/components/Nav.tsx
index bb7918b..12b9840 100644
--- a/src/components/Nav.tsx
+++ b/src/components/Nav.tsx
@@ -72,12 +72,13 @@ const Nav = () => {
         </span>
         <div className="hidden gap-6 font-semibold md:flex">
           {links.map((link) => {
-            const path = link === "Home" ? "/" : "/" + link.toLowerCase();
-            const isCurrentPath = path === window.location.pathname;
+            const path = link === "Home" ? "" : link.toLowerCase();
+            const isCurrentPath =
+              path === window.location.pathname.replaceAll("/", "");
             return (
               <a
                 key={link}
-                href={path}
+                href={"/" + path}
                 className={clsx(
                   "capitalize text-white underline-offset-2 hover:underline",
                   isCurrentPath && "underline"
@@ -112,6 +113,7 @@ const Nav = () => {
               initial="initial"
               animate="animate"
               exit="initial"
+              key="overlay"
               transition={{
                 delayChildren: 0.2,
                 staggerChildren: 0.1,
@@ -122,12 +124,13 @@ const Nav = () => {
             >
               <div className="flex flex-col gap-8 text-center text-xl font-semibold">
                 {links.map((link) => {
-                  const path = link === "Home" ? "/" : "/" + link.toLowerCase();
-                  const isCurrentPath = path === window.location.pathname;
+                  const path = link === "Home" ? "" : link.toLowerCase();
+                  const isCurrentPath =
+                    path === window.location.pathname.replaceAll("/", "");
                   return (
                     <motion.a
                       key={link}
-                      href={path}
+                      href={"/" + path}
                       variants={menuVariants}
                       transition={{
                         type: "spring",