diff --git a/src/pages/Weather.jsx b/src/pages/Weather.jsx
index 3f10a80..56f378d 100644
--- a/src/pages/Weather.jsx
+++ b/src/pages/Weather.jsx
@@ -19,7 +19,6 @@
  * - [ ] Animate background transitions
  * - [ ] Add geolocation: auto-detect user city (with permission)
  */
-
 import { useEffect, useState } from 'react';
 import Loading from '../components/Loading.jsx';
 import ErrorMessage from '../components/ErrorMessage.jsx';
@@ -27,7 +26,9 @@ import Card from '../components/Card.jsx';
 import { getWeatherData, clearWeatherCache, getCacheStats } from '../services/weather.js';
 
 export default function Weather() {
-  const [city, setCity] = useState('London');
+  const [city, setCity] = useState(() => {
+    return localStorage.getItem('lastCity') || 'London';
+  });
   const [data, setData] = useState(null);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState(null);
@@ -36,14 +37,18 @@ export default function Weather() {
   useEffect(() => {
     fetchWeather(city);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, []); 
 
   async function fetchWeather(c) {
     try {
       setLoading(true);
       setError(null);
-      const json = await getWeatherData(c); // Using the service instead of direct fetch
+
+      const json = await getWeatherData(c);// Using the service instead of direct fetch
       setData(json);
+
+      // Save the searched city to localStorage
+      localStorage.setItem('lastCity', c);
     } catch (e) {
       setError(e);
     } finally {
@@ -51,6 +56,12 @@ export default function Weather() {
     }
   }
 
+  const handleSubmit = (e) => {
+    e.preventDefault();
+    if (!city.trim()) return;
+    fetchWeather(city);
+  };
+
   // Helper function to clear cache and refetch (for testing)
   const handleClearCache = () => {
     clearWeatherCache();
@@ -65,34 +76,37 @@ export default function Weather() {
   };
 
   const current = data?.current_condition?.[0];
-  const forecast = data?.weather?.slice(0,3) || [];
+  const forecast = data?.weather?.slice(0, 3) || [];
 
   // Helper to convert °C to °F
-  const displayTemp = (c) => unit === 'C' ? c : Math.round((c * 9/5) + 32);
+  const displayTemp = (c) => (unit === 'C' ? c : Math.round((c * 9) / 5 + 32));
 
   return (
     <div className="dashboard-page">
       <div className="dashboard-header">
         <h1>🌤️ Weather Dashboard</h1>
-        <form onSubmit={(e) => {e.preventDefault(); fetchWeather(city)}}>
-          <input 
-            type="text" 
-            value={city} 
+        <form onSubmit={handleSubmit}>
+          <input
+            type="text"
+            value={city}
             onChange={(e) => setCity(e.target.value)}
-            placeholder="Enter city name..." 
+            placeholder="Enter city name..."
           />
           <button type="submit">Get Weather</button>
         </form>
-        
+
         {/* Development tools - you can remove these later */}
-        <div style={{marginTop: '10px', display: 'flex', gap: '10px'}}>
-          <button onClick={handleClearCache} style={{fontSize: '12px'}}>
+        <div style={{ marginTop: '10px', display: 'flex', gap: '10px' }}>
+          <button onClick={handleClearCache} style={{ fontSize: '12px' }}>
             Clear Cache
           </button>
-          <button onClick={handleShowCacheStats} style={{fontSize: '12px'}}>
+          <button onClick={handleShowCacheStats} style={{ fontSize: '12px' }}>
             Cache Stats
           </button>
-          <button onClick={() => setUnit(unit === 'C' ? 'F' : 'C')} style={{fontSize: '12px'}}>
+          <button
+            onClick={() => setUnit(unit === 'C' ? 'F' : 'C')}
+            style={{ fontSize: '12px' }}
+          >
             Switch to °{unit === 'C' ? 'F' : 'C'}
           </button>
         </div>
@@ -106,17 +120,29 @@ export default function Weather() {
           {/* Current Weather */}
           <Card title="Current Weather" size="large">
             <h2>{data.nearest_area?.[0]?.areaName?.[0]?.value || city}</h2>
-            <p><strong>Temperature:</strong> {displayTemp(Number(current.temp_C))}°{unit}</p>
-            <p><strong>Humidity:</strong> {current.humidity}%</p>
-            <p><strong>Desc:</strong> {current.weatherDesc?.[0]?.value}</p>
+            <p>
+              <strong>Temperature:</strong> {displayTemp(Number(current.temp_C))}°{unit}
+            </p>
+            <p>
+              <strong>Humidity:</strong> {current.humidity}%
+            </p>
+            <p>
+              <strong>Desc:</strong> {current.weatherDesc?.[0]?.value}
+            </p>
           </Card>
 
           {/* 3-Day Forecast */}
           {forecast.map((day, i) => (
-            <Card key={i} title={i === 0 ? 'Today' : `Day ${i+1}`}>
-              <p><strong>Avg Temp:</strong> {displayTemp(Number(day.avgtempC))}°{unit}</p>
-              <p><strong>Sunrise:</strong> {day.astronomy?.[0]?.sunrise}</p>
-              <p><strong>Sunset:</strong> {day.astronomy?.[0]?.sunset}</p>
+            <Card key={i} title={i === 0 ? 'Today' : `Day ${i + 1}`}>
+              <p>
+                <strong>Avg Temp:</strong> {displayTemp(Number(day.avgtempC))}°{unit}
+              </p>
+              <p>
+                <strong>Sunrise:</strong> {day.astronomy?.[0]?.sunrise}
+              </p>
+              <p>
+                <strong>Sunset:</strong> {day.astronomy?.[0]?.sunset}
+              </p>
             </Card>
           ))}
         </div>
@@ -124,3 +150,4 @@ export default function Weather() {
     </div>
   );
 }
+