Consolidate forms & other minor fixes

src/App.tsx

@@ -1,12 +1,11 @@
 import type React from 'react';
 
-import { Map } from '@app/pages/Map';
 import { Connection } from '@components/Connection';
-import { ContextMenu } from '@components/generic/ContextMenu';
 import { BottomNav } from '@components/menu/BottomNav';
 import { useRoute } from '@core/router';
 import { useAppSelector } from '@hooks/useAppSelector';
 import { Extensions } from '@pages/Extensions/Index';
+import { Map } from '@pages/Map';
 import { Messages } from '@pages/Messages';
 import { Nodes } from '@pages/Nodes';
 import { NotFound } from '@pages/NotFound';
@@ -17,19 +16,17 @@ export const App = (): JSX.Element => {
 
   return (
     <div className={`h-screen w-screen ${appState.darkMode ? 'dark' : ''}`}>
-      <ContextMenu>
-        <Connection />
-        <div className="flex h-full flex-col">
-          <div className="flex min-h-0 w-full flex-grow">
-            {route.name === 'messages' && <Messages />}
-            {route.name === 'nodes' && <Nodes />}
-            {route.name === 'map' && <Map />}
-            {route.name === 'extensions' && <Extensions />}
-            {route.name === false && <NotFound />}
-          </div>
-          <BottomNav />
+      <Connection />
+      <div className="flex h-full flex-col">
+        <div className="flex min-h-0 w-full flex-grow">
+          {route.name === 'messages' && <Messages />}
+          {route.name === 'nodes' && <Nodes />}
+          {route.name === 'map' && <Map />}
+          {route.name === 'extensions' && <Extensions />}
+          {route.name === false && <NotFound />}
         </div>
-      </ContextMenu>
+        <BottomNav />
+      </div>
     </div>
   );
 };