diff --git a/ui/src/components/Metars/MapTiles.tsx b/ui/src/components/Metars/MapTiles.tsx
index e1a490b..49ad0ed 100644
--- a/ui/src/components/Metars/MapTiles.tsx
+++ b/ui/src/components/Metars/MapTiles.tsx
@@ -14,6 +14,7 @@ export default function MapTiles() {
   const [isOpen, setIsOpen] = useState(false);
   const [airports, setAirports] = useState<Airport[]>([]);
   const [selectedAirport, setSelectedAirport] = useState<Airport | undefined>();
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [zoomLevel, setZoomLevel] = useState(8);
   // const [dragging, setDragging] = useState(false);
   const map = useMap();
@@ -59,70 +60,29 @@ export default function MapTiles() {
     setAirports(_airports);
   }
 
-  function iconSize() {
-    if (zoomLevel <= 5) {
-      return 'xs';
-    } else {
-      return 'sm';
-    }
-  }
-
   function metarIcon(airport: Airport) {
+    function innerIcon({ tag, color, size = 'sm' }: { tag: string; color: string; size?: string }) {
+      return new DivIcon({
+        html: ReactDOMServer.renderToString(
+          <MantineProvider>
+            <Avatar variant='filled' color={color} radius='xl' size={size}>
+              {tag}
+            </Avatar>
+          </MantineProvider>
+        ),
+        className: 'metar-marker-icon'
+      });
+    }
     if (airport.metar?.flight_category == 'VFR') {
-      return new DivIcon({
-        html: ReactDOMServer.renderToString(
-          <MantineProvider>
-            <Avatar variant='filled' color='green' radius='xl' size={iconSize()}>
-              V
-            </Avatar>
-          </MantineProvider>
-        ),
-        className: 'metar-marker-icon'
-      });
+      return innerIcon({ tag: 'V', color: 'green' });
     } else if (airport.metar?.flight_category == 'MVFR') {
-      return new DivIcon({
-        html: ReactDOMServer.renderToString(
-          <MantineProvider>
-            <Avatar variant='filled' color='blue' radius='xl' size={iconSize()}>
-              M
-            </Avatar>
-          </MantineProvider>
-        ),
-        className: 'metar-marker-icon'
-      });
+      return innerIcon({ tag: 'M', color: 'blue' });
     } else if (airport.metar?.flight_category == 'IFR') {
-      return new DivIcon({
-        html: ReactDOMServer.renderToString(
-          <MantineProvider>
-            <Avatar variant='filled' color='red' radius='xl' size={iconSize()}>
-              I
-            </Avatar>
-          </MantineProvider>
-        ),
-        className: 'metar-marker-icon'
-      });
+      return innerIcon({ tag: 'I', color: 'red' });
     } else if (airport.metar?.flight_category == 'LIFR') {
-      return new DivIcon({
-        html: ReactDOMServer.renderToString(
-          <MantineProvider>
-            <Avatar variant='filled' color='purple' radius='xl' size={iconSize()}>
-              L
-            </Avatar>
-          </MantineProvider>
-        ),
-        className: 'metar-marker-icon'
-      });
+      return innerIcon({ tag: 'L', color: 'purple' });
     } else {
-      return new DivIcon({
-        html: ReactDOMServer.renderToString(
-          <MantineProvider>
-            <Avatar variant='filled' color='black' radius='xl' size={iconSize()}>
-              U
-            </Avatar>
-          </MantineProvider>
-        ),
-        className: 'metar-marker-icon'
-      });
+      return innerIcon({ tag: 'U', color: 'black', size: 'xs' });
     }
   }
 
diff --git a/ui/src/components/Metars/MetarModal.tsx b/ui/src/components/Metars/MetarModal.tsx
index 76ed111..c8be480 100644
--- a/ui/src/components/Metars/MetarModal.tsx
+++ b/ui/src/components/Metars/MetarModal.tsx
@@ -85,15 +85,15 @@ export default function MetarModal({ airport, isOpen, onClose }: MetarModalProps
 function MetarInfo({ metar }: { metar: Metar }) {
   function metarBGColor(metar: Metar | undefined) {
     if (metar?.flight_category == 'VFR') {
-      return 'bg-emerald-600';
+      return 'green';
     } else if (metar?.flight_category == 'MVFR') {
-      return 'bg-blue-600';
+      return 'blue';
     } else if (metar?.flight_category == 'IFR') {
-      return 'bg-red-600';
+      return 'red';
     } else if (metar?.flight_category == 'LIFR') {
-      return 'bg-purple-600';
+      return 'purple';
     } else {
-      return 'bg-black';
+      return 'black';
     }
   }
 
@@ -121,16 +121,23 @@ function MetarInfo({ metar }: { metar: Metar }) {
 
   return (
     <div>
-      <p className='text-xs font-small text-gray-500'>{metar.raw_text}</p>
+      <p style={{ fontWeight: '200', fontSize: '0.8em', color: 'gray' }}>{metar.raw_text}</p>
       <Grid gutter={18}>
-        <Grid.Col className='gutter-row' span={6}>
+        <Grid.Col className='gutter-row' span={6} style={{ marginTop: '0.5em' }}>
           <span
-            className={`text-sm text-white py-2 px-4 rounded-full 
-              ${metarBGColor(metar)}
-            `}
+            style={{
+              color: 'white',
+              backgroundColor: metarBGColor(metar),
+              borderRadius: '25px',
+              padding: '0.4em 0.8em 0.4em 0.8em'
+            }}
           >
             {metar.flight_category ? metar.flight_category : 'UNKN'}
           </span>
+          <span style={{ marginLeft: '0.5em' }}>
+            {metar.wind_speed_kt != undefined && metar.wind_speed_kt > 0 ? `${metar.wind_speed_kt} KT` : 'CALM'}
+          </span>
+          {/* {metar.sky_condition != undefined && metar.sky_condition.map((skyCondition) => <>test</>)} */}
         </Grid.Col>
         <Grid.Col className='gutter-row' span={12}>
           {metar.wx_string && metar.wx_string.split(' ').map((wx) => <MetarIcon wx={wx} />)}
diff --git a/ui/src/components/Topbar/index.tsx b/ui/src/components/Topbar/index.tsx
index 7b190be..c1b98dc 100644
--- a/ui/src/components/Topbar/index.tsx
+++ b/ui/src/components/Topbar/index.tsx
@@ -4,14 +4,14 @@ import Link from 'next/link';
 import { AiOutlineUser } from 'react-icons/ai';
 import { useState } from 'react';
 import { getAirports } from '@/api/airport';
-// import { useRouter } from 'next/navigation';
+import { useRouter } from 'next/navigation';
 import { Autocomplete, Avatar } from '@mantine/core';
 import './topbar.css';
 
 export default function Topbar() {
   const [searchValue, setSearchValue] = useState('');
   const [airports, setAirports] = useState<{ key: string; value: string; label: string }[]>([]);
-  // const router = useRouter();
+  const router = useRouter();
 
   async function onChange(value: string) {
     setSearchValue(value);
@@ -25,9 +25,10 @@ export default function Topbar() {
     );
   }
 
-  // function onClick(value: string) {
-  //   router.push(`/airport/${value}`);
-  // }
+  function onClick(value: string) {
+    router.push(`/airport/${value}`);
+    setSearchValue('');
+  }
 
   return (
     <nav className='navbar'>
@@ -37,19 +38,19 @@ export default function Topbar() {
         </Link>
         <div className='search'>
           <Autocomplete
-            autoFocus
             radius='xl'
             placeholder='Search Airports...'
-            limit={10}
             data={airports}
+            limit={10}
             value={searchValue}
             onChange={onChange}
+            onOptionSubmit={onClick}
             onBlur={() => setSearchValue('')}
           />
         </div>
       </div>
       <Link className='avatar' href={'/profile'}>
-        <Avatar>
+        <Avatar variant='filled'>
           <AiOutlineUser />
         </Avatar>
       </Link>
diff --git a/ui/src/components/Topbar/topbar.css b/ui/src/components/Topbar/topbar.css
index 62f7ed4..a89ff33 100644
--- a/ui/src/components/Topbar/topbar.css
+++ b/ui/src/components/Topbar/topbar.css
@@ -2,6 +2,8 @@
   display: flex;
   justify-content: space-between;
   height: 46px;
+  background-color: #0057a3;
+  color: white;
 }
 
 .navbar .left {
@@ -16,4 +18,10 @@
 
 .navbar .left .search {
   margin: auto;
+}
+
+.navbar .avatar {
+  padding-right: 2em;
+  margin-top: auto;
+  margin-bottom: auto;
 }
\ No newline at end of file