diff --git a/src/components/navigation/menu.tsx b/src/components/navigation/menu.tsx
index a5d838d7..a4fc879b 100644
--- a/src/components/navigation/menu.tsx
+++ b/src/components/navigation/menu.tsx
@@ -7,9 +7,62 @@ import Link from 'next/link';
 import Submenu from '@/components/navigation/submenu';
 import TranslationList from '../translation/TranslationList';
 import dynamicWidth from '@/lib/dynamic-width';
-import { useState, Component } from 'react';
+import React, { useState } from 'react';
 import { Chiislate } from '../translation/Chiislate';
 
+interface MenuBarProps {
+  useMobileBar: boolean;
+  useFeaturesBeta: boolean;
+  isDarkHeader: boolean;
+  currentPath: string;
+  onNavigate: (route: string) => void;
+}
+
+const MenuBar: React.FC<MenuBarProps> = ({
+  useMobileBar,
+  useFeaturesBeta,
+  isDarkHeader,
+  currentPath,
+  onNavigate
+}) => {
+  return useMobileBar ? (
+    <div id="navcol-1" className="collapse navbar-collapse">
+      <ul className="navbar-nav ms-auto">
+        <Tabs
+          className={isDarkHeader ? 'header-dark-tabs' : undefined}
+          value={currentPath}
+          hideDivider
+          onChange={onNavigate}
+        >
+          <Tabs.Item label={<Chiislate>Home</Chiislate>} value="/" />
+          <Tabs.Item label={<Chiislate>Features</Chiislate>} value={`/features${useFeaturesBeta ? '-beta' : ''}`} />
+          <Tabs.Item label={<Chiislate>Downloads</Chiislate>} value="/downloads" />
+          <Tabs.Item label={<Chiislate>Support</Chiislate>} value="/support" />
+          <Tabs.Item label={<Chiislate>Docs</Chiislate>} value="/docs" />
+        </Tabs>
+      </ul>
+    </div>
+  ) : (
+    <div id="navcol-1" className="collapse navbar-collapse">
+      <ul className="navbar-nav ms-auto">
+        <Tabs
+          className={isDarkHeader ? 'header-dark-tabs' : undefined}
+          value={currentPath}
+          hideDivider
+          onChange={onNavigate}
+        >
+          <Tabs.Item label={<Chiislate>Home</Chiislate>} value="/" />
+          <Tabs.Item label={<Chiislate>Features</Chiislate>} value={`/features${useFeaturesBeta ? '-beta' : ''}`} />
+          <Tabs.Item label={<Chiislate>Downloads</Chiislate>} value="/downloads" />
+          <Tabs.Item label={<Chiislate>Support</Chiislate>} value="/support" />
+          <Tabs.Item label={<Chiislate>Documentation</Chiislate>} value="/docs" />
+          <Tabs.Item label={<Chiislate>Demo</Chiislate>} value="/demo" />
+        </Tabs>
+      </ul>
+    </div>
+  );
+};
+
 const Menu = () => {
   const theme = useTheme();
   const prefers = usePrefers();
@@ -30,51 +83,19 @@ const Menu = () => {
     document.documentElement.classList.toggle('scroll-light', theme.type === 'dark');
   };
 
-  const themeDark = () => {
-    if (theme.type === 'dark' && router.pathname == '/') return true;
-    else return false;
-  };
+  const isDarkHeader = theme.type === 'dark' && router.pathname === '/';
+
+  const menuBarElement = (
+    <MenuBar
+      key={`${useMobileBar}-${useFeaturesBeta}`}
+      useMobileBar={useMobileBar}
+      useFeaturesBeta={useFeaturesBeta}
+      isDarkHeader={isDarkHeader}
+      currentPath={router.asPath}
+      onNavigate={(route) => router.push(route)}
+    />
+  );
 
-  class MenuBar extends Component {
-    render() {
-      return useMobileBar ? (
-        <div id="navcol-1" className="collapse navbar-collapse">
-          <ul className="navbar-nav ms-auto">
-            <Tabs
-              className={`${themeDark() ? 'header-dark-tabs' : null}`}
-              value={router.asPath}
-              hideDivider
-              onChange={(route) => router.push(route)}
-            >
-              <Tabs.Item label={<Chiislate>Home</Chiislate>} value="/" />
-              <Tabs.Item label={<Chiislate>Features</Chiislate>} value={`/features${useFeaturesBeta ? '-beta' : ''}`} />
-              <Tabs.Item label={<Chiislate>Downloads</Chiislate>} value="/downloads" />
-              <Tabs.Item label={<Chiislate>Support</Chiislate>} value="/support" />
-              <Tabs.Item label={<Chiislate>Docs</Chiislate>} value="/docs" />
-            </Tabs>
-          </ul>
-        </div>
-      ) : (
-        <div id="navcol-1" className="collapse navbar-collapse">
-          <ul className="navbar-nav ms-auto">
-            <Tabs
-              className={`${themeDark() ? 'header-dark-tabs' : null}`}
-              value={router.asPath}
-              hideDivider
-              onChange={(route) => router.push(route)}
-            >
-              <Tabs.Item label={<Chiislate>Home</Chiislate>} value="/" />
-              <Tabs.Item label={<Chiislate>Features</Chiislate>} value={`/features${useFeaturesBeta ? '-beta' : ''}`} />
-              <Tabs.Item label={<Chiislate>Downloads</Chiislate>} value="/downloads" />
-              <Tabs.Item label={<Chiislate>Support</Chiislate>} value="/support" />
-              <Tabs.Item label={<Chiislate>Documentation</Chiislate>} value="/docs" />
-              <Tabs.Item label={<Chiislate>Demo</Chiislate>} value="/demo" />
-            </Tabs>
-          </ul>
-        </div>
-      );
-    }
-  }
   return (
     <>
       <nav
@@ -87,7 +108,7 @@ const Menu = () => {
             <span className="navbar-toggler-icon"></span>
           </button>
           <Logo />
-          {useAltMenuPosition ? null : <MenuBar />}
+          {useAltMenuPosition ? null : menuBarElement}
           <Button
             aria-label="Toggle dark mode"
             className="theme-button"
@@ -107,7 +128,7 @@ const Menu = () => {
               iconRight={<Download className="theme-buttonicon" size={16} />}
             ></Button>
           </Link>
-          {!useAltMenuPosition ? null : <MenuBar />}
+          {!useAltMenuPosition ? null : menuBarElement}
         </div>
       </nav>
       <Submenu />
@@ -128,6 +149,7 @@ const Menu = () => {
         background: rgba(0, 0, 0, 0.2) !important;
         -webkit-backdrop-filter: blur(2rem);
         padding-right: 6px !important;
+      }
     `}</style>
     </>
   );
diff --git a/src/lib/dynamic-width.ts b/src/lib/dynamic-width.ts
index 9ad6259a..49f2508f 100644
--- a/src/lib/dynamic-width.ts
+++ b/src/lib/dynamic-width.ts
@@ -4,18 +4,29 @@
  * @license GPL-3.0
  */
 
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 
 /**
  * An easy to use hook for dynamically changing DOM based on window size, fires on page load and resize
  * @param {hookCallback} callback - Callback function for hook
  */
 const hook = (callback: (width: number) => void) => {
+  const savedCallback = useRef(callback);
+
+  useEffect(() => {
+    savedCallback.current = callback;
+  }, [callback]);
+
   useEffect(() => {
-    window.addEventListener('resize', () => {
-      callback(window.innerWidth);
-    });
-    callback(window.innerWidth);
+    const handleResize = () => {
+      savedCallback.current(window.innerWidth);
+    };
+
+    handleResize();
+    window.addEventListener('resize', handleResize);
+    return () => {
+      window.removeEventListener('resize', handleResize);
+    };
   }, []);
 };
 
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index e4116051..3a65c9ae 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -66,7 +66,6 @@ const App = ({ Component, pageProps }: AppProps) => {
         crossOrigin="anonymous"
         referrerPolicy="no-referrer"
       ></script>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
     </>
   );
 };