diff --git a/web/src/components/dashboard/GoogleMap.tsx b/web/src/components/dashboard/GoogleMap.tsx
index 9da6818..88ff8e1 100644
--- a/web/src/components/dashboard/GoogleMap.tsx
+++ b/web/src/components/dashboard/GoogleMap.tsx
@@ -11,6 +11,8 @@ interface GoogleMapProps {
   zoom?: number;
   /** Precision bits used for accuracy calculation */
   precisionBits?: number;
+  /** Whether the map should take all available space (default: false) */
+  fullHeight?: boolean;
 }
 
 /**
@@ -21,6 +23,7 @@ export const GoogleMap: React.FC<GoogleMapProps> = ({
   lng,
   zoom,
   precisionBits,
+  fullHeight = false,
 }) => {
   const mapRef = useRef<HTMLDivElement>(null);
   const mapInstanceRef = useRef<google.maps.Map | null>(null);
@@ -147,11 +150,12 @@ export const GoogleMap: React.FC<GoogleMapProps> = ({
     }
   }, [isGoogleMapsLoaded, lat, lng, effectiveZoom, accuracyMeters, precisionBits]);
 
+  // Prepare the container classes based on fullHeight flag
+  const containerClassName = `w-full ${fullHeight ? 'h-full flex-1' : 'min-h-[300px]'} rounded-lg overflow-hidden effect-inset`;
+
   if (!isGoogleMapsLoaded) {
     return (
-      <div
-        className="w-full h-full min-h-[300px] rounded-lg overflow-hidden effect-inset flex items-center justify-center"
-      >
+      <div className={`${containerClassName} flex items-center justify-center`}>
         <div className="text-gray-400">Loading map...</div>
       </div>
     );
@@ -160,7 +164,7 @@ export const GoogleMap: React.FC<GoogleMapProps> = ({
   return (
     <div
       ref={mapRef}
-      className="w-full h-full min-h-[300px] rounded-lg overflow-hidden effect-inset"
+      className={containerClassName}
     />
   );
 };
diff --git a/web/src/components/dashboard/NetworkMap.tsx b/web/src/components/dashboard/NetworkMap.tsx
index 0b55748..6bfa80f 100644
--- a/web/src/components/dashboard/NetworkMap.tsx
+++ b/web/src/components/dashboard/NetworkMap.tsx
@@ -8,17 +8,19 @@ import { getActivityLevel, getNodeColors, getStatusText, formatLastSeen } from "
 import { GOOGLE_MAPS_ID } from "../../lib/config";
 
 interface NetworkMapProps {
-  /** Height of the map in CSS units */
+  /** Height of the map in CSS units (optional, will use flex-grow by default) */
   height?: string;
   /** Callback for when auto-zoom state changes */
   onAutoZoomChange?: (enabled: boolean) => void;
+  /** Whether the map should take all available space (default: false) */
+  fullHeight?: boolean;
 }
 
 /**
  * NetworkMap displays all nodes with position data on a Google Map
  */
 export const NetworkMap = React.forwardRef<{ resetAutoZoom: () => void }, NetworkMapProps>(
-  ({ height = "600px", onAutoZoomChange }, ref) => {
+  ({ height, fullHeight = false, onAutoZoomChange }, ref) => {
   const navigate = useNavigate();
   const mapRef = useRef<HTMLDivElement>(null);
   const mapInstanceRef = useRef<google.maps.Map | null>(null);
@@ -547,12 +549,21 @@ export const NetworkMap = React.forwardRef<{ resetAutoZoom: () => void }, Networ
     }, 100);
   }
   
+  // Prepare the styling for the map container
+  const mapContainerStyle = {
+    ...(height && !fullHeight ? { height } : {}),
+    ...(fullHeight ? { height: '100%' } : {})
+  };
+  
+  const wrapperClassName = `w-full ${fullHeight ? 'h-full flex flex-col' : ''}`;
+  const mapClassName = `w-full overflow-hidden effect-inset rounded-lg relative ${fullHeight ? 'flex-1' : ''}`;
+
   if (!isGoogleMapsLoaded) {
     return (
-      <div className="w-full">
+      <div className={wrapperClassName}>
         <div 
-          className="w-full overflow-hidden effect-inset rounded-lg relative flex items-center justify-center"
-          style={{ height }}
+          className={`${mapClassName} flex items-center justify-center`}
+          style={mapContainerStyle}
         >
           <div className="text-gray-400">Loading map...</div>
         </div>
@@ -561,11 +572,11 @@ export const NetworkMap = React.forwardRef<{ resetAutoZoom: () => void }, Networ
   }
 
   return (
-    <div className="w-full">
+    <div className={wrapperClassName}>
       <div 
         ref={mapRef} 
-        className="w-full overflow-hidden effect-inset rounded-lg relative"
-        style={{ height }}
+        className={mapClassName}
+        style={mapContainerStyle}
       />
     </div>
   );
diff --git a/web/src/routes/map.tsx b/web/src/routes/map.tsx
index e059cc4..099a26a 100644
--- a/web/src/routes/map.tsx
+++ b/web/src/routes/map.tsx
@@ -24,10 +24,10 @@ function MapPage() {
 
   return (
     <PageWrapper>
-      <div>
-        <div>
+      <div className="flex flex-col h-[calc(100vh-4rem)]">
+        <div className="flex-1 flex flex-col">
           <NetworkMap 
-            height="600px" 
+            fullHeight
             ref={mapRef as any}
             onAutoZoomChange={setAutoZoomEnabled}
           />