diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 76ae32ac2..c944a9681 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -56,7 +56,7 @@
     </receiver>
 
 
-        <receiver android:name=".WeatherWidgetProvider" android:exported="true">
+        <receiver android:name=".WeatherWidgetProvider" android:exported="true" android:label="Current horizontal pill">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -66,7 +66,7 @@
                 android:resource="@xml/weather_widget_info" />
         </receiver>
 
-        <receiver android:name=".WeatherWidgetCastProvider" android:exported="true">
+        <receiver android:name=".WeatherWidgetCastProvider" android:exported="true" android:label="Current + hourly">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -76,7 +76,7 @@
                 android:resource="@xml/weather_widget_info_cast" />
         </receiver>
 
-        <receiver android:name=".PillWidgetProvider" android:exported="true">
+        <receiver android:name=".PillWidgetProvider" android:exported="true" android:label="Current pill">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -86,7 +86,7 @@
                 android:resource="@xml/pill_widget_info" />
         </receiver>
 
-        <receiver android:name=".DateCurrentWidgetProvider" android:exported="true">
+        <receiver android:name=".DateCurrentWidgetProvider" android:exported="true" android:label="Date + Current">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -96,6 +96,20 @@
                 android:resource="@xml/date_temp_widget_info" />
         </receiver>
 
+        <activity android:name=".GlanceWidgetConfigActivity"
+            android:theme="@style/Theme.widgetsThemeConfigs"
+            android:exported="true">
+        </activity>
+        <receiver android:name=".GlanceWidgetProvider" android:exported="true" android:label="Glance">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/glance_widget_info" />
+        </receiver>
+
         <service
             android:name="androidx.work.impl.foreground.SystemForegroundService"
             android:foregroundServiceType="dataSync"
diff --git a/android/app/src/main/kotlin/com/pranshulgg/weather_master_app/GlanceWidgetConfigActivity.kt b/android/app/src/main/kotlin/com/pranshulgg/weather_master_app/GlanceWidgetConfigActivity.kt
new file mode 100644
index 000000000..3577b6896
--- /dev/null
+++ b/android/app/src/main/kotlin/com/pranshulgg/weather_master_app/GlanceWidgetConfigActivity.kt
@@ -0,0 +1,85 @@
+package com.pranshulgg.weather_master_app
+
+import android.app.Activity
+import android.app.WallpaperManager
+import android.appwidget.AppWidgetManager
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import android.os.Bundle
+import android.widget.Button
+import android.widget.CheckBox
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextClock
+import android.widget.TextView
+import com.google.android.material.slider.Slider
+
+class GlanceWidgetConfigActivity : Activity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.widget_config_activity)
+
+
+        val previewLayout = findViewById<LinearLayout>(R.id.widget_preview)
+
+
+
+        val previewClock = findViewById<TextClock>(R.id.preview_text_clock)
+        val previewDate = findViewById<TextView>(R.id.preview_date)
+        val previewTemp = findViewById<TextView>(R.id.preview_temp)
+        val previewCondition = findViewById<TextView>(R.id.preview_condition)
+        val previewIcon = findViewById<ImageView>(R.id.preview_weather_icon)
+
+        val showClockCheck = findViewById<CheckBox>(R.id.showClockCheck)
+        val sizeSlider = findViewById<Slider>(R.id.clockSizeSeek)
+        val sizeText = findViewById<TextView>(R.id.clockSizeText)
+        val saveButton = findViewById<Button>(R.id.saveWidgetBtn)
+
+
+        fun updatePreview() {
+            previewClock.textSize = sizeSlider.value
+            previewClock.visibility = if (showClockCheck.isChecked) TextView.VISIBLE else TextView.GONE
+            previewTemp.text = "29° • "
+            previewCondition.text = "Clear sky"
+            previewDate.text = java.text.SimpleDateFormat("EEE, MMM d").format(System.currentTimeMillis())
+        }
+
+        sizeSlider.addOnChangeListener { _, _, _ -> updatePreview() }
+        showClockCheck.setOnCheckedChangeListener { _, _ -> updatePreview() }
+
+        updatePreview()
+
+
+
+        val appWidgetId = intent.extras?.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID)
+        if (appWidgetId == null || appWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
+            finish()
+            return
+        }
+
+        sizeSlider.addOnChangeListener { _, value, _ ->
+            sizeText.text = "Size: ${value.toInt()} sp"
+        }
+
+        saveButton.setOnClickListener {
+            val prefs = getSharedPreferences("HomeWidgetPreferences", MODE_PRIVATE)
+            prefs.edit().apply {
+                putBoolean("showClock", showClockCheck.isChecked)
+                putFloat("clockSize", sizeSlider.value)
+                apply()
+            }
+
+
+            val manager = AppWidgetManager.getInstance(this)
+            GlanceWidgetProvider().onUpdate(this, manager, intArrayOf(appWidgetId))
+
+            val result = Intent().apply { putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId) }
+            setResult(RESULT_OK, result)
+            finish()
+        }
+    }
+
+
+}
diff --git a/android/app/src/main/kotlin/com/pranshulgg/weather_master_app/GlanceWidgetProvider.kt b/android/app/src/main/kotlin/com/pranshulgg/weather_master_app/GlanceWidgetProvider.kt
new file mode 100644
index 000000000..27c0e4374
--- /dev/null
+++ b/android/app/src/main/kotlin/com/pranshulgg/weather_master_app/GlanceWidgetProvider.kt
@@ -0,0 +1,61 @@
+package com.pranshulgg.weather_master_app
+
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProvider
+import android.content.Context
+import android.content.Intent
+import android.util.TypedValue
+import android.view.View
+import android.widget.RemoteViews
+import android.app.PendingIntent
+import com.pranshulgg.weather_master_app.util.WeatherIconMapper
+
+class GlanceWidgetProvider : AppWidgetProvider() {
+
+    override fun onUpdate(context: Context, manager: AppWidgetManager, ids: IntArray) {
+        val prefs = context.getSharedPreferences("HomeWidgetPreferences", Context.MODE_PRIVATE)
+        val showClock = prefs.getBoolean("showClock", true)
+        val clockSize = prefs.getFloat("clockSize", 60f)
+
+        for (id in ids) {
+            val views = RemoteViews(context.packageName, R.layout.glance_widget)
+
+            // Update temperature & condition
+            val temp = prefs.getString("temperatureCurrentPill", "--")
+            val code = prefs.getString("weather_codeCurrentPill", "--")
+            val conditionName = prefs.getString("locationCurrentConditon", "--")
+            val rawIsDay = prefs.all["isDayWidget"]
+            val isDay = when (rawIsDay) {
+                is String -> rawIsDay
+                is Boolean -> if (rawIsDay) "1" else "0"
+                else -> "1"
+            }
+
+            views.setTextViewText(R.id.current_glance_temp, "$temp° • ")
+            views.setTextViewText(R.id.current_glance_condition, conditionName)
+
+            val iconRes = WeatherIconMapper.getIconResource(code, isDay)
+            views.setImageViewResource(R.id.current_img_glance, iconRes)
+
+
+            if (showClock) {
+                views.setViewVisibility(R.id.widget_text_clock_glance, View.VISIBLE)
+                views.setTextViewTextSize(R.id.widget_text_clock_glance, TypedValue.COMPLEX_UNIT_SP, clockSize)
+            } else {
+                views.setViewVisibility(R.id.widget_text_clock_glance, View.GONE)
+            }
+
+
+            val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)?.apply {
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+            }
+            val pendingIntent = PendingIntent.getActivity(
+                context, 0, intent,
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            )
+            views.setOnClickPendingIntent(R.id.widget_root_glance, pendingIntent)
+
+            manager.updateAppWidget(id, views)
+        }
+    }
+}
diff --git a/android/app/src/main/res/layout/glance_widget.xml b/android/app/src/main/res/layout/glance_widget.xml
new file mode 100644
index 000000000..0d5be5fa4
--- /dev/null
+++ b/android/app/src/main/res/layout/glance_widget.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widget_root_glance"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp"
+    android:gravity="center_vertical">
+
+    <TextClock
+        android:id="@+id/widget_text_clock_glance"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/medium"
+        android:textSize="60sp"
+        android:format12Hour="hh:mm"
+        android:format24Hour="HH:mm"
+        android:textColor="@color/colorGlanceWidgetTextClock"
+        android:shadowColor="#80000000"
+        android:shadowDx="2"
+        android:shadowDy="2"
+        android:shadowRadius="4" />
+
+    <TextClock
+        android:id="@+id/current_widget_date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:format12Hour="EEE, MMM d"
+        android:format24Hour="EEE, MMM d"
+        android:textColor="@color/white"
+        android:fontFamily="@font/regular"
+        android:gravity="center"
+        android:textSize="20sp"
+        android:shadowColor="#80000000"
+        android:shadowDx="2"
+        android:shadowDy="2"
+        android:shadowRadius="4"
+        />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="5dp"
+        android:layout_gravity="center"
+        >
+        <ImageView
+            android:id="@+id/current_img_glance"
+            android:layout_width="26dp"
+            android:layout_height="26dp"
+            android:src="@drawable/sunny"
+            android:paddingEnd="5dp"
+            />
+        <TextView
+            android:id="@+id/current_glance_temp"
+            android:layout_width="wrap_content"
+            android:text="29° • "
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:fontFamily="@font/regular"
+            android:shadowColor="#80000000"
+            android:shadowDx="2"
+            android:shadowDy="2"
+            android:shadowRadius="4"
+            android:textColor="@color/white" />
+        <TextView
+            android:id="@+id/current_glance_condition"
+            android:layout_width="wrap_content"
+            android:text="Clear sky"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:fontFamily="@font/regular"
+            android:shadowColor="#80000000"
+            android:shadowDx="2"
+            android:shadowDy="2"
+            android:shadowRadius="4"
+            android:textColor="@color/white" />
+</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/weather_widget.xml b/android/app/src/main/res/layout/weather_widget.xml
index fe9fa312f..862305e9f 100644
--- a/android/app/src/main/res/layout/weather_widget.xml
+++ b/android/app/src/main/res/layout/weather_widget.xml
@@ -37,6 +37,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
+        android:paddingBottom="5dp"
         android:layout_gravity="end|center_vertical">
 
         <TextView
diff --git a/android/app/src/main/res/layout/widget_config_activity.xml b/android/app/src/main/res/layout/widget_config_activity.xml
new file mode 100644
index 000000000..dd2988927
--- /dev/null
+++ b/android/app/src/main/res/layout/widget_config_activity.xml
@@ -0,0 +1,169 @@
+
+
+
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:cardCornerRadius="0dp"
+    android:backgroundTint="@color/colorSurfaceContainer"
+    app:strokeColor="@android:color/transparent"
+
+
+    >
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <LinearLayout
+        android:id="@+id/widget_preview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#033e5c"
+        android:orientation="vertical"
+        android:paddingLeft="16dp"
+
+        android:paddingTop="?attr/actionBarSize"
+        android:paddingRight="16dp"
+        android:paddingBottom="16dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <TextClock
+            android:id="@+id/preview_text_clock"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:fontFamily="@font/medium"
+            android:format12Hour="hh:mm"
+            android:format24Hour="HH:mm"
+            android:shadowColor="#80000000"
+            android:shadowDx="2"
+            android:shadowDy="2"
+            android:shadowRadius="4"
+            android:textColor="@color/colorGlanceWidgetTextClock"
+            android:textSize="60sp" />
+
+        <TextClock
+            android:id="@+id/preview_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/regular"
+            android:format12Hour="EEE, MMM d"
+            android:format24Hour="EEE, MMM d"
+            android:gravity="center"
+            android:shadowColor="#80000000"
+            android:shadowDx="2"
+            android:shadowDy="2"
+            android:shadowRadius="4"
+            android:textColor="@color/white"
+            android:textSize="20sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:paddingTop="5dp">
+
+            <ImageView
+                android:id="@+id/preview_weather_icon"
+                android:layout_width="26dp"
+                android:layout_height="26dp"
+                android:paddingEnd="5dp"
+                android:src="@drawable/sunny" />
+
+            <TextView
+                android:id="@+id/preview_temp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/regular"
+                android:shadowColor="#80000000"
+                android:shadowDx="2"
+                android:shadowDy="2"
+                android:shadowRadius="4"
+                android:text="29° • "
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/preview_condition"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/regular"
+                android:shadowColor="#80000000"
+                android:shadowDx="2"
+                android:shadowDy="2"
+                android:shadowRadius="4"
+                android:text="Clear sky"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:paddingRight="12dp"
+        android:paddingLeft="12dp"
+        android:paddingBottom="30dp"
+        >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:padding="8dp">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/clockSizeText"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingEnd="8dp"
+                android:text="Size: 60 sp"
+                android:textColor="@color/colorOnBackground"
+                android:textSize="18sp" />
+
+            <com.google.android.material.slider.Slider
+                android:id="@+id/clockSizeSeek"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:stepSize="1"
+                android:value="60"
+                android:valueFrom="20"
+                android:valueTo="120" />
+        </LinearLayout>
+
+
+        <com.google.android.material.checkbox.MaterialCheckBox
+            android:id="@+id/showClockCheck"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:text="Show Clock"
+            app:useMaterialThemeColors="true" />
+
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/saveWidgetBtn"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:layout_gravity="end"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="18dp"
+            android:text="Save"
+            app:cornerRadius="50dp" />
+
+    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/android/app/src/main/res/values-night-v31/colors.xml b/android/app/src/main/res/values-night-v31/colors.xml
index 070744bb6..8a6f142e8 100644
--- a/android/app/src/main/res/values-night-v31/colors.xml
+++ b/android/app/src/main/res/values-night-v31/colors.xml
@@ -32,4 +32,7 @@
     <!-- Surface Variant -->
     <color name="colorSurfaceVariant">@android:color/system_neutral2_700</color>
     <color name="colorOnSurfaceVariant">@android:color/system_neutral2_100</color>
+
+    <color name="colorGlanceWidgetTextClock">@android:color/system_accent2_50</color>
+
 </resources>
diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
index 3bd7ed6fa..0f758a33f 100644
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -26,4 +26,7 @@
 
     <color name="colorError">#ffb4ab</color>
     <color name="colorOnError">#690005</color>
+
+    <color name="colorGlanceWidgetTextClock">#EEF0FF</color>
+
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-v31/colors.xml b/android/app/src/main/res/values-v31/colors.xml
index 6f9937f79..5abc91be3 100644
--- a/android/app/src/main/res/values-v31/colors.xml
+++ b/android/app/src/main/res/values-v31/colors.xml
@@ -33,5 +33,7 @@
     <color name="colorSurfaceVariant">@android:color/system_neutral2_500</color>
     <color name="colorOnSurfaceVariant">@android:color/system_neutral1_500</color>
 
+    <color name="colorGlanceWidgetTextClock">@android:color/system_accent2_50</color>
+
 
 </resources>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 6e696a57a..d71afeb9a 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -32,4 +32,7 @@
 
     <color name="colorError">#ba1a1a</color>
     <color name="colorOnError">#ffffff</color>
+
+    <color name="colorGlanceWidgetTextClock">#EEF0FF</color>
+
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index bc9b3e22d..caede9806 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -44,5 +44,33 @@
         <item name="colorSurfaceContainer">@color/colorSurfaceContainer</item>
     </style>
 
+    <style name="Theme.widgetsThemeConfigs" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorOnPrimary">@color/colorOnPrimary</item>
+        <item name="colorPrimaryContainer">@color/colorPrimaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/colorOnPrimaryContainer</item>
+
+        <item name="colorSecondary">@color/colorSecondary</item>
+        <item name="colorOnSecondary">@color/colorOnSecondary</item>
+        <item name="colorSecondaryContainer">@color/colorSecondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/colorOnSecondaryContainer</item>
+
+        <item name="colorTertiary">@color/colorTertiary</item>
+        <item name="colorOnTertiary">@color/colorOnTertiary</item>
+        <item name="colorTertiaryContainer">@color/colorTertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/colorOnTertiaryContainer</item>
+
+        <item name="colorOnBackground">@color/colorOnBackground</item>
+        <item name="colorSurface">@color/colorSurface</item>
+        <item name="colorOnSurface">@color/colorOnSurface</item>
+
+        <item name="colorSurfaceVariant">@color/colorSurfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/colorOnSurfaceVariant</item>
+
+        <item name="colorSurfaceContainer">@color/colorSurfaceContainer</item>
+
+        <item name="android:navigationBarColor">@color/colorSurfaceContainer</item>
+        <item  name="android:statusBarColor">#033e5c</item>
+    </style>
 
 </resources>
diff --git a/android/app/src/main/res/xml/glance_widget_info.xml b/android/app/src/main/res/xml/glance_widget_info.xml
new file mode 100644
index 000000000..d048f2097
--- /dev/null
+++ b/android/app/src/main/res/xml/glance_widget_info.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="150dp"
+    android:minHeight="50dp"
+    android:updatePeriodMillis="0"
+    android:initialLayout="@layout/glance_widget"
+    android:resizeMode="horizontal|vertical"
+    android:label="Glance"
+    android:configure="com.pranshulgg.weather_master_app.GlanceWidgetConfigActivity"
+    android:widgetCategory="home_screen" />
diff --git a/lib/main.dart b/lib/main.dart
index 7e2f5313b..546d988ae 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -438,9 +438,8 @@ class LocationPromptScreen extends StatelessWidget {
 
                   final position = await NativeLocation.getCurrentPosition();
 
-                  final geoData = await NativeLocation.reverseGeocode(
-                      position.latitude, position.longitude);
-
+                  final geoData =
+                      await getGeoData(position.latitude, position.longitude);
                   final saved = SavedLocation(
                     latitude: position.latitude,
                     longitude: position.longitude,
@@ -624,3 +623,24 @@ class LoadingDialogState extends State<LoadingDialog> {
     );
   }
 }
+
+Future<Map<String, String>> getGeoData(double lat, double lon) async {
+  const maxRetries = 3;
+  int attempt = 0;
+  Map<String, String>? geoData;
+
+  while (attempt < maxRetries) {
+    geoData = await NativeLocation.reverseGeocode(lat, lon);
+    if ((geoData['city']?.isNotEmpty ?? false) &&
+        (geoData['country']?.isNotEmpty ?? false)) {
+      return geoData;
+    }
+    attempt++;
+    await Future.delayed(Duration(seconds: 1));
+  }
+
+  return {
+    'city': geoData?['city'] ?? 'Unknown City',
+    'country': geoData?['country'] ?? 'Unknown Country',
+  };
+}
diff --git a/lib/models/loading_me.dart b/lib/models/loading_me.dart
index f04d810c5..c96f92dbd 100644
--- a/lib/models/loading_me.dart
+++ b/lib/models/loading_me.dart
@@ -6,91 +6,88 @@ class LoaderWidget extends StatefulWidget {
   final double size;
   final bool isContained;
 
-
-  const LoaderWidget({super.key,
-  required this.size,
-  required this.isContained
-  });
+  const LoaderWidget(
+      {super.key, required this.size, required this.isContained});
 
   @override
   _LoaderWidgetState createState() => _LoaderWidgetState();
 }
 
-class _LoaderWidgetState extends State<LoaderWidget> with SingleTickerProviderStateMixin {
+class _LoaderWidgetState extends State<LoaderWidget>
+    with SingleTickerProviderStateMixin {
   late AnimationController _rotationController;
   int _currentShapeIndex = 0;
   late Timer _shapeTimer;
   late Animation<double> _rotationAnimation;
   bool _isInitialized = false;
 
-
-
- final List<String Function(String)> _svgShapes = [
-  (color) =>   '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+  final List<String Function(String)> _svgShapes = [
+    (color) =>
+        '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M22.4683 7.83978C23.1732 6.72008 24.8268 6.72007 25.5317 7.83977L27.2214 10.5237C27.6848 11.2599 28.6197 11.5592 29.4338 11.232L32.4021 10.0391C33.6404 9.54145 34.9781 10.499 34.8804 11.8131L34.6461 14.963C34.5819 15.8269 35.1597 16.6104 36.0135 16.8172L39.1265 17.571C40.4252 17.8855 40.9362 19.4349 40.0731 20.4414L38.0044 22.854C37.437 23.5158 37.437 24.4842 38.0044 25.146L40.0731 27.5586C40.9362 28.5651 40.4252 30.1145 39.1265 30.429L36.0135 31.1828C35.1597 31.3896 34.5819 32.1731 34.6461 33.037L34.8804 36.1869C34.9781 37.501 33.6404 38.4585 32.4021 37.9609L29.4338 36.768C28.6197 36.4408 27.6848 36.7401 27.2214 37.4763L25.5317 40.1602C24.8268 41.2799 23.1732 41.2799 22.4683 40.1602L20.7786 37.4763C20.3152 36.7401 19.3803 36.4408 18.5662 36.768L15.5979 37.9609C14.3596 38.4585 13.0219 37.501 13.1196 36.1869L13.3539 33.037C13.4181 32.1731 12.8403 31.3896 11.9865 31.1828L8.87348 30.429C7.57479 30.1145 7.0638 28.5651 7.92684 27.5586L9.99559 25.146C10.563 24.4842 10.563 23.5158 9.99559 22.854L7.92685 20.4414C7.0638 19.4349 7.57478 17.8855 8.87348 17.571L11.9865 16.8172C12.8403 16.6104 13.4181 15.8269 13.3539 14.963L13.1196 11.8131C13.0219 10.499 14.3596 9.54145 15.5979 10.0391L18.5662 11.232C19.3803 11.5592 20.3152 11.2599 20.7786 10.5237L22.4683 7.83978Z" fill="$color"/>
 </svg>
 
 ''',
- (color) =>    '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+    (color) =>
+        '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M20.3091 8.60362C20.4924 8.454 20.584 8.37919 20.6677 8.31603C22.6389 6.82799 25.3611 6.82799 27.3323 8.31603C27.416 8.37919 27.5076 8.454 27.6909 8.60362C27.7727 8.67041 27.8136 8.70381 27.8541 8.7356C28.7818 9.46445 29.9191 9.87748 31.0993 9.91409C31.1508 9.91568 31.2037 9.91634 31.3094 9.91765C31.5462 9.92059 31.6646 9.92206 31.7694 9.92733C34.2381 10.0516 36.3234 11.7974 36.8747 14.2015C36.8982 14.3036 36.9202 14.4197 36.9642 14.6518C36.9838 14.7555 36.9937 14.8073 37.0042 14.8576C37.2452 16.0109 37.8504 17.0567 38.7309 17.8416C38.7693 17.8759 38.8094 17.9103 38.8895 17.9791C39.069 18.1332 39.1588 18.2102 39.2357 18.2815C41.0467 19.96 41.5194 22.6347 40.393 24.8299C40.3451 24.9231 40.2872 25.0262 40.1714 25.2322C40.1196 25.3242 40.0938 25.3702 40.0694 25.4155C39.5111 26.4536 39.3009 27.6428 39.4697 28.8088C39.4771 28.8597 39.4856 28.9117 39.5027 29.0158C39.5409 29.249 39.56 29.3656 39.573 29.4695C39.879 31.9168 38.5179 34.2689 36.2407 35.2281C36.1441 35.2688 36.0333 35.3106 35.8118 35.3942C35.7129 35.4315 35.6635 35.4501 35.6156 35.4692C34.5192 35.9063 33.592 36.6826 32.9701 37.684C32.943 37.7277 32.916 37.7731 32.862 37.8637C32.741 38.0669 32.6806 38.1685 32.6236 38.2564C31.2814 40.3273 28.7233 41.2563 26.3609 40.5306C26.2606 40.4998 26.1489 40.4608 25.9253 40.3827C25.8256 40.3479 25.7757 40.3305 25.7268 40.3144C24.6052 39.9461 23.3948 39.9461 22.2732 40.3144C22.2243 40.3305 22.1744 40.3479 22.0747 40.3827C21.8511 40.4608 21.7394 40.4998 21.6391 40.5306C19.2767 41.2563 16.7186 40.3273 15.3764 38.2564C15.3194 38.1685 15.259 38.0669 15.138 37.8637C15.084 37.7731 15.057 37.7277 15.0299 37.684C14.408 36.6826 13.4808 35.9063 12.3844 35.4692C12.3365 35.4501 12.2871 35.4315 12.1882 35.3942C11.9667 35.3106 11.8559 35.2688 11.7593 35.2281C9.48205 34.2689 8.12097 31.9168 8.42698 29.4695C8.43997 29.3656 8.45908 29.249 8.4973 29.0158C8.51436 28.9117 8.52289 28.8597 8.53026 28.8088C8.69906 27.6428 8.48889 26.4536 7.93056 25.4155C7.90621 25.3702 7.88035 25.3242 7.82863 25.2322C7.71278 25.0262 7.65485 24.9231 7.60704 24.8299C6.48057 22.6347 6.95327 19.96 8.76433 18.2815C8.8412 18.2102 8.93096 18.1332 9.11047 17.9791C9.19061 17.9103 9.23068 17.8759 9.26908 17.8416C10.1496 17.0567 10.7548 16.0109 10.9958 14.8576C11.0063 14.8073 11.0162 14.7555 11.0358 14.6518C11.0798 14.4197 11.1019 14.3036 11.1253 14.2015C11.6766 11.7974 13.7619 10.0516 16.2306 9.92733C16.3354 9.92206 16.4538 9.92059 16.6906 9.91765C16.7963 9.91634 16.8492 9.91568 16.9007 9.91409C18.0809 9.87748 19.2182 9.46445 20.1459 8.7356C20.1864 8.70381 20.2273 8.67041 20.3091 8.60362Z" fill="$color"/>
 </svg>
 
 ''',
-   (color) =>  '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+    (color) =>
+        '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M18.6481 9.93735C20.3067 8.72903 21.136 8.12486 22.022 7.82514C23.3035 7.39162 24.6965 7.39162 25.978 7.82514C26.864 8.12486 27.6933 8.72903 29.3519 9.93735L32.9794 12.5801L36.6049 15.0564C38.3249 16.2312 39.1849 16.8185 39.7598 17.5573C40.5914 18.6258 41.0282 19.9391 40.9986 21.2824C40.9781 22.211 40.6363 23.1817 39.9526 25.1232L38.529 29.1657L37.215 33.308C36.5983 35.2519 36.29 36.2239 35.7509 36.98C34.9712 38.0736 33.838 38.878 32.5341 39.2634C31.6327 39.5299 30.5936 39.5144 28.5154 39.4835L24 39.4162L19.4846 39.4835C17.4064 39.5144 16.3673 39.5299 15.4659 39.2634C14.162 38.878 13.0288 38.0736 12.2491 36.98C11.71 36.2239 11.4017 35.2519 10.785 33.308L9.47101 29.1657L8.04741 25.1232C7.36372 23.1817 7.02187 22.211 7.00141 21.2824C6.97182 19.9391 7.40855 18.6258 8.24017 17.5573C8.8151 16.8185 9.67508 16.2312 11.395 15.0564L15.0206 12.5801L18.6481 9.93735Z" fill="$color"/>
 </svg>
 ''',
-
-(color) =>  '''
+    (color) => '''
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M16.9857 12.7771C22.0217 7.74098 30.1869 7.74098 35.2229 12.7771C40.259 17.8131 40.259 25.9783 35.2229 31.0143L31.0143 35.2229C25.9783 40.259 17.8131 40.259 12.7771 35.2229C7.74098 30.1869 7.74098 22.0217 12.7771 16.9857L16.9857 12.7771Z" fill="$color"/>
 </svg>
 
 ''',
-(color) => '''
+    (color) => '''
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M33.1856 11.1238C34.2431 11.1956 34.7718 11.2315 35.1991 11.4184C35.8175 11.6889 36.3111 12.1825 36.5816 12.8009C36.7685 13.2282 36.8044 13.7569 36.8762 14.8144L37.0402 17.2275C37.0693 17.6552 37.0838 17.869 37.1303 18.0733C37.1975 18.3684 37.3142 18.6501 37.4754 18.9063C37.5869 19.0836 37.7279 19.2451 38.0097 19.5681L39.6001 21.3903C40.297 22.1889 40.6455 22.5881 40.8155 23.0225C41.0615 23.6509 41.0615 24.3491 40.8155 24.9775C40.6455 25.4119 40.297 25.8111 39.6001 26.6097L38.0097 28.4319C37.7279 28.7549 37.5869 28.9164 37.4754 29.0937C37.3142 29.3499 37.1975 29.6316 37.1303 29.9267C37.0838 30.131 37.0693 30.3448 37.0402 30.7725L36.8762 33.1856C36.8044 34.2431 36.7685 34.7718 36.5816 35.1991C36.3111 35.8175 35.8175 36.3111 35.1991 36.5816C34.7718 36.7685 34.2431 36.8044 33.1856 36.8762L30.7725 37.0402C30.3448 37.0693 30.131 37.0838 29.9267 37.1303C29.6316 37.1975 29.3499 37.3142 29.0937 37.4754C28.9164 37.5869 28.7549 37.7279 28.4319 38.0097L26.6097 39.6001C25.8111 40.297 25.4119 40.6455 24.9775 40.8155C24.3491 41.0615 23.6509 41.0615 23.0225 40.8155C22.5881 40.6455 22.1889 40.297 21.3903 39.6001L19.5681 38.0097C19.2451 37.7279 19.0836 37.5869 18.9063 37.4754C18.6501 37.3142 18.3684 37.1975 18.0733 37.1303C17.869 37.0838 17.6552 37.0693 17.2275 37.0402L14.8144 36.8762C13.7569 36.8044 13.2282 36.7685 12.8009 36.5816C12.1825 36.3111 11.6889 35.8175 11.4184 35.1991C11.2315 34.7718 11.1956 34.2431 11.1238 33.1856L10.9598 30.7725C10.9307 30.3448 10.9162 30.131 10.8697 29.9267C10.8025 29.6316 10.6858 29.3499 10.5246 29.0937C10.4131 28.9164 10.2721 28.7549 9.99027 28.4319L8.3999 26.6097C7.703 25.8111 7.35454 25.4119 7.18452 24.9775C6.93849 24.3491 6.93849 23.6509 7.18452 23.0225C7.35454 22.5881 7.703 22.1889 8.3999 21.3903L9.99027 19.5681C10.2721 19.2451 10.4131 19.0836 10.5246 18.9063C10.6858 18.6501 10.8025 18.3684 10.8697 18.0733C10.9162 17.869 10.9307 17.6552 10.9598 17.2275L11.1238 14.8144C11.1956 13.7569 11.2315 13.2282 11.4184 12.8009C11.6889 12.1825 12.1825 11.6889 12.8009 11.4184C13.2282 11.2315 13.7569 11.1956 14.8144 11.1238L17.2275 10.9598C17.6552 10.9307 17.869 10.9162 18.0733 10.8697C18.3684 10.8025 18.6501 10.6858 18.9063 10.5246C19.0836 10.4131 19.2451 10.2721 19.5681 9.99027L21.3903 8.3999C22.1889 7.703 22.5881 7.35454 23.0225 7.18452C23.6509 6.93849 24.3491 6.93849 24.9775 7.18452C25.4119 7.35454 25.8111 7.703 26.6097 8.3999L28.4319 9.99027C28.7549 10.2721 28.9164 10.4131 29.0937 10.5246C29.3499 10.6858 29.6316 10.8025 29.9267 10.8697C30.131 10.9162 30.3448 10.9307 30.7725 10.9598L33.1856 11.1238Z" fill="$color"/>
 </svg>
 ''',
-(color) => '''
+    (color) => '''
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M27.8729 10.6207C33.8872 8.00862 39.9914 14.1128 37.3793 20.1271L36.9474 21.1214C36.1499 22.9576 36.1499 25.0424 36.9474 26.8786L37.3793 27.8729C39.9914 33.8872 33.8872 39.9914 27.8729 37.3793L26.8786 36.9474C25.0424 36.1499 22.9576 36.1499 21.1214 36.9474L20.1271 37.3793C14.1128 39.9914 8.00862 33.8872 10.6207 27.8729L11.0526 26.8786C11.8501 25.0424 11.8501 22.9576 11.0526 21.1214L10.6207 20.1271C8.00862 14.1128 14.1128 8.00862 20.1271 10.6207L21.1214 11.0526C22.9576 11.8501 25.0424 11.8501 26.8786 11.0526L27.8729 10.6207Z" fill="$color"/>
 </svg>
 ''',
-(color) => '''
+    (color) => '''
 <svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M32.1309 32.1309C25.1705 39.0913 15.8877 41.0935 11.3971 36.6029C6.90648 32.1123 8.90867 22.8295 15.8691 15.8691C22.8295 8.90867 32.1123 6.90648 36.6029 11.3971C41.0935 15.8877 39.0913 25.1705 32.1309 32.1309Z" fill="$color"/>
 </svg>
 
 '''
-
   ];
-@override
-void initState() {
-  super.initState();
+  @override
+  void initState() {
+    super.initState();
 
-  _rotationController = AnimationController(
-    vsync: this,
-    duration: Duration(milliseconds: 800),
-  )..repeat();
+    _rotationController = AnimationController(
+      vsync: this,
+      duration: Duration(milliseconds: 800),
+    )..repeat();
 
-  _rotationAnimation = CurvedAnimation(
-    parent: _rotationController,
-    curve: Curves.easeInOut,
-  );
+    _rotationAnimation = CurvedAnimation(
+      parent: _rotationController,
+      curve: Curves.easeInOut,
+    );
 
-  Future.delayed(Duration(milliseconds: 0), () {
-    setState(() {
-      _isInitialized = true;
+    Future.delayed(Duration(milliseconds: 0), () {
+      setState(() {
+        _isInitialized = true;
+      });
     });
-  });
 
-  _shapeTimer = Timer.periodic(Duration(milliseconds: 800), (_) {
-    setState(() {
-      _currentShapeIndex = (_currentShapeIndex + 1) % _svgShapes.length;
+    _shapeTimer = Timer.periodic(Duration(milliseconds: 800), (_) {
+      setState(() {
+        _currentShapeIndex = (_currentShapeIndex + 1) % _svgShapes.length;
+      });
     });
-  });
-}
+  }
 
   @override
   void dispose() {
@@ -101,46 +98,46 @@ void initState() {
 
   @override
   Widget build(BuildContext context) {
-    return widget.isContained ? Container(
-      decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.primaryContainer,
-        borderRadius: BorderRadius.circular(50),
-      ),
-      child: animationBlock()) : animationBlock();
+    return widget.isContained
+        ? Container(
+            decoration: BoxDecoration(
+              color: Theme.of(context).colorScheme.primaryContainer,
+              borderRadius: BorderRadius.circular(50),
+            ),
+            child: animationBlock())
+        : animationBlock();
   }
 
-
-Widget animationBlock() {
-  return AnimatedBuilder(
-          animation: _rotationController,
-          
-          builder: (context, child) {
-            return Transform.rotate(
-              angle: _rotationAnimation.value * 2 * 3.14159, 
-              child: AnimatedSwitcher(
-                duration: Duration(milliseconds: 500),
-                transitionBuilder: (child, animation) {
-            return ScaleTransition(
-              scale: CurvedAnimation(
-                parent: animation,
-                curve: Curves.easeOutBack, 
-              ),
-              child: child,
-            );
-          },
-                child: SvgPicture.string(
-                  _svgShapes[_currentShapeIndex](colorToHex(Theme.of(context).colorScheme.primary)),
-                  key: ValueKey(_svgShapes[_currentShapeIndex]),
-                  width: widget.size,
-                  height: widget.size,
+  Widget animationBlock() {
+    return AnimatedBuilder(
+      animation: _rotationController,
+      builder: (context, child) {
+        return Transform.rotate(
+          angle: _rotationAnimation.value * 2 * 3.14159,
+          child: AnimatedSwitcher(
+            duration: Duration(milliseconds: 500),
+            transitionBuilder: (child, animation) {
+              return ScaleTransition(
+                scale: CurvedAnimation(
+                  parent: animation,
+                  curve: Curves.easeOutBack,
                 ),
-              ),
-            );
-          },
-      );
+                child: child,
+              );
+            },
+            child: SvgPicture.string(
+              _svgShapes[_currentShapeIndex](
+                  colorToHex(Theme.of(context).colorScheme.primary)),
+              key: ValueKey(_svgShapes[_currentShapeIndex]),
+              width: widget.size,
+              height: widget.size,
+            ),
+          ),
+        );
+      },
+    );
+  }
 }
-}
-
 
 String colorToHex(Color color) =>
-    '#${color.value.toRadixString(16).substring(2).toUpperCase()}';
\ No newline at end of file
+    '#${color.value.toRadixString(16).substring(2).toUpperCase()}';
diff --git a/lib/screens/about_page.dart b/lib/screens/about_page.dart
index cbbefc225..38689388b 100644
--- a/lib/screens/about_page.dart
+++ b/lib/screens/about_page.dart
@@ -1,7 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
-import '../utils/open_links.dart'; 
+import '../utils/open_links.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:http/http.dart' as http;
 import 'dart:convert';
@@ -18,167 +18,174 @@ class AboutPage extends StatelessWidget {
         elevation: 0,
         toolbarHeight: 120,
         shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.only(bottomLeft: Radius.circular(28), bottomRight: Radius.circular(28))
-        ),
+            borderRadius: BorderRadius.only(
+                bottomLeft: Radius.circular(28),
+                bottomRight: Radius.circular(28))),
         title: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Column(
+          children: [
+            Column(
                 spacing: 10,
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                Text("WeatherMaster", style: TextStyle(color: Theme.of(context).colorScheme.secondary, fontSize: 24),),
+                  Text(
+                    "WeatherMaster",
+                    style: TextStyle(
+                        color: Theme.of(context).colorScheme.secondary,
+                        fontSize: 24),
+                  ),
                   CheckUpdateButton()
-              ]
-              ),
-              Container(
+                ]),
+            Container(
                 clipBehavior: Clip.hardEdge,
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(50)
-                ),
-               child: Image.asset("assets/weather-icons/new_icon.png", width: 80, height: 80,)
-              )
-            ],
-          ),
-        ),
-
-        body: ListView(
-          children: [
-            ListTile(
-              leading: CircleAvatar(radius: 23, child: Icon(Symbols.license)),
-              title: Text("licenses".tr()),
-              subtitle: Text("GNU GPL-3.0"),
-            ),
-            ListTile(
-              leading: CircleAvatar(radius: 23,child: Icon(Symbols.mail),),
-              title: Text("email_text".tr()),
-              subtitle: Text("pranshul.devmain@gmail.com"),
-              onTap: () {
-                openLink("mailto:pranshul.devmain@gmail.com");
-              },
-            ),
-            ListTile(
-              leading: CircleAvatar(radius: 23,child: Icon(Symbols.code),),
-              title: Text("source_code".tr()),
-              subtitle: Text("on_github".tr()),
-              onTap: () {
-                openLink("https://github.com/PranshulGG/WeatherMaster");
-              },
-            ),
-            ListTile(
-              leading: CircleAvatar(radius: 23,child: Icon(Symbols.bug_report),),
-              title: Text("create_an_issue".tr()),
-              subtitle: Text("on_github".tr()),
-              onTap: () {
-                openLink("https://github.com/PranshulGG/WeatherMaster/issues/");
-              },
-            ),
-
-            
+                decoration:
+                    BoxDecoration(borderRadius: BorderRadius.circular(50)),
+                child: Image.asset(
+                  "assets/weather-icons/new_icon.png",
+                  width: 80,
+                  height: 80,
+                ))
           ],
         ),
-
-          bottomNavigationBar: ClipRRect(
-    borderRadius: BorderRadius.only(
-      topLeft: Radius.circular(28),
-      topRight: Radius.circular(28),
-      
-    ),
-    child: BottomAppBar(
-      elevation: 0,
-      height: 180,
-      
-      padding: EdgeInsets.only(top: 10),
-      color: Theme.of(context).colorScheme.surfaceContainer,
-     child:  ListView(
-          physics: NeverScrollableScrollPhysics(),
-          children: [
-            ListTile(
-              leading: CircleAvatar(radius: 23, child: Icon(Symbols.license)),
-              title: Text("third_party_licenses".tr()),
-              onTap: () {
-              showLicensePage(
-              context: context,
-              applicationName: 'WeatherMaster',
-              applicationVersion: 'v2.3.1 (F)',
-              applicationIcon: Container(
-                clipBehavior: Clip.hardEdge,
-                margin: EdgeInsets.only(bottom: 16, top: 16),
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(50),
-                ),
-                  child: Image.asset(
-                    'assets/weather-icons/new_icon.png',
-                    width: 60,
-                    height: 60,
-                  ),
-                ),
-
-            );
-              },
+      ),
+      body: ListView(
+        children: [
+          ListTile(
+            leading: CircleAvatar(radius: 23, child: Icon(Symbols.license)),
+            title: Text("licenses".tr()),
+            subtitle: Text("GNU GPL-3.0"),
+          ),
+          ListTile(
+            leading: CircleAvatar(
+              radius: 23,
+              child: Icon(Symbols.mail),
             ),
-            ListTile(
-              leading: CircleAvatar(radius: 23,child: Icon(Symbols.mail),),
-              title: Text("terms_&_conditions".tr()),
-              onTap: () {
-                  Navigator.of(context).push(
-                  PageRouteBuilder(
-                    opaque: true,
-                    fullscreenDialog: true,
-                    reverseTransitionDuration: Duration(milliseconds: 200),
-                    pageBuilder: (context, animation, secondaryAnimation) {
-                  return TermsPage();
-                },
-                transitionsBuilder: (context, animation, secondaryAnimation, child) {
-                  return FadeTransition(
-                    opacity: animation,
-                    child: child,
-                    
-                  );
-                }, 
-              ),
-            );
+            title: Text("email_text".tr()),
+            subtitle: Text("pranshul.devmain@gmail.com"),
+            onTap: () {
+              openLink("mailto:pranshul.devmain@gmail.com");
             },
+          ),
+          ListTile(
+            leading: CircleAvatar(
+              radius: 23,
+              child: Icon(Symbols.code),
             ),
-            ListTile(
-              leading: CircleAvatar(radius: 23,child: Icon(Symbols.code),),
-              title: Text("privacy_policy".tr()),
-              onTap: () {
-                  Navigator.of(context).push(
-                  PageRouteBuilder(
-                    opaque: true,
-                    fullscreenDialog: true,
-                    reverseTransitionDuration: Duration(milliseconds: 200),
-                    pageBuilder: (context, animation, secondaryAnimation) {
-                  return PolicyPage();
-                },
-                transitionsBuilder: (context, animation, secondaryAnimation, child) {
-                  return FadeTransition(
-                    opacity: animation,
-                    child: child,
-                    
-                  );
-                }, 
-              ),
-            );
+            title: Text("source_code".tr()),
+            subtitle: Text("on_github".tr()),
+            onTap: () {
+              openLink("https://github.com/PranshulGG/WeatherMaster");
             },
+          ),
+          ListTile(
+            leading: CircleAvatar(
+              radius: 23,
+              child: Icon(Symbols.bug_report),
             ),
-          ]
-          )
+            title: Text("create_an_issue".tr()),
+            subtitle: Text("on_github".tr()),
+            onTap: () {
+              openLink("https://github.com/PranshulGG/WeatherMaster/issues/");
+            },
+          ),
+        ],
+      ),
+      bottomNavigationBar: ClipRRect(
+        borderRadius: BorderRadius.only(
+          topLeft: Radius.circular(28),
+          topRight: Radius.circular(28),
         ),
-
-    ),
-        
+        child: BottomAppBar(
+            elevation: 0,
+            height: 180,
+            padding: EdgeInsets.only(top: 10),
+            color: Theme.of(context).colorScheme.surfaceContainer,
+            child: ListView(physics: NeverScrollableScrollPhysics(), children: [
+              ListTile(
+                leading: CircleAvatar(radius: 23, child: Icon(Symbols.license)),
+                title: Text("third_party_licenses".tr()),
+                onTap: () {
+                  showLicensePage(
+                    context: context,
+                    applicationName: 'WeatherMaster',
+                    applicationVersion: 'v2.4.0 (F)',
+                    applicationIcon: Container(
+                      clipBehavior: Clip.hardEdge,
+                      margin: EdgeInsets.only(bottom: 16, top: 16),
+                      decoration: BoxDecoration(
+                        borderRadius: BorderRadius.circular(50),
+                      ),
+                      child: Image.asset(
+                        'assets/weather-icons/new_icon.png',
+                        width: 60,
+                        height: 60,
+                      ),
+                    ),
+                  );
+                },
+              ),
+              ListTile(
+                leading: CircleAvatar(
+                  radius: 23,
+                  child: Icon(Symbols.mail),
+                ),
+                title: Text("terms_&_conditions".tr()),
+                onTap: () {
+                  Navigator.of(context).push(
+                    PageRouteBuilder(
+                      opaque: true,
+                      fullscreenDialog: true,
+                      reverseTransitionDuration: Duration(milliseconds: 200),
+                      pageBuilder: (context, animation, secondaryAnimation) {
+                        return TermsPage();
+                      },
+                      transitionsBuilder:
+                          (context, animation, secondaryAnimation, child) {
+                        return FadeTransition(
+                          opacity: animation,
+                          child: child,
+                        );
+                      },
+                    ),
+                  );
+                },
+              ),
+              ListTile(
+                leading: CircleAvatar(
+                  radius: 23,
+                  child: Icon(Symbols.code),
+                ),
+                title: Text("privacy_policy".tr()),
+                onTap: () {
+                  Navigator.of(context).push(
+                    PageRouteBuilder(
+                      opaque: true,
+                      fullscreenDialog: true,
+                      reverseTransitionDuration: Duration(milliseconds: 200),
+                      pageBuilder: (context, animation, secondaryAnimation) {
+                        return PolicyPage();
+                      },
+                      transitionsBuilder:
+                          (context, animation, secondaryAnimation, child) {
+                        return FadeTransition(
+                          opacity: animation,
+                          child: child,
+                        );
+                      },
+                    ),
+                  );
+                },
+              ),
+            ])),
+      ),
     );
   }
 }
 
-
-
 class TermsPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-  final markdownData = '''
+    final markdownData = '''
   **Terms & Conditions**  
 
   These terms and conditions apply to the WeatherMaster app (hereby referred to as "Application") for mobile devices that was created by Pranshul (hereby referred to as "Service Provider") as an Open Source service.
@@ -219,23 +226,30 @@ class TermsPage extends StatelessWidget {
 ''';
 
     return Scaffold(
-      appBar: AppBar(title: Text('terms_&_conditions'.tr()), titleSpacing: 0, scrolledUnderElevation: 0,),
+      appBar: AppBar(
+        title: Text('terms_&_conditions'.tr()),
+        titleSpacing: 0,
+        scrolledUnderElevation: 0,
+      ),
       body: Markdown(
         data: markdownData,
-        padding: EdgeInsets.only(top: 16, bottom: MediaQuery.of(context).padding.bottom + 10, left: 16, right: 16),
-          onTapLink: (text, href, title) async {
-              openLink(href.toString());
-          },
+        padding: EdgeInsets.only(
+            top: 16,
+            bottom: MediaQuery.of(context).padding.bottom + 10,
+            left: 16,
+            right: 16),
+        onTapLink: (text, href, title) async {
+          openLink(href.toString());
+        },
       ),
     );
   }
 }
 
-
 class PolicyPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-  final markdownData = '''
+    final markdownData = '''
   **Privacy Policy**
 
   This privacy policy applies to the WeatherMaster app (hereby referred to as "Application") for mobile devices that was created by Pranshul (hereby referred to as "Service Provider") as an Open Source service. This service is intended for use "AS IS".
@@ -313,27 +327,33 @@ class PolicyPage extends StatelessWidget {
 ''';
 
     return Scaffold(
-      appBar: AppBar(title: Text('privacy_policy'.tr()), titleSpacing: 0, scrolledUnderElevation: 0,),
+      appBar: AppBar(
+        title: Text('privacy_policy'.tr()),
+        titleSpacing: 0,
+        scrolledUnderElevation: 0,
+      ),
       body: Markdown(
         data: markdownData,
-        padding: EdgeInsets.only(top: 16, bottom: MediaQuery.of(context).padding.bottom + 10, left: 16, right: 16),
-          onTapLink: (text, href, title) async {
-              openLink(href.toString());
-          },
+        padding: EdgeInsets.only(
+            top: 16,
+            bottom: MediaQuery.of(context).padding.bottom + 10,
+            left: 16,
+            right: 16),
+        onTapLink: (text, href, title) async {
+          openLink(href.toString());
+        },
       ),
     );
   }
 }
 
-
-
 class CheckUpdateButton extends StatefulWidget {
   @override
   _CheckUpdateButtonState createState() => _CheckUpdateButtonState();
 }
 
 class _CheckUpdateButtonState extends State<CheckUpdateButton> {
-  final String currentVersion = 'v2.3.1';
+  final String currentVersion = 'v2.4.0';
   final String githubRepo = 'PranshulGG/WeatherMaster';
   bool isChecking = false;
 
@@ -342,7 +362,8 @@ class _CheckUpdateButtonState extends State<CheckUpdateButton> {
       isChecking = true;
     });
 
-    final String releasesUrl = 'https://api.github.com/repos/$githubRepo/releases';
+    final String releasesUrl =
+        'https://api.github.com/repos/$githubRepo/releases';
 
     try {
       final response = await http.get(Uri.parse(releasesUrl));
@@ -360,21 +381,28 @@ class _CheckUpdateButtonState extends State<CheckUpdateButton> {
 
       if (latestStable != null && latestStable['tag_name'] != currentVersion) {
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('new_version_available!'.tr()), behavior: SnackBarBehavior.floating,),
+          SnackBar(
+            content: Text('new_version_available!'.tr()),
+            behavior: SnackBarBehavior.floating,
+          ),
         );
 
         await Future.delayed(Duration(seconds: 1));
 
         final url = 'https://github.com/$githubRepo/releases';
-          openLink(url);
+        openLink(url);
       } else {
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('you_are_using_the_latest_version!'.tr()), behavior: SnackBarBehavior.floating),
+          SnackBar(
+              content: Text('you_are_using_the_latest_version!'.tr()),
+              behavior: SnackBarBehavior.floating),
         );
       }
     } catch (e) {
       ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('error_checking_for_updates'.tr()), behavior: SnackBarBehavior.floating),
+        SnackBar(
+            content: Text('error_checking_for_updates'.tr()),
+            behavior: SnackBarBehavior.floating),
       );
       print('Error: $e');
     }
@@ -386,20 +414,22 @@ class _CheckUpdateButtonState extends State<CheckUpdateButton> {
 
   @override
   Widget build(BuildContext context) {
-    return 
-      FilledButton.icon(
-    onPressed: isChecking ? null : checkForUpdates,
-    icon: Icon(Symbols.refresh, weight: 700,),
-    label: Text(isChecking ? 'checking'.tr() : currentVersion, style: TextStyle(fontWeight: FontWeight.w700)),
-    style: ButtonStyle(
-      padding: WidgetStateProperty.all(
-        EdgeInsets.symmetric(horizontal: 12, vertical: 5),
+    return FilledButton.icon(
+      onPressed: isChecking ? null : checkForUpdates,
+      icon: Icon(
+        Symbols.refresh,
+        weight: 700,
       ),
-      minimumSize: WidgetStateProperty.all(Size(0, 30)),
-      iconAlignment: IconAlignment.end,
-      tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-    ),
-
-  );
+      label: Text(isChecking ? 'checking'.tr() : currentVersion,
+          style: TextStyle(fontWeight: FontWeight.w700)),
+      style: ButtonStyle(
+        padding: WidgetStateProperty.all(
+          EdgeInsets.symmetric(horizontal: 12, vertical: 5),
+        ),
+        minimumSize: WidgetStateProperty.all(Size(0, 30)),
+        iconAlignment: IconAlignment.end,
+        tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+      ),
+    );
   }
 }
diff --git a/lib/screens/extended_widgets.dart b/lib/screens/extended_widgets.dart
index a5f21ef98..f77920c05 100644
--- a/lib/screens/extended_widgets.dart
+++ b/lib/screens/extended_widgets.dart
@@ -20,34 +20,21 @@ class ExtendWidget extends StatefulWidget {
 }
 
 class _ExtendWidgetState extends State<ExtendWidget> {
-
-
-
   Future<Map<String, dynamic>?> getWeatherWidgets() async {
-
-      final cacheKey = PreferencesHelper.getJson('currentLocation')?['cacheKey'];
+    final cacheKey = PreferencesHelper.getJson('currentLocation')?['cacheKey'];
 
     final box = await Hive.openBox('weatherMasterCache');
     final cached = box.get(cacheKey);
     if (cached == null) return null;
 
-
-    
-
-
     return json.decode(cached);
   }
 
-
-
   @override
   Widget build(BuildContext context) {
-   Widget child;
-   String extendedTitle = 'Unknown'; 
-   IconData? iconData;
-
-
-
+    Widget child;
+    String extendedTitle = 'Unknown';
+    IconData? iconData;
 
     if (widget.widgetType == 'humidity_widget') {
       child = buildHumidityExtended();
@@ -61,25 +48,25 @@ class _ExtendWidgetState extends State<ExtendWidget> {
       child = buildPressureExtended();
       extendedTitle = 'pressure'.tr();
       iconData = Symbols.compress;
-    }  else if (widget.widgetType == 'visibility_widget') {
+    } else if (widget.widgetType == 'visibility_widget') {
       child = buildVisibilityExtended();
       extendedTitle = 'visibility'.tr();
       iconData = Symbols.visibility;
-    } else if (widget.widgetType == 'winddirc_widget'){
+    } else if (widget.widgetType == 'winddirc_widget') {
       child = buildWindExtended();
       extendedTitle = 'wind'.tr();
-      iconData = Symbols.air;  
-    } else if (widget.widgetType == 'uv_widget'){
+      iconData = Symbols.air;
+    } else if (widget.widgetType == 'uv_widget') {
       child = buildUVExtended();
       extendedTitle = 'uv_index'.tr();
-      iconData = Symbols.flare;  
-    } else if (widget.widgetType == 'aqi_widget'){
+      iconData = Symbols.flare;
+    } else if (widget.widgetType == 'aqi_widget') {
       child = buildAQIExtended();
       extendedTitle = 'air_quality'.tr();
-      iconData = Symbols.airwave;  
-    } else if (widget.widgetType == 'precip_widget'){
+      iconData = Symbols.airwave;
+    } else if (widget.widgetType == 'precip_widget') {
       child = buildPrecipExtended();
-      extendedTitle =  'precipitation'.tr();
+      extendedTitle = 'precipitation'.tr();
       iconData = Symbols.rainy_heavy;
     } else {
       child = const Center(child: Text('Unknown widget type'));
@@ -87,749 +74,894 @@ class _ExtendWidgetState extends State<ExtendWidget> {
     }
 
     return Scaffold(
-      body: CustomScrollView(
-        slivers: [
-          SliverAppBar.large(
-            titleSpacing: 0,
-            automaticallyImplyLeading: false,
-            flexibleSpace: FlexibleSpaceBar(
-              title: Row(
-                spacing: 5,
-                children: [
-                  Icon(iconData),
-                  Text(extendedTitle)
-                ],
-              ),
-              expandedTitleScale: 1.3,
-              titlePadding: EdgeInsets.all(16),
-            ),
-            backgroundColor: Theme.of(context).colorScheme.surface,
-            expandedHeight: 100,
-            scrolledUnderElevation: 1,
-            actions: [
-              IconButton(onPressed: () {Navigator.pop(context);}, icon: Icon(Symbols.close, weight: 600,)),
-              SizedBox(width: 5)
-            ],
+        body: CustomScrollView(slivers: [
+      SliverAppBar.large(
+        titleSpacing: 0,
+        automaticallyImplyLeading: false,
+        flexibleSpace: FlexibleSpaceBar(
+          title: Row(
+            spacing: 5,
+            children: [Icon(iconData), Text(extendedTitle)],
           ),
-
-           SliverToBoxAdapter(
-            child: child,
-           )
-        ]
+          expandedTitleScale: 1.3,
+          titlePadding: EdgeInsets.all(16),
+        ),
+        backgroundColor: Theme.of(context).colorScheme.surface,
+        expandedHeight: 100,
+        scrolledUnderElevation: 1,
+        actions: [
+          IconButton(
+              onPressed: () {
+                Navigator.pop(context);
+              },
+              icon: Icon(
+                Symbols.close,
+                weight: 600,
+              )),
+          SizedBox(width: 5)
+        ],
+      ),
+      SliverToBoxAdapter(
+        child: child,
       )
-    );
+    ]));
   }
 
   Widget buildHumidityExtended() {
-  return FutureBuilder<Map<String, dynamic>?>(
-    future: getWeatherWidgets(),
-    builder: (context, snapshot) {
-      if (snapshot.connectionState == ConnectionState.waiting) {
-        return const Center(child: CircularProgressIndicator());
-      } else if (snapshot.hasError) {
-        return Center(child: Text('Error: ${snapshot.error}'));
-      } else if (!snapshot.hasData || snapshot.data == null) {
-        return Center(child: Text('no_data_available'.tr()));
-      }
+    return FutureBuilder<Map<String, dynamic>?>(
+      future: getWeatherWidgets(),
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.waiting) {
+          return const Center(child: CircularProgressIndicator());
+        } else if (snapshot.hasError) {
+          return Center(child: Text('Error: ${snapshot.error}'));
+        } else if (!snapshot.hasData || snapshot.data == null) {
+          return Center(child: Text('no_data_available'.tr()));
+        }
 
-      final data = snapshot.data!;
-     final weather = data['data'];
+        final data = snapshot.data!;
+        final weather = data['data'];
 
-    final hourly = weather['hourly'];
-    final List<dynamic> hourlyTime = hourly['time'];
-    final List<dynamic> hourlyhumidity = hourly['relative_humidity_2m'];
+        final hourly = weather['hourly'];
+        final List<dynamic> hourlyTime = hourly['time'];
+        final List<dynamic> hourlyhumidity = hourly['relative_humidity_2m'];
 
+        final offset = Duration(
+            seconds: int.parse(weather['utc_offset_seconds'].toString()));
+        final nowUtc = DateTime.now().toUtc();
+        final nowLocal = nowUtc.add(offset);
 
-    final offset = Duration(seconds: int.parse(weather['utc_offset_seconds'].toString()));
-    final nowUtc = DateTime.now().toUtc();
-    final nowLocal = nowUtc.add(offset);
+        final timeUnit =
+            PreferencesHelper.getString("selectedTimeUnit") ?? "12 hr";
 
-    final timeUnit = PreferencesHelper.getString("selectedTimeUnit") ?? "12 hr";
+        final roundedNow = DateTime(
+            nowLocal.year, nowLocal.month, nowLocal.day, nowLocal.hour);
 
+        int startIndex = hourlyTime.indexWhere((timeStr) {
+          final forecastLocal = DateTime.parse(timeStr);
+          return !forecastLocal.isBefore(roundedNow);
+        });
 
-    final roundedNow = DateTime(nowLocal.year, nowLocal.month, nowLocal.day, nowLocal.hour);
+        if (startIndex == -1) startIndex = 0;
 
-    int startIndex = hourlyTime.indexWhere((timeStr) {
-      final forecastLocal = DateTime.parse(timeStr); 
-      return !forecastLocal.isBefore(roundedNow);
-    });
+        List<int> todayHumidities = [];
 
-    if (startIndex == -1) startIndex = 0;
+        for (int i = 1; i <= 23 && i < hourlyhumidity.length; i++) {
+          final humidity = hourlyhumidity[i];
+          if (humidity is int) {
+            todayHumidities.add(humidity);
+          }
+        }
 
+        final int avgHumidity = todayHumidities.isNotEmpty
+            ? (todayHumidities.reduce((a, b) => a + b) ~/
+                todayHumidities.length)
+            : 0;
 
-List<int> todayHumidities = [];
-
-for (int i = 1; i <= 23 && i < hourlyhumidity.length; i++) {
-  final humidity = hourlyhumidity[i];
-  if (humidity is int) {
-    todayHumidities.add(humidity);
-  }
-}
-
-final int avgHumidity = todayHumidities.isNotEmpty
-    ? (todayHumidities.reduce((a, b) => a + b) ~/ todayHumidities.length)
-    : 0;
-
-
-    return Column(
-   children: [ 
-
-       Container(
-      height: 360,
-        decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceContainer,
-          borderRadius: BorderRadius.circular(18),
-        ),
-        padding: EdgeInsets.only(top: 12, bottom: 0),
-        margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
-        child: Column(
-        children: [
-        Container(
-          padding: EdgeInsets.fromLTRB(20, 10, 20, 0),
-          alignment: Alignment.centerLeft,
-       child:  Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text("todays_avg".tr(), style: TextStyle(fontSize: 20,  color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500)),
-            Text("$avgHumidity%", style: TextStyle(fontSize: 50,  color: Theme.of(context).colorScheme.secondary, fontWeight: FontWeight.w500),)
-            
-          ],
-      ),
-      ),
-
-
-       SizedBox(
-        height: 216,
-        child: ListView.builder(
-          scrollDirection: Axis.horizontal,
-          physics: BouncingScrollPhysics(),
-          itemCount: 24 + 24 - startIndex,
-          itemBuilder: (context, index) {
-          final dataIndex = startIndex + index;
-
-          if (dataIndex >= hourlyTime.length) return const SizedBox();
-          final forecastLocal = DateTime.parse(hourlyTime[dataIndex]);
-
-          final roundedDisplayTime = DateTime(
-            forecastLocal.year,
-            forecastLocal.month,
-            forecastLocal.day,
-            forecastLocal.hour,
-          );
-            final hour = timeUnit == '24 hr' ? "${roundedDisplayTime.hour.toString().padLeft(2, '0')}:00" : UnitConverter.formatTo12Hour(roundedDisplayTime);
-            final humidityPercentage = hourlyhumidity[dataIndex];
-
-
-          EdgeInsets itemMargin = EdgeInsets.only(
-              left: index == 0 ? 10 : 0,
-              right: index == 24 + 24 - startIndex - 1 ? 10 : 0,
-
-            );
-
-            return Container(
-              width: 53,
-              margin: itemMargin,
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(12),
-              ),
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.end,
-                children: [
-                  Stack(
-                  alignment: Alignment.bottomCenter,
-                  clipBehavior: Clip.none, 
-                  children: [
-                  Container(
-                    width: 20,
-                    height: 160,
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.surface,
-                      borderRadius: BorderRadius.circular(50),
-                    ),
+        return Column(children: [
+          Container(
+            height: 360,
+            decoration: BoxDecoration(
+              color: Theme.of(context).colorScheme.surfaceContainer,
+              borderRadius: BorderRadius.circular(18),
+            ),
+            padding: EdgeInsets.only(top: 12, bottom: 0),
+            margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
+            child: Column(
+              children: [
+                Container(
+                  padding: EdgeInsets.fromLTRB(20, 10, 20, 0),
+                  alignment: Alignment.centerLeft,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text("todays_avg".tr(),
+                          style: TextStyle(
+                              fontSize: 20,
+                              color: Theme.of(context).colorScheme.onSurface,
+                              fontWeight: FontWeight.w500)),
+                      Text(
+                        "$avgHumidity%",
+                        style: TextStyle(
+                            fontSize: 50,
+                            color: Theme.of(context).colorScheme.secondary,
+                            fontWeight: FontWeight.w500),
+                      )
+                    ],
                   ),
-                  Container(
-                    clipBehavior: Clip.none,
-                        width: 43,
-                        height: math.max((humidityPercentage / 100) * 160, 45), 
+                ),
+                SizedBox(
+                  height: 216,
+                  child: ListView.builder(
+                    scrollDirection: Axis.horizontal,
+                    physics: BouncingScrollPhysics(),
+                    itemCount: 24 + 24 - startIndex,
+                    itemBuilder: (context, index) {
+                      final dataIndex = startIndex + index;
+
+                      if (dataIndex >= hourlyTime.length)
+                        return const SizedBox();
+                      final forecastLocal =
+                          DateTime.parse(hourlyTime[dataIndex]);
+
+                      final roundedDisplayTime = DateTime(
+                        forecastLocal.year,
+                        forecastLocal.month,
+                        forecastLocal.day,
+                        forecastLocal.hour,
+                      );
+                      final hour = timeUnit == '24 hr'
+                          ? "${roundedDisplayTime.hour.toString().padLeft(2, '0')}:00"
+                          : UnitConverter.formatTo12Hour(roundedDisplayTime);
+                      final humidityPercentage = hourlyhumidity[dataIndex];
+
+                      EdgeInsets itemMargin = EdgeInsets.only(
+                        left: index == 0 ? 10 : 0,
+                        right: index == 24 + 24 - startIndex - 1 ? 10 : 0,
+                      );
+
+                      return Container(
+                        width: 53,
+                        margin: itemMargin,
                         decoration: BoxDecoration(
-                          color: Theme.of(context).colorScheme.primary,
-                          borderRadius: BorderRadius.circular(50),
+                          borderRadius: BorderRadius.circular(12),
                         ),
-                      child:  Align(
-                      alignment: Alignment.topCenter, 
-                      child: SizedBox(
-                        width: 60,
-                        height: 60,
-                        child: Stack(
-                           alignment: Alignment.center,
+                        child: Column(
+                          mainAxisAlignment: MainAxisAlignment.end,
                           children: [
-                            Positioned(
-                              top: 0,
-                              child:SvgPicture.string(
-                              '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            Stack(
+                                alignment: Alignment.bottomCenter,
+                                clipBehavior: Clip.none,
+                                children: [
+                                  Container(
+                                    width: 20,
+                                    height: 160,
+                                    decoration: BoxDecoration(
+                                      color:
+                                          Theme.of(context).colorScheme.surface,
+                                      borderRadius: BorderRadius.circular(50),
+                                    ),
+                                  ),
+                                  Container(
+                                    clipBehavior: Clip.none,
+                                    width: 43,
+                                    height: math.max(
+                                        (humidityPercentage / 100) * 160, 45),
+                                    decoration: BoxDecoration(
+                                      color:
+                                          Theme.of(context).colorScheme.primary,
+                                      borderRadius: BorderRadius.circular(50),
+                                    ),
+                                    child: Align(
+                                      alignment: Alignment.topCenter,
+                                      child: SizedBox(
+                                        width: 60,
+                                        height: 60,
+                                        child: Stack(
+                                            alignment: Alignment.center,
+                                            children: [
+                                              Positioned(
+                                                top: 0,
+                                                child: SvgPicture.string(
+                                                  '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
                             <path d="M20.3091 8.60363C20.4924 8.454 20.584 8.37919 20.6677 8.31603C22.6389 6.82799 25.3611 6.82799 27.3323 8.31603C27.416 8.37919 27.5076 8.454 27.6909 8.60363C27.7727 8.67042 27.8136 8.70381 27.8541 8.7356C28.7818 9.46445 29.9191 9.87748 31.0993 9.91409C31.1508 9.91569 31.2037 9.91634 31.3094 9.91765C31.5462 9.92059 31.6646 9.92206 31.7694 9.92733C34.2381 10.0516 36.3234 11.7974 36.8747 14.2015C36.8982 14.3036 36.9202 14.4197 36.9642 14.6518C36.9838 14.7555 36.9937 14.8073 37.0042 14.8576C37.2452 16.0109 37.8504 17.0567 38.7309 17.8416C38.7693 17.8759 38.8094 17.9103 38.8895 17.9791C39.069 18.1332 39.1588 18.2102 39.2357 18.2815C41.0467 19.96 41.5194 22.6347 40.393 24.8299C40.3451 24.9231 40.2872 25.0262 40.1714 25.2322C40.1196 25.3242 40.0938 25.3702 40.0694 25.4155C39.5111 26.4536 39.3009 27.6429 39.4697 28.8088C39.4771 28.8597 39.4856 28.9117 39.5027 29.0158C39.5409 29.249 39.56 29.3656 39.573 29.4695C39.879 31.9168 38.5179 34.2689 36.2407 35.2281C36.1441 35.2688 36.0333 35.3106 35.8118 35.3942C35.7129 35.4315 35.6635 35.4501 35.6156 35.4692C34.5192 35.9063 33.592 36.6826 32.9701 37.684C32.943 37.7277 32.916 37.7731 32.862 37.8637C32.741 38.0669 32.6806 38.1685 32.6236 38.2564C31.2814 40.3273 28.7233 41.2563 26.3609 40.5306C26.2606 40.4998 26.1489 40.4608 25.9253 40.3827C25.8256 40.3479 25.7757 40.3305 25.7268 40.3144C24.6052 39.9461 23.3948 39.9461 22.2732 40.3144C22.2243 40.3305 22.1744 40.3479 22.0747 40.3827C21.8511 40.4608 21.7394 40.4998 21.6391 40.5306C19.2767 41.2563 16.7186 40.3273 15.3764 38.2564C15.3194 38.1685 15.259 38.0669 15.138 37.8637C15.084 37.7731 15.057 37.7277 15.0299 37.684C14.408 36.6826 13.4808 35.9063 12.3844 35.4692C12.3365 35.4501 12.2871 35.4315 12.1882 35.3942C11.9667 35.3106 11.8559 35.2688 11.7593 35.2281C9.48205 34.2689 8.12097 31.9168 8.42698 29.4695C8.43997 29.3656 8.45908 29.249 8.4973 29.0158C8.51436 28.9117 8.52289 28.8597 8.53026 28.8088C8.69906 27.6429 8.48889 26.4536 7.93056 25.4155C7.90621 25.3702 7.88035 25.3242 7.82863 25.2322C7.71278 25.0262 7.65485 24.9231 7.60704 24.8299C6.48057 22.6347 6.95327 19.96 8.76433 18.2815C8.8412 18.2102 8.93096 18.1332 9.11047 17.9791C9.19061 17.9103 9.23068 17.8759 9.26908 17.8416C10.1496 17.0567 10.7548 16.0109 10.9958 14.8576C11.0063 14.8073 11.0162 14.7555 11.0358 14.6518C11.0798 14.4197 11.1019 14.3036 11.1253 14.2015C11.6766 11.7974 13.7619 10.0516 16.2306 9.92733C16.3354 9.92206 16.4538 9.92059 16.6906 9.91765C16.7963 9.91634 16.8492 9.91569 16.9007 9.91409C18.0809 9.87748 19.2182 9.46445 20.1459 8.7356C20.1864 8.70381 20.2273 8.67042 20.3091 8.60363Z" fill="#${Theme.of(context).colorScheme.primaryContainer.value.toRadixString(16).padLeft(8, '0').substring(2)}"/>
                             </svg> ''',
-                            ),
-                            ),
-                            Positioned(
-                            top: 0,
-                            child: SizedBox(
-                              height: 48,
-                              child: Icon(Symbols.humidity_high, color: Theme.of(context).colorScheme.onPrimaryContainer, size: 18,),),
-                            )
-                          ]
+                                                ),
+                                              ),
+                                              Positioned(
+                                                top: 0,
+                                                child: SizedBox(
+                                                  height: 48,
+                                                  child: Icon(
+                                                    Symbols.humidity_high,
+                                                    color: Theme.of(context)
+                                                        .colorScheme
+                                                        .onPrimaryContainer,
+                                                    size: 18,
+                                                  ),
+                                                ),
+                                              )
+                                            ]),
+                                      ),
+                                    ),
+                                  ),
+                                ]),
+                            const SizedBox(height: 10),
+                            Text("$humidityPercentage%",
+                                style: TextStyle(
+                                    fontSize: 14,
+                                    color: Theme.of(context)
+                                        .colorScheme
+                                        .onSurfaceVariant,
+                                    fontWeight: FontWeight.w500)),
+                            Text(hour,
+                                style: TextStyle(
+                                    fontSize: 15,
+                                    color:
+                                        Theme.of(context).colorScheme.onSurface,
+                                    fontWeight: FontWeight.w500)),
+                          ],
                         ),
-                      ),
-                    ),
+                      );
+                    },
                   ),
-                  ]
-                  ),
-                  const SizedBox(height: 10),
-
-                  Text("$humidityPercentage%", style: TextStyle(fontSize: 14, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text(hour, style: TextStyle(fontSize: 15, color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500)),
-                ],
+                ),
+              ],
+            ),
+          ),
+          Container(
+              margin: EdgeInsets.fromLTRB(
+                  12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
+              padding: EdgeInsets.all(20),
+              decoration: BoxDecoration(
+                border: Border.all(
+                  width: 1,
+                  color: Theme.of(context).colorScheme.outlineVariant,
+                ),
+                borderRadius: BorderRadius.circular(18),
               ),
-              );
-          },
-        ),
-       ),
-
-
-      ],
-      ),
-      ),
-
-    Container(
-     margin: EdgeInsets.fromLTRB(12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
-     padding: EdgeInsets.all(20),
-     decoration: BoxDecoration(
-      border: Border.all(
-        width: 1,
-        color: Theme.of(context).colorScheme.outlineVariant,
-      ),
-      borderRadius: BorderRadius.circular(18),
-     ),
-     child:  Column(  
-      spacing: 20,
-        children: [
-          Text("humidity_info".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-          Text("humidity_info_2".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-        ],
-      )
-      )
-      
-   ]
-   
-    ); 
-    },
-  );
-
+              child: Column(
+                spacing: 20,
+                children: [
+                  Text("humidity_info".tr(),
+                      style: TextStyle(
+                          fontSize: 17,
+                          color: Theme.of(context).colorScheme.onSurfaceVariant,
+                          fontWeight: FontWeight.w500)),
+                  Text("humidity_info_2".tr(),
+                      style: TextStyle(
+                          fontSize: 17,
+                          color: Theme.of(context).colorScheme.onSurfaceVariant,
+                          fontWeight: FontWeight.w500)),
+                ],
+              ))
+        ]);
+      },
+    );
   }
 
   Widget buildSunExtended() {
     return FutureBuilder<Map<String, dynamic>?>(
-    future: getWeatherWidgets(),
-    builder: (context, snapshot) {
-      if (snapshot.connectionState == ConnectionState.waiting) {
-        return const Center(child: CircularProgressIndicator());
-      } else if (snapshot.hasError) {
-        return Center(child: Text('Error: ${snapshot.error}'));
-      } else if (!snapshot.hasData || snapshot.data == null) {
-        return Center(child: Text('no_data_available'.tr()));
-      }
+        future: getWeatherWidgets(),
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.waiting) {
+            return const Center(child: CircularProgressIndicator());
+          } else if (snapshot.hasError) {
+            return Center(child: Text('Error: ${snapshot.error}'));
+          } else if (!snapshot.hasData || snapshot.data == null) {
+            return Center(child: Text('no_data_available'.tr()));
+          }
 
-      final data = snapshot.data!;
-     final weather = data['data'];
+          final data = snapshot.data!;
+          final weather = data['data'];
 
-    final daily = weather['daily'];
+          final daily = weather['daily'];
 
-    final  currentSunrise = daily['sunrise'][0];
-    final  currentSunset = daily['sunset'][0];
+          final currentSunrise = daily['sunrise'][0];
+          final currentSunset = daily['sunset'][0];
 
+          int offsetSeconds =
+              int.parse(weather['utc_offset_seconds'].toString());
+          DateTime utcNow = DateTime.now().toUtc();
+          DateTime now = utcNow.add(Duration(seconds: offsetSeconds));
+          DateTime sunrise = DateTime.parse(currentSunrise);
+          DateTime sunset = DateTime.parse(currentSunset);
 
-    int offsetSeconds = int.parse(weather['utc_offset_seconds'].toString());
-    DateTime utcNow = DateTime.now().toUtc();
-    DateTime now = utcNow.add(Duration(seconds: offsetSeconds));
-    DateTime sunrise = DateTime.parse(currentSunrise);
-    DateTime sunset = DateTime.parse(currentSunset);
+          now = DateTime(
+            now.year,
+            now.month,
+            now.day,
+            now.hour,
+            now.minute,
+            now.second,
+            now.millisecond,
+            now.microsecond,
+          );
 
+          final timeUnit =
+              PreferencesHelper.getString("selectedTimeUnit") ?? '12 hr';
 
-    now = DateTime(
-      now.year,
-      now.month,
-      now.day,
-      now.hour,
-      now.minute,
-      now.second,
-      now.millisecond,
-      now.microsecond,
-    );
+          final sunriseFormat = timeUnit == '24 hr'
+              ? DateFormat.Hm().format(sunrise)
+              : DateFormat.jm().format(sunrise);
+          final sunsetFormat = timeUnit == '24 hr'
+              ? DateFormat.Hm().format(sunset)
+              : DateFormat.jm().format(sunset);
 
-    final timeUnit = PreferencesHelper.getString("selectedTimeUnit") ?? '12 hr';
+          if (sunset.isBefore(sunrise)) {
+            sunset = sunset.add(Duration(days: 1));
+          }
 
+          final timeZoneOffset = offsetSeconds / 3600.0;
+          final instant = Instant(
+            year: now.year,
+            month: now.month,
+            day: now.day,
+            hour: now.hour,
+            minute: now.minute,
+            second: now.second,
+            timeZoneOffset: timeZoneOffset,
+          );
 
+          String formatInstantToLocalTime(Instant instant,
+              {String timeUnit = '24 hr'}) {
+            final dateTime = DateTime(
+              instant.year,
+              instant.month,
+              instant.day,
+              instant.hour,
+              instant.minute,
+              instant.second,
+            ).toLocal();
 
-    final sunriseFormat = timeUnit == '24 hr' ? DateFormat.Hm().format(sunrise) : DateFormat.jm().format(sunrise);
-    final sunsetFormat = timeUnit == '24 hr' ? DateFormat.Hm().format(sunset) : DateFormat.jm().format(sunset);
+            final formatter =
+                timeUnit == '24 hr' ? DateFormat.Hm() : DateFormat.jm();
 
-    if (sunset.isBefore(sunrise)) {
-      sunset = sunset.add(Duration(days: 1));
-    }
+            return formatter.format(dateTime);
+          }
 
- final timeZoneOffset = offsetSeconds / 3600.0;
-  final instant = Instant(
-    year: now.year,
-    month: now.month,
-    day: now.day,
-    hour: now.hour,
-    minute: now.minute,
-    second: now.second,
-    timeZoneOffset: timeZoneOffset,
-  );
+          final calc = SolarCalculator(
+              instant, weather['latitude'], weather['longitude']);
 
+          final timeFormatDUSKDAWN =
+              timeUnit == '24 hr' ? DateFormat.Hm() : DateFormat.jm();
 
-String formatInstantToLocalTime(Instant instant, {String timeUnit = '24 hr'}) {
-  final dateTime = DateTime(
-    instant.year,
-    instant.month,
-    instant.day,
-    instant.hour,
-    instant.minute,
-    instant.second,
-  ).toLocal();
+          final dawn = calc.morningCivilTwilight.begining;
+          final dusk = calc.eveningCivilTwilight.ending;
 
-  final formatter = timeUnit == '24 hr' ? DateFormat.Hm() : DateFormat.jm();
+          final dawnFormatted = formatInstantToLocalTime(dawn,
+              timeUnit: timeFormatDUSKDAWN.toString());
+          final duskFormatted = formatInstantToLocalTime(dusk,
+              timeUnit: timeFormatDUSKDAWN.toString());
 
-  return formatter.format(dateTime);
-}
+          double percent = ((now.difference(sunrise).inSeconds) /
+                  (sunset.difference(sunrise).inSeconds))
+              .clamp(0, 1);
 
-  final calc = SolarCalculator(instant, weather['latitude'], weather['longitude']);
+          final isSmallScreen = MediaQuery.of(context).size.width < 400;
 
-  final timeFormatDUSKDAWN = timeUnit == '24 hr' ? DateFormat.Hm() : DateFormat.jm();
+          final dawnWidget = Column(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Text("dawn".tr(),
+                  style: TextStyle(
+                      color: Theme.of(context).colorScheme.primary,
+                      fontWeight: FontWeight.w500,
+                      fontSize: 15)),
+              Text(dawnFormatted,
+                  style: TextStyle(
+                      color: Theme.of(context).colorScheme.primary,
+                      fontWeight: FontWeight.w500,
+                      fontSize: 18)),
+            ],
+          );
 
-  final dawn = calc.morningCivilTwilight.begining;
-  final dusk = calc.eveningCivilTwilight.ending;
+          final sunriseWidget = Column(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Text("sunrise".tr(),
+                  style: TextStyle(
+                      color: Theme.of(context).colorScheme.primary,
+                      fontWeight: FontWeight.w500,
+                      fontSize: 15)),
+              Text(sunriseFormat,
+                  style: TextStyle(
+                      color: Theme.of(context).colorScheme.primary,
+                      fontWeight: FontWeight.w500,
+                      fontSize: 18)),
+            ],
+          );
 
+          final duskWidget = Column(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Text("dusk".tr(),
+                  style: TextStyle(
+                      color: Theme.of(context).colorScheme.secondary,
+                      fontWeight: FontWeight.w500,
+                      fontSize: 15)),
+              Text(duskFormatted,
+                  style: TextStyle(
+                      color: Theme.of(context).colorScheme.secondary,
+                      fontWeight: FontWeight.w500,
+                      fontSize: 18)),
+            ],
+          );
 
-final dawnFormatted = formatInstantToLocalTime(dawn, timeUnit: timeFormatDUSKDAWN.toString());
-final duskFormatted = formatInstantToLocalTime(dusk, timeUnit: timeFormatDUSKDAWN.toString());
-
-
-    double percent = ((now.difference(sunrise).inSeconds) / (sunset.difference(sunrise).inSeconds)).clamp(0, 1);
-
-  final isSmallScreen = MediaQuery.of(context).size.width < 400;
-
-  final dawnWidget = Column(
-    crossAxisAlignment: CrossAxisAlignment.center,
-    children: [
-      Text("dawn".tr(), style: TextStyle(color: Theme.of(context).colorScheme.primary, fontWeight: FontWeight.w500, fontSize: 15)),
-      Text(dawnFormatted, style: TextStyle(color: Theme.of(context).colorScheme.primary, fontWeight: FontWeight.w500, fontSize: 18)),
-    ],
-  );
-
-  final sunriseWidget = Column(
-    crossAxisAlignment: CrossAxisAlignment.center,
-    children: [
-      Text("sunrise".tr(), style: TextStyle(color: Theme.of(context).colorScheme.primary, fontWeight: FontWeight.w500, fontSize: 15)),
-      Text(sunriseFormat, style: TextStyle(color: Theme.of(context).colorScheme.primary, fontWeight: FontWeight.w500, fontSize: 18)),
-    ],
-  );
-
-  final duskWidget = Column(
-    crossAxisAlignment: CrossAxisAlignment.center,
-    children: [
-      Text("dusk".tr(), style: TextStyle(color: Theme.of(context).colorScheme.secondary, fontWeight: FontWeight.w500, fontSize: 15)),
-      Text(duskFormatted, style: TextStyle(color: Theme.of(context).colorScheme.secondary, fontWeight: FontWeight.w500, fontSize: 18)),
-    ],
-  );
-
-  final sunsetWidget = Column(
-    crossAxisAlignment: CrossAxisAlignment.center,
-    children: [
-      Text("sunset".tr(), style: TextStyle(color: Theme.of(context).colorScheme.secondary, fontWeight: FontWeight.w500, fontSize: 15)),
-      Text(sunsetFormat, style: TextStyle(color: Theme.of(context).colorScheme.secondary, fontWeight: FontWeight.w500, fontSize: 18)),
-    ],
-  );
-  return Column(
-    children: [
-   Container(
-      height: 250,
-      margin: EdgeInsets.all(10),
-      clipBehavior: Clip.hardEdge,
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(28),
-        color: Theme.of(context).colorScheme.surfaceContainerLow
-      ),
-      child: Stack(  
-          children: [
-            Positioned(
-              bottom: -30,
-              left: 0,
-              right: 0,
-              child:   AspectRatio(
-                aspectRatio: 1.6,
-                child: SvgPicture.string(
-                clipBehavior: Clip.none,
-                  buildSunPathWithIcon(
-                    pathColor: Theme.of(context).colorScheme.primary,
-                    percent: percent,
-                    outLineColor: Theme.of(context).colorScheme.onSurface,
-                  ),
-                  allowDrawingOutsideViewBox: true,
-                  fit: BoxFit.fill,
-
-                ),
-              ),
-              ),
-                    
+          final sunsetWidget = Column(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Text("sunset".tr(),
+                  style: TextStyle(
+                      color: Theme.of(context).colorScheme.secondary,
+                      fontWeight: FontWeight.w500,
+                      fontSize: 15)),
+              Text(sunsetFormat,
+                  style: TextStyle(
+                      color: Theme.of(context).colorScheme.secondary,
+                      fontWeight: FontWeight.w500,
+                      fontSize: 18)),
+            ],
+          );
+          return Column(children: [
+            Container(
+              height: 250,
+              margin: EdgeInsets.all(10),
+              clipBehavior: Clip.hardEdge,
+              decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(28),
+                  color: Theme.of(context).colorScheme.surfaceContainerLow),
+              child: Stack(children: [
                 Positioned(
-                      left: 0,
-                      bottom: -1,
-                      right: -1,
-                      child: Container(
-                      height: 100,
-                        decoration: BoxDecoration(
-                            border: Border(
-                            top: BorderSide(
-                              color: Theme.of(context).colorScheme.outline, 
-                              width: 1.5,
-                            ),
+                  bottom: -30,
+                  left: 0,
+                  right: 0,
+                  child: AspectRatio(
+                    aspectRatio: 1.6,
+                    child: SvgPicture.string(
+                      clipBehavior: Clip.none,
+                      buildSunPathWithIcon(
+                        pathColor: Theme.of(context).colorScheme.primary,
+                        percent: percent,
+                        outLineColor: Theme.of(context).colorScheme.onSurface,
+                      ),
+                      allowDrawingOutsideViewBox: true,
+                      fit: BoxFit.fill,
+                    ),
+                  ),
+                ),
+                Positioned(
+                  left: 0,
+                  bottom: -1,
+                  right: -1,
+                  child: Container(
+                    height: 100,
+                    decoration: BoxDecoration(
+                        border: Border(
+                          top: BorderSide(
+                            color: Theme.of(context).colorScheme.outline,
+                            width: 1.5,
                           ),
-                          color: const Color.fromRGBO(0, 0, 0, 0.5),
-                          borderRadius: BorderRadius.only(bottomLeft: Radius.circular(20), bottomRight: Radius.circular(20))
                         ),
-                      ),
-                      ),
-                    ]
+                        color: const Color.fromRGBO(0, 0, 0, 0.5),
+                        borderRadius: BorderRadius.only(
+                            bottomLeft: Radius.circular(20),
+                            bottomRight: Radius.circular(20))),
+                  ),
                 ),
-                ),
-
-                SizedBox(height: 10,),
-                isSmallScreen
-                  ? Column(
-                      children: [
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                          children: [dawnWidget, sunriseWidget],
-                        ),
-                        SizedBox(height: 10),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                          children: [duskWidget, sunsetWidget],
-                        ),
-                      ],
-                    )
-                    : Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceAround,
-                        children: [dawnWidget, sunriseWidget, duskWidget, sunsetWidget],
+              ]),
+            ),
+            SizedBox(
+              height: 10,
+            ),
+            isSmallScreen
+                ? Column(
+                    children: [
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                        children: [dawnWidget, sunriseWidget],
+                      ),
+                      SizedBox(height: 10),
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                        children: [duskWidget, sunsetWidget],
+                      ),
+                    ],
+                  )
+                : Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceAround,
+                    children: [
+                      dawnWidget,
+                      sunriseWidget,
+                      duskWidget,
+                      sunsetWidget
+                    ],
                   ),
             Container(
-              margin: EdgeInsets.fromLTRB(12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
-              padding: EdgeInsets.all(20),
-              decoration: BoxDecoration(
-              border: Border.all(
-                width: 1,
-                color: Theme.of(context).colorScheme.outlineVariant,
-              ),
-              borderRadius: BorderRadius.circular(18),
-              ),
-              child:  Column(  
-              spacing: 20,
-                children: [
-                  Text("sunset_rise_info".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text("sunset_rise_info_2".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text("sunset_rise_info_3".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text("sunset_rise_info_4".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                ],
-              )
-          )
-        ]
-      );
-    }
-    );
+                margin: EdgeInsets.fromLTRB(
+                    12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
+                padding: EdgeInsets.all(20),
+                decoration: BoxDecoration(
+                  border: Border.all(
+                    width: 1,
+                    color: Theme.of(context).colorScheme.outlineVariant,
+                  ),
+                  borderRadius: BorderRadius.circular(18),
+                ),
+                child: Column(
+                  spacing: 20,
+                  children: [
+                    Text("sunset_rise_info".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                    Text("sunset_rise_info_2".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                    Text("sunset_rise_info_3".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                    Text("sunset_rise_info_4".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                  ],
+                ))
+          ]);
+        });
   }
 
-
-  Widget buildPressureExtended(){
+  Widget buildPressureExtended() {
     return FutureBuilder<Map<String, dynamic>?>(
-    future: getWeatherWidgets(),
-    builder: (context, snapshot) {
-      if (snapshot.connectionState == ConnectionState.waiting) {
-        return const Center(child: CircularProgressIndicator());
-      } else if (snapshot.hasError) {
-        return Center(child: Text('Error: ${snapshot.error}'));
-      } else if (!snapshot.hasData || snapshot.data == null) {
-        return Center(child: Text('no_data_available'.tr()));
-      }
-
-      final data = snapshot.data!;
-      final weather = data['data'];
-      final pressureCurrent = weather['current'];
-      final pressureHourly = weather['hourly']['pressure_msl'];
-
-      final pressureUnit = PreferencesHelper.getString("selectedPressureUnit") ?? 'hPa';
-
-      final convertedPressure = pressureUnit == 'inHg'
-      ? UnitConverter.hPaToInHg(pressureCurrent['pressure_msl'])
-      : pressureUnit == 'mmHg'
-          ? UnitConverter.hPaToMmHg(pressureCurrent['pressure_msl'])
-          : pressureCurrent['pressure_msl'];
-
-
-    final hourly = weather['hourly'];
-    final List<dynamic> hourlyTime = hourly['time'];
-    final List<double> hourlyPressure = 
-    (hourly['pressure_msl'] as List<dynamic>)
-        .map((e) => (e as num).toDouble())
-        .toList();
-
-
-
-    final offset = Duration(seconds: int.parse(weather['utc_offset_seconds'].toString()));
-    final nowUtc = DateTime.now().toUtc();
-    final nowLocal = nowUtc.add(offset);
-
-    final timeUnit = PreferencesHelper.getString("selectedTimeUnit") ?? '12 hr';
-
-
-    final roundedNow = DateTime(nowLocal.year, nowLocal.month, nowLocal.day, nowLocal.hour);
-
-    int startIndex = hourlyTime.indexWhere((timeStr) {
-      final forecastLocal = DateTime.parse(timeStr); 
-      return !forecastLocal.isBefore(roundedNow);
-    });
-
-    if (startIndex == -1) startIndex = 0;
-
-    final double minPressure = hourlyPressure.reduce((a, b) => a < b ? a : b);
-    final double maxPressure = hourlyPressure.reduce((a, b) => a > b ? a : b);
-
-
-     return Column(
-   children: [ 
-
-       Container(
-      height: 360,
-        decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceContainer,
-          borderRadius: BorderRadius.circular(18),
-        ),
-        padding: EdgeInsets.only(top: 12, bottom: 0),
-        margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
-        child: Column(
-        children: [
-        Container(
-          padding: EdgeInsets.fromLTRB(20, 10, 20, 0),
-          alignment: Alignment.centerLeft,
-       child:  Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text("current_conditions".tr(), style: TextStyle(fontSize: 20,  color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500)),
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Text("${convertedPressure.round()}", style: TextStyle(fontSize: 50,  color: Theme.of(context).colorScheme.secondary, fontWeight: FontWeight.w500),),
-                Padding(padding: EdgeInsets.only(bottom: 11, left: 8),
-               child: Text(localizePressureUnit(PreferencesHelper.getString("selectedPressureUnit") ?? 'hPa', context.locale), style: TextStyle(fontSize: 20,  color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500),))
-              ],
-            )
-            
-          ],
-      ),
-      ),
-
-
-       SizedBox(
-        height: 216,
-        child: ListView.builder(
-          scrollDirection: Axis.horizontal,
-          physics: BouncingScrollPhysics(),
-          itemCount: 24 + 24 - startIndex,
-          itemBuilder: (context, index) {
-          final dataIndex = startIndex + index;
-
-          if (dataIndex >= hourlyTime.length) return const SizedBox();
-          final forecastLocal = DateTime.parse(hourlyTime[dataIndex]);
-
-          final roundedDisplayTime = DateTime(
-            forecastLocal.year,
-            forecastLocal.month,
-            forecastLocal.day,
-            forecastLocal.hour,
-          );
-            final hour = timeUnit == '24 hr' ? "${roundedDisplayTime.hour.toString().padLeft(2, '0')}:00" : UnitConverter.formatTo12Hour(roundedDisplayTime);
-            final currentPressure = hourlyPressure[dataIndex];
-            final pressurePercentage = ((currentPressure - minPressure) / (maxPressure - minPressure)) * 100;
-
-
-        Widget? pressureTrendIcon;
-        Color? pressureprimary;
-
-        if (dataIndex > 0) {
-          final previousPressure = hourlyPressure[dataIndex - 1];
-          final pressureDifference = currentPressure - previousPressure;
-
-          if (pressureDifference > 0.5) {
-            pressureTrendIcon = Icon(Symbols.arrow_upward, size: 18, color: Theme.of(context).colorScheme.onPrimaryContainer, weight: 600);
-            pressureprimary = Theme.of(context).colorScheme.primaryContainer;
-          } else if (pressureDifference < -0.5) {
-            pressureTrendIcon = Icon(Symbols.arrow_downward, size: 18, color: Theme.of(context).colorScheme.onError, weight: 600);
-            pressureprimary = Theme.of(context).colorScheme.error;
-          } else {
-            pressureTrendIcon = Icon(Symbols.trending_flat, size: 18, color: Theme.of(context).colorScheme.onSurfaceVariant, weight: 600);
-            pressureprimary = Theme.of(context).colorScheme.surfaceContainerLowest;
+        future: getWeatherWidgets(),
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.waiting) {
+            return const Center(child: CircularProgressIndicator());
+          } else if (snapshot.hasError) {
+            return Center(child: Text('Error: ${snapshot.error}'));
+          } else if (!snapshot.hasData || snapshot.data == null) {
+            return Center(child: Text('no_data_available'.tr()));
           }
-        }
 
+          final data = snapshot.data!;
+          final weather = data['data'];
+          final pressureCurrent = weather['current'];
+          final pressureHourly = weather['hourly']['pressure_msl'];
 
+          final pressureUnit =
+              PreferencesHelper.getString("selectedPressureUnit") ?? 'hPa';
 
-          EdgeInsets itemMargin = EdgeInsets.only(
-              left: index == 0 ? 10 : 0,
-              right: index == 24 + 24 - startIndex - 1 ? 10 : 0,
+          final convertedPressure = pressureUnit == 'inHg'
+              ? UnitConverter.hPaToInHg(pressureCurrent['pressure_msl'])
+              : pressureUnit == 'mmHg'
+                  ? UnitConverter.hPaToMmHg(pressureCurrent['pressure_msl'])
+                  : pressureCurrent['pressure_msl'];
 
-            );
+          final hourly = weather['hourly'];
+          final List<dynamic> hourlyTime = hourly['time'];
+          final List<double> hourlyPressure =
+              (hourly['pressure_msl'] as List<dynamic>)
+                  .map((e) => (e as num).toDouble())
+                  .toList();
 
-            return Container(
-              width: 53,
-              margin: itemMargin,
+          final offset = Duration(
+              seconds: int.parse(weather['utc_offset_seconds'].toString()));
+          final nowUtc = DateTime.now().toUtc();
+          final nowLocal = nowUtc.add(offset);
+
+          final timeUnit =
+              PreferencesHelper.getString("selectedTimeUnit") ?? '12 hr';
+
+          final roundedNow = DateTime(
+              nowLocal.year, nowLocal.month, nowLocal.day, nowLocal.hour);
+
+          int startIndex = hourlyTime.indexWhere((timeStr) {
+            final forecastLocal = DateTime.parse(timeStr);
+            return !forecastLocal.isBefore(roundedNow);
+          });
+
+          if (startIndex == -1) startIndex = 0;
+
+          final double minPressure =
+              hourlyPressure.reduce((a, b) => a < b ? a : b);
+          final double maxPressure =
+              hourlyPressure.reduce((a, b) => a > b ? a : b);
+
+          return Column(children: [
+            Container(
+              height: 360,
               decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(12),
+                color: Theme.of(context).colorScheme.surfaceContainer,
+                borderRadius: BorderRadius.circular(18),
               ),
+              padding: EdgeInsets.only(top: 12, bottom: 0),
+              margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
               child: Column(
-                mainAxisAlignment: MainAxisAlignment.end,
                 children: [
-                  Stack(
-                  alignment: Alignment.bottomCenter,
-                  clipBehavior: Clip.none, 
-                  children: [
                   Container(
-                    width: 20,
-                    height: 160,
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.surface,
-                      borderRadius: BorderRadius.circular(50),
+                    padding: EdgeInsets.fromLTRB(20, 10, 20, 0),
+                    alignment: Alignment.centerLeft,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text("current_conditions".tr(),
+                            style: TextStyle(
+                                fontSize: 20,
+                                color: Theme.of(context).colorScheme.onSurface,
+                                fontWeight: FontWeight.w500)),
+                        Row(
+                          crossAxisAlignment: CrossAxisAlignment.end,
+                          children: [
+                            Text(
+                              "${convertedPressure.round()}",
+                              style: TextStyle(
+                                  fontSize: 50,
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
+                                  fontWeight: FontWeight.w500),
+                            ),
+                            Padding(
+                                padding: EdgeInsets.only(bottom: 11, left: 8),
+                                child: Text(
+                                  localizePressureUnit(
+                                      PreferencesHelper.getString(
+                                              "selectedPressureUnit") ??
+                                          'hPa',
+                                      context.locale),
+                                  style: TextStyle(
+                                      fontSize: 20,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurfaceVariant,
+                                      fontWeight: FontWeight.w500),
+                                ))
+                          ],
+                        )
+                      ],
                     ),
                   ),
-                  Container(
-                    clipBehavior: Clip.none,
-                        width: 43,
-                        height: math.max((pressurePercentage / 100) * 160, 45), 
-                        decoration: BoxDecoration(
-                          color: Theme.of(context).colorScheme.primary,
-                          borderRadius: BorderRadius.circular(50),
-                        ),
-                      child:  Align(
-                      alignment: Alignment.topCenter, 
-                      child: SizedBox(
-                        width: 60,
-                        height: 60,
-                        child: Stack(
-                           alignment: Alignment.center,
-                          children: [
-                            Positioned(
-                              top: 0,
-                              child:SvgPicture.string(
-                              '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+                  SizedBox(
+                    height: 216,
+                    child: ListView.builder(
+                      scrollDirection: Axis.horizontal,
+                      physics: BouncingScrollPhysics(),
+                      itemCount: 24 + 24 - startIndex,
+                      itemBuilder: (context, index) {
+                        final dataIndex = startIndex + index;
+
+                        if (dataIndex >= hourlyTime.length)
+                          return const SizedBox();
+                        final forecastLocal =
+                            DateTime.parse(hourlyTime[dataIndex]);
+
+                        final roundedDisplayTime = DateTime(
+                          forecastLocal.year,
+                          forecastLocal.month,
+                          forecastLocal.day,
+                          forecastLocal.hour,
+                        );
+                        final hour = timeUnit == '24 hr'
+                            ? "${roundedDisplayTime.hour.toString().padLeft(2, '0')}:00"
+                            : UnitConverter.formatTo12Hour(roundedDisplayTime);
+                        final currentPressure = hourlyPressure[dataIndex];
+                        final pressurePercentage =
+                            ((currentPressure - minPressure) /
+                                    (maxPressure - minPressure)) *
+                                100;
+
+                        Widget? pressureTrendIcon;
+                        Color? pressureprimary;
+
+                        if (dataIndex > 0) {
+                          final previousPressure =
+                              hourlyPressure[dataIndex - 1];
+                          final pressureDifference =
+                              currentPressure - previousPressure;
+
+                          if (pressureDifference > 0.5) {
+                            pressureTrendIcon = Icon(Symbols.arrow_upward,
+                                size: 18,
+                                color: Theme.of(context)
+                                    .colorScheme
+                                    .onPrimaryContainer,
+                                weight: 600);
+                            pressureprimary =
+                                Theme.of(context).colorScheme.primaryContainer;
+                          } else if (pressureDifference < -0.5) {
+                            pressureTrendIcon = Icon(Symbols.arrow_downward,
+                                size: 18,
+                                color: Theme.of(context).colorScheme.onError,
+                                weight: 600);
+                            pressureprimary =
+                                Theme.of(context).colorScheme.error;
+                          } else {
+                            pressureTrendIcon = Icon(Symbols.trending_flat,
+                                size: 18,
+                                color: Theme.of(context)
+                                    .colorScheme
+                                    .onSurfaceVariant,
+                                weight: 600);
+                            pressureprimary = Theme.of(context)
+                                .colorScheme
+                                .surfaceContainerLowest;
+                          }
+                        }
+
+                        EdgeInsets itemMargin = EdgeInsets.only(
+                          left: index == 0 ? 10 : 0,
+                          right: index == 24 + 24 - startIndex - 1 ? 10 : 0,
+                        );
+
+                        return Container(
+                          width: 53,
+                          margin: itemMargin,
+                          decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.end,
+                            children: [
+                              Stack(
+                                  alignment: Alignment.bottomCenter,
+                                  clipBehavior: Clip.none,
+                                  children: [
+                                    Container(
+                                      width: 20,
+                                      height: 160,
+                                      decoration: BoxDecoration(
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .surface,
+                                        borderRadius: BorderRadius.circular(50),
+                                      ),
+                                    ),
+                                    Container(
+                                      clipBehavior: Clip.none,
+                                      width: 43,
+                                      height: math.max(
+                                          (pressurePercentage / 100) * 160, 45),
+                                      decoration: BoxDecoration(
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .primary,
+                                        borderRadius: BorderRadius.circular(50),
+                                      ),
+                                      child: Align(
+                                        alignment: Alignment.topCenter,
+                                        child: SizedBox(
+                                          width: 60,
+                                          height: 60,
+                                          child: Stack(
+                                              alignment: Alignment.center,
+                                              children: [
+                                                Positioned(
+                                                  top: 0,
+                                                  child: SvgPicture.string(
+                                                    '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
                             <path d="M20.3091 8.60363C20.4924 8.454 20.584 8.37919 20.6677 8.31603C22.6389 6.82799 25.3611 6.82799 27.3323 8.31603C27.416 8.37919 27.5076 8.454 27.6909 8.60363C27.7727 8.67042 27.8136 8.70381 27.8541 8.7356C28.7818 9.46445 29.9191 9.87748 31.0993 9.91409C31.1508 9.91569 31.2037 9.91634 31.3094 9.91765C31.5462 9.92059 31.6646 9.92206 31.7694 9.92733C34.2381 10.0516 36.3234 11.7974 36.8747 14.2015C36.8982 14.3036 36.9202 14.4197 36.9642 14.6518C36.9838 14.7555 36.9937 14.8073 37.0042 14.8576C37.2452 16.0109 37.8504 17.0567 38.7309 17.8416C38.7693 17.8759 38.8094 17.9103 38.8895 17.9791C39.069 18.1332 39.1588 18.2102 39.2357 18.2815C41.0467 19.96 41.5194 22.6347 40.393 24.8299C40.3451 24.9231 40.2872 25.0262 40.1714 25.2322C40.1196 25.3242 40.0938 25.3702 40.0694 25.4155C39.5111 26.4536 39.3009 27.6429 39.4697 28.8088C39.4771 28.8597 39.4856 28.9117 39.5027 29.0158C39.5409 29.249 39.56 29.3656 39.573 29.4695C39.879 31.9168 38.5179 34.2689 36.2407 35.2281C36.1441 35.2688 36.0333 35.3106 35.8118 35.3942C35.7129 35.4315 35.6635 35.4501 35.6156 35.4692C34.5192 35.9063 33.592 36.6826 32.9701 37.684C32.943 37.7277 32.916 37.7731 32.862 37.8637C32.741 38.0669 32.6806 38.1685 32.6236 38.2564C31.2814 40.3273 28.7233 41.2563 26.3609 40.5306C26.2606 40.4998 26.1489 40.4608 25.9253 40.3827C25.8256 40.3479 25.7757 40.3305 25.7268 40.3144C24.6052 39.9461 23.3948 39.9461 22.2732 40.3144C22.2243 40.3305 22.1744 40.3479 22.0747 40.3827C21.8511 40.4608 21.7394 40.4998 21.6391 40.5306C19.2767 41.2563 16.7186 40.3273 15.3764 38.2564C15.3194 38.1685 15.259 38.0669 15.138 37.8637C15.084 37.7731 15.057 37.7277 15.0299 37.684C14.408 36.6826 13.4808 35.9063 12.3844 35.4692C12.3365 35.4501 12.2871 35.4315 12.1882 35.3942C11.9667 35.3106 11.8559 35.2688 11.7593 35.2281C9.48205 34.2689 8.12097 31.9168 8.42698 29.4695C8.43997 29.3656 8.45908 29.249 8.4973 29.0158C8.51436 28.9117 8.52289 28.8597 8.53026 28.8088C8.69906 27.6429 8.48889 26.4536 7.93056 25.4155C7.90621 25.3702 7.88035 25.3242 7.82863 25.2322C7.71278 25.0262 7.65485 24.9231 7.60704 24.8299C6.48057 22.6347 6.95327 19.96 8.76433 18.2815C8.8412 18.2102 8.93096 18.1332 9.11047 17.9791C9.19061 17.9103 9.23068 17.8759 9.26908 17.8416C10.1496 17.0567 10.7548 16.0109 10.9958 14.8576C11.0063 14.8073 11.0162 14.7555 11.0358 14.6518C11.0798 14.4197 11.1019 14.3036 11.1253 14.2015C11.6766 11.7974 13.7619 10.0516 16.2306 9.92733C16.3354 9.92206 16.4538 9.92059 16.6906 9.91765C16.7963 9.91634 16.8492 9.91569 16.9007 9.91409C18.0809 9.87748 19.2182 9.46445 20.1459 8.7356C20.1864 8.70381 20.2273 8.67042 20.3091 8.60363Z" fill="#${pressureprimary?.value.toRadixString(16).padLeft(8, '0').substring(2)}"/>
                             </svg> ''',
-                            ),
-                            ),
-                            Positioned(
-                            top: 0,
-                            child: SizedBox(
-                              height: 48,
-                              child: pressureTrendIcon,
-                            )
-                            )
-                          ]
-                        ),
-                      ),
+                                                  ),
+                                                ),
+                                                Positioned(
+                                                    top: 0,
+                                                    child: SizedBox(
+                                                      height: 48,
+                                                      child: pressureTrendIcon,
+                                                    ))
+                                              ]),
+                                        ),
+                                      ),
+                                    ),
+                                  ]),
+                              const SizedBox(height: 10),
+                              Text("${pressureHourly[dataIndex].round()}",
+                                  style: TextStyle(
+                                      fontSize: 14,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurfaceVariant,
+                                      fontWeight: FontWeight.w500)),
+                              Text(hour,
+                                  style: TextStyle(
+                                      fontSize: 15,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurface,
+                                      fontWeight: FontWeight.w500)),
+                            ],
+                          ),
+                        );
+                      },
                     ),
                   ),
-                  ]
+                ],
+              ),
+            ),
+            Container(
+                margin: EdgeInsets.fromLTRB(
+                    12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
+                padding: EdgeInsets.all(20),
+                decoration: BoxDecoration(
+                  border: Border.all(
+                    width: 1,
+                    color: Theme.of(context).colorScheme.outlineVariant,
                   ),
-                  const SizedBox(height: 10),
-
-                  Text("${pressureHourly[dataIndex].round()}", style: TextStyle(fontSize: 14, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text(hour, style: TextStyle(fontSize: 15, color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500)),
-                ],
-              ),
-              );
-          },
-        ),
-       ),
-
-
-      ],
-      ),
-      ),
-      Container(
-              margin: EdgeInsets.fromLTRB(12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
-              padding: EdgeInsets.all(20),
-              decoration: BoxDecoration(
-              border: Border.all(
-                width: 1,
-                color: Theme.of(context).colorScheme.outlineVariant,
-              ),
-              borderRadius: BorderRadius.circular(18),
-              ),
-              child:  Column(  
-              spacing: 20,
-                children: [
-                  Text("pressure_info".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text("pressure_info_2".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                ],
-              )
-          )
-        ]
-      );
-     }
-    );
+                  borderRadius: BorderRadius.circular(18),
+                ),
+                child: Column(
+                  spacing: 20,
+                  children: [
+                    Text("pressure_info".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                    Text("pressure_info_2".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                  ],
+                ))
+          ]);
+        });
   }
 
-  Widget buildVisibilityExtended(){
+  Widget buildVisibilityExtended() {
     return FutureBuilder<Map<String, dynamic>?>(
-    future: getWeatherWidgets(),
-    builder: (context, snapshot) {
-      if (snapshot.connectionState == ConnectionState.waiting) {
-        return const Center(child: CircularProgressIndicator());
-      } else if (snapshot.hasError) {
-        return Center(child: Text('Error: ${snapshot.error}'));
-      } else if (!snapshot.hasData || snapshot.data == null) {
-        return Center(child: Text('no_data_available'.tr()));
-      }
+        future: getWeatherWidgets(),
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.waiting) {
+            return const Center(child: CircularProgressIndicator());
+          } else if (snapshot.hasError) {
+            return Center(child: Text('Error: ${snapshot.error}'));
+          } else if (!snapshot.hasData || snapshot.data == null) {
+            return Center(child: Text('no_data_available'.tr()));
+          }
 
-      final data = snapshot.data!;
-     final weather = data['data'];
-    final hourly = weather['hourly'];
-    final List<dynamic> hourlyTime = hourly['time'];
+          final data = snapshot.data!;
+          final weather = data['data'];
+          final hourly = weather['hourly'];
+          final List<dynamic> hourlyTime = hourly['time'];
 
-      final currentVisibility = hourly['visibility'][getStartIndex(weather['utc_offset_seconds'].toString(), hourlyTime)] ?? 0.0;
-    final visibilityUnit = PreferencesHelper.getString("selectedVisibilityUnit") ?? "Km";
+          final currentVisibility = hourly['visibility'][getStartIndex(
+                  weather['utc_offset_seconds'].toString(), hourlyTime)] ??
+              0.0;
+          final visibilityUnit =
+              PreferencesHelper.getString("selectedVisibilityUnit") ?? "Km";
 
           final convertedVisibility = visibilityUnit == 'Mile'
-        ? UnitConverter.mToMiles(currentVisibility.toDouble()) : UnitConverter.mToKm(currentVisibility.toDouble());
+              ? UnitConverter.mToMiles(currentVisibility.toDouble())
+              : UnitConverter.mToKm(currentVisibility.toDouble());
 
-     return  Column(
-     children: [ 
-
-       Container(
-      height: 130,
-      clipBehavior: Clip.hardEdge,
-        decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceContainer,
-          borderRadius: BorderRadius.circular(18),
-        ),
-        margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
-        child:
-        Stack(
-        children: [
-            Positioned(
-            left: 0,
-            top: 0,
-            child: SvgPicture.string(
-              '''
+          return Column(children: [
+            Container(
+              height: 130,
+              clipBehavior: Clip.hardEdge,
+              decoration: BoxDecoration(
+                color: Theme.of(context).colorScheme.surfaceContainer,
+                borderRadius: BorderRadius.circular(18),
+              ),
+              margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
+              child: Stack(
+                children: [
+                  Positioned(
+                    left: 0,
+                    top: 0,
+                    child: SvgPicture.string(
+                      '''
                 <svg height="112.0dip" width="364.0dip" viewBox="0 0 364.0 112.0" xmlns="http://www.w3.org/2000/svg">
                     <g>
                         <clip-path d="M20,0L344,0A20,20 0,0 1,364 20L364,92A20,20 0,0 1,344 112L20,112A20,20 0,0 1,0 92L0,20A20,20 0,0 1,20 0z" />
@@ -838,1077 +970,1283 @@ final duskFormatted = formatInstantToLocalTime(dusk, timeUnit: timeFormatDUSKDAW
                         <path fill="#${Theme.of(context).colorScheme.tertiaryContainer.value.toRadixString(16).padLeft(8, '0').substring(2)}"  d="M52.51,239.89C62.58,248.68 78,247.06 86.03,236.37V236.37C91.85,228.61 101.92,225.34 111.19,228.19V228.19C123.97,232.12 137.4,224.37 140.38,211.34V211.34C142.55,201.88 150.41,194.8 160.04,193.63V193.63C173.32,192.03 182.43,179.49 179.85,166.37V166.37C177.99,156.85 182.29,147.18 190.62,142.2V142.2C202.09,135.33 205.31,120.17 197.62,109.23V109.23C192.04,101.29 192.04,90.71 197.62,82.77V82.77C205.31,71.83 202.09,56.67 190.62,49.8V49.8C182.29,44.82 177.99,35.15 179.85,25.63V25.63C182.43,12.51 173.32,-0.03 160.04,-1.63V-1.63C150.41,-2.8 142.55,-9.88 140.38,-19.34V-19.34C137.4,-32.37 123.97,-40.12 111.19,-36.19V-36.19C101.92,-33.34 91.85,-36.61 86.03,-44.37V-44.37C78,-55.06 62.58,-56.68 52.51,-47.89V-47.89C45.2,-41.51 34.67,-40.4 26.2,-45.12V-45.12C14.52,-51.63 -0.23,-46.84 -5.86,-34.71V-34.71C-9.94,-25.91 -19.11,-20.62 -28.77,-21.48V-21.48C-42.09,-22.67 -53.61,-12.29 -53.82,1.07V1.07C-53.97,10.77 -60.19,19.34 -69.37,22.48V22.48C-82.02,26.81 -88.32,40.97 -83.08,53.27V53.27C-79.27,62.19 -81.47,72.54 -88.58,79.15V79.15C-98.37,88.25 -98.37,103.75 -88.58,112.85V112.85C-81.47,119.46 -79.27,129.81 -83.08,138.73V138.73C-88.32,151.03 -82.02,165.19 -69.37,169.52V169.52C-60.19,172.66 -53.97,181.23 -53.82,190.93V190.93C-53.61,204.29 -42.09,214.67 -28.77,213.48V213.48C-19.11,212.62 -9.94,217.91 -5.86,226.71V226.71C-0.23,238.84 14.52,243.63 26.2,237.12V237.12C34.67,232.4 45.2,233.51 52.51,239.89V239.89Z" stroke-opacity="0.5" fill-opacity="0.5" />
                     </g>
                 </svg>
-             ''', height: 130,),
-            ),
-          Container(
-          padding: EdgeInsets.fromLTRB(20, 10 + 5, 20, 0),
-          alignment: Alignment.centerLeft,
-          child:  Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text("current_conditions".tr(), style: TextStyle(fontSize: 20,  color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500)),
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Text("${convertedVisibility.round()}", style: TextStyle(fontSize: 50,  color: Theme.of(context).colorScheme.onTertiaryContainer, fontWeight: FontWeight.w500),),
-                Padding(padding: EdgeInsets.only(bottom: 11, left: 8),
-               child: Text(localizeVisibilityUnit(visibilityUnit, context.locale), style: TextStyle(fontSize: 20,  color: Theme.of(context).colorScheme.onTertiaryContainer, fontWeight: FontWeight.w500),))
-              ],
-            ),
-
-
-          ],
-      ),
-      ),
-        ],
-      ),
-        
-        ),
-              Container(
-              margin: EdgeInsets.fromLTRB(12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
-              padding: EdgeInsets.all(20),
-              decoration: BoxDecoration(
-              border: Border.all(
-                width: 1,
-                color: Theme.of(context).colorScheme.outlineVariant,
-              ),
-              borderRadius: BorderRadius.circular(18),
-              ),
-              child:  Column(  
-              spacing: 20,
-                children: [
-                  Text("visibility_info".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                ],
-              )
-          )
-        ]
-      );
-
-      }
-    );
-  }
-
-
-  Widget buildWindExtended(){
-    return FutureBuilder<Map<String, dynamic>?>(
-    future: getWeatherWidgets(),
-    builder: (context, snapshot) {
-      if (snapshot.connectionState == ConnectionState.waiting) {
-        return const Center(child: CircularProgressIndicator());
-      } else if (snapshot.hasError) {
-        return Center(child: Text('Error: ${snapshot.error}'));
-      } else if (!snapshot.hasData || snapshot.data == null) {
-        return Center(child: Text('no_data_available'.tr()));
-      }
-
-      final data = snapshot.data!;
-      final weather = data['data'];
-
-
-
-    final hourly = weather['hourly'];
-    final List<dynamic> hourlyTime = hourly['time'];
-    final List<double> windSpeeds = 
-    (hourly['wind_speed_10m'] as List<dynamic>)
-        .map((e) => (e as num).toDouble())
-        .toList();
-    final List<dynamic> windDirections = hourly['wind_direction_10m'];
-
-
-    final offset = Duration(seconds: int.parse(weather['utc_offset_seconds'].toString()));
-    final nowUtc = DateTime.now().toUtc();
-    final nowLocal = nowUtc.add(offset);
-
-    final timeUnit = PreferencesHelper.getString("selectedTimeUnit") ?? '12 hr';
-
-
-    final roundedNow = DateTime(nowLocal.year, nowLocal.month, nowLocal.day, nowLocal.hour);
-
-    int startIndex = hourlyTime.indexWhere((timeStr) {
-      final forecastLocal = DateTime.parse(timeStr); 
-      return !forecastLocal.isBefore(roundedNow);
-    });
-
-    if (startIndex == -1) startIndex = 0;
-
-      final double minWind = windSpeeds.reduce((a, b) => a < b ? a : b);
-      final double maxWind = windSpeeds.reduce((a, b) => a > b ? a : b);
-
-
-  List<double> todayWindSpeeds = [];
-
-  for (int i = 8; i <= 23 && i < windSpeeds.length; i++) {
-    final speed = windSpeeds[i];
-    if (speed is num) {
-      todayWindSpeeds.add(speed.toDouble());
-    }
-  }
-
-  final double avgWind = todayWindSpeeds.isNotEmpty
-      ? todayWindSpeeds.reduce((a, b) => a + b) / todayWindSpeeds.length
-      : 0;
-    final windUnit = PreferencesHelper.getString("selectedWindUnit") ?? 'Km/h';
-
-      final formattedAvgWindSpeed =  windUnit == 'Mph'
-        ? UnitConverter.kmhToMph(avgWind)
-        : windUnit == 'M/s'
-            ? UnitConverter.kmhToMs(avgWind)  : windUnit == 'Bft' ? UnitConverter.kmhToBeaufort(avgWind)
-            : avgWind;
-
-     return Column(
-   children: [ 
-
-       Container(
-      height: 360,
-        decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceContainer,
-          borderRadius: BorderRadius.circular(18),
-        ),
-        padding: EdgeInsets.only(top: 12, bottom: 0),
-        margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
-        child: Column(
-        children: [
-        Container(
-          padding: EdgeInsets.fromLTRB(20, 10, 20, 0),
-          alignment: Alignment.centerLeft,
-       child:  Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text("todays_avg".tr(), style: TextStyle(fontSize: 20,  color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500)),
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Text("${PreferencesHelper.getString("selectedWindUnit") == 'M/s' ? formattedAvgWindSpeed.toStringAsFixed(1) : formattedAvgWindSpeed.round()}", style: TextStyle(fontSize: 50,  color: Theme.of(context).colorScheme.secondary, fontWeight: FontWeight.w500),),
-                Padding(padding: EdgeInsets.only(bottom: 11, left: 8),
-               child: Text(localizeWindUnit(windUnit, context.locale), style: TextStyle(fontSize: 20,  color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500),))
-              ],
-            )
-            
-          ],
-      ),
-      ),
-
-
-       SizedBox(
-        height: 216,
-        child: ListView.builder(
-          scrollDirection: Axis.horizontal,
-          physics: BouncingScrollPhysics(),
-          itemCount: 24 + 24 - startIndex,
-          itemBuilder: (context, index) {
-          final dataIndex = startIndex + index;
-
-          if (dataIndex >= hourlyTime.length) return const SizedBox();
-          final forecastLocal = DateTime.parse(hourlyTime[dataIndex]);
-
-          final roundedDisplayTime = DateTime(
-            forecastLocal.year,
-            forecastLocal.month,
-            forecastLocal.day,
-            forecastLocal.hour,
-          );
-            final hour = timeUnit == '24 hr' ? "${roundedDisplayTime.hour.toString().padLeft(2, '0')}:00" : UnitConverter.formatTo12Hour(roundedDisplayTime);
-        final windSpeed = windSpeeds[dataIndex];
-        final windDirection = windDirections[dataIndex];
-
-        final windPercentage = ((windSpeed - minWind) / (maxWind - minWind)) * 100;
-
-        
-    final windUnit = PreferencesHelper.getString("selectedWindUnit") ?? 'Km/h';
-
-
-      final formattedWindSpeed =  windUnit == 'Mph'
-        ? UnitConverter.kmhToMph(windSpeed).toStringAsFixed(1)
-        : windUnit == 'M/s'
-            ? UnitConverter.kmhToMs(windSpeed).toStringAsFixed(1)  : windUnit == 'Bft' ? UnitConverter.kmhToBeaufort(windSpeed).round()
-            : windSpeed.toStringAsFixed(1);
-
-
-          Widget windArrow = Transform.rotate(
-            angle: windDirection * (3.1415926535 / 180), 
-            child: Icon(
-              Icons.navigation, 
-              size: 20,
-              color: Theme.of(context).colorScheme.onPrimaryContainer,
-            ),
-          );
-
-
-
-          EdgeInsets itemMargin = EdgeInsets.only(
-              left: index == 0 ? 10 : 0,
-              right: index == 24 + 24 - startIndex - 1 ? 10 : 0,
-
-            );
-
-            return Container(
-              width: 53,
-              margin: itemMargin,
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(12),
-              ),
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.end,
-                children: [
-                  Stack(
-                  alignment: Alignment.bottomCenter,
-                  clipBehavior: Clip.none, 
-                  children: [
-                  Container(
-                    width: 20,
-                    height: 160,
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.surface,
-                      borderRadius: BorderRadius.circular(50),
+             ''',
+                      height: 130,
                     ),
                   ),
                   Container(
-                    clipBehavior: Clip.none,
-                        width: 43,
-                        height: math.max((windPercentage / 100) * 160, 48), 
-                        decoration: BoxDecoration(
-                          color: Theme.of(context).colorScheme.primary,
-                          borderRadius: BorderRadius.circular(50),
-                        ),
-                      child:  Align(
-                      alignment: Alignment.topCenter, 
-                      child: SizedBox(
-                        width: 60,
-                        height: 60,
-                        child: Stack(
-                           alignment: Alignment.center,
+                    padding: EdgeInsets.fromLTRB(20, 10 + 5, 20, 0),
+                    alignment: Alignment.centerLeft,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text("current_conditions".tr(),
+                            style: TextStyle(
+                                fontSize: 20,
+                                color: Theme.of(context).colorScheme.onSurface,
+                                fontWeight: FontWeight.w500)),
+                        Row(
+                          crossAxisAlignment: CrossAxisAlignment.end,
                           children: [
-                            Positioned(
-                              top: 0,
-                              child:SvgPicture.string(
-                              '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-                            <path d="M20.3091 8.60363C20.4924 8.454 20.584 8.37919 20.6677 8.31603C22.6389 6.82799 25.3611 6.82799 27.3323 8.31603C27.416 8.37919 27.5076 8.454 27.6909 8.60363C27.7727 8.67042 27.8136 8.70381 27.8541 8.7356C28.7818 9.46445 29.9191 9.87748 31.0993 9.91409C31.1508 9.91569 31.2037 9.91634 31.3094 9.91765C31.5462 9.92059 31.6646 9.92206 31.7694 9.92733C34.2381 10.0516 36.3234 11.7974 36.8747 14.2015C36.8982 14.3036 36.9202 14.4197 36.9642 14.6518C36.9838 14.7555 36.9937 14.8073 37.0042 14.8576C37.2452 16.0109 37.8504 17.0567 38.7309 17.8416C38.7693 17.8759 38.8094 17.9103 38.8895 17.9791C39.069 18.1332 39.1588 18.2102 39.2357 18.2815C41.0467 19.96 41.5194 22.6347 40.393 24.8299C40.3451 24.9231 40.2872 25.0262 40.1714 25.2322C40.1196 25.3242 40.0938 25.3702 40.0694 25.4155C39.5111 26.4536 39.3009 27.6429 39.4697 28.8088C39.4771 28.8597 39.4856 28.9117 39.5027 29.0158C39.5409 29.249 39.56 29.3656 39.573 29.4695C39.879 31.9168 38.5179 34.2689 36.2407 35.2281C36.1441 35.2688 36.0333 35.3106 35.8118 35.3942C35.7129 35.4315 35.6635 35.4501 35.6156 35.4692C34.5192 35.9063 33.592 36.6826 32.9701 37.684C32.943 37.7277 32.916 37.7731 32.862 37.8637C32.741 38.0669 32.6806 38.1685 32.6236 38.2564C31.2814 40.3273 28.7233 41.2563 26.3609 40.5306C26.2606 40.4998 26.1489 40.4608 25.9253 40.3827C25.8256 40.3479 25.7757 40.3305 25.7268 40.3144C24.6052 39.9461 23.3948 39.9461 22.2732 40.3144C22.2243 40.3305 22.1744 40.3479 22.0747 40.3827C21.8511 40.4608 21.7394 40.4998 21.6391 40.5306C19.2767 41.2563 16.7186 40.3273 15.3764 38.2564C15.3194 38.1685 15.259 38.0669 15.138 37.8637C15.084 37.7731 15.057 37.7277 15.0299 37.684C14.408 36.6826 13.4808 35.9063 12.3844 35.4692C12.3365 35.4501 12.2871 35.4315 12.1882 35.3942C11.9667 35.3106 11.8559 35.2688 11.7593 35.2281C9.48205 34.2689 8.12097 31.9168 8.42698 29.4695C8.43997 29.3656 8.45908 29.249 8.4973 29.0158C8.51436 28.9117 8.52289 28.8597 8.53026 28.8088C8.69906 27.6429 8.48889 26.4536 7.93056 25.4155C7.90621 25.3702 7.88035 25.3242 7.82863 25.2322C7.71278 25.0262 7.65485 24.9231 7.60704 24.8299C6.48057 22.6347 6.95327 19.96 8.76433 18.2815C8.8412 18.2102 8.93096 18.1332 9.11047 17.9791C9.19061 17.9103 9.23068 17.8759 9.26908 17.8416C10.1496 17.0567 10.7548 16.0109 10.9958 14.8576C11.0063 14.8073 11.0162 14.7555 11.0358 14.6518C11.0798 14.4197 11.1019 14.3036 11.1253 14.2015C11.6766 11.7974 13.7619 10.0516 16.2306 9.92733C16.3354 9.92206 16.4538 9.92059 16.6906 9.91765C16.7963 9.91634 16.8492 9.91569 16.9007 9.91409C18.0809 9.87748 19.2182 9.46445 20.1459 8.7356C20.1864 8.70381 20.2273 8.67042 20.3091 8.60363Z" fill="#${Theme.of(context).colorScheme.primaryContainer.value.toRadixString(16).padLeft(8, '0').substring(2)}"/>
-                            </svg> ''',
+                            Text(
+                              "${convertedVisibility.round()}",
+                              style: TextStyle(
+                                  fontSize: 50,
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onTertiaryContainer,
+                                  fontWeight: FontWeight.w500),
                             ),
-                            ),
-                            Positioned(
-                            top: 0,
-                            child: SizedBox(
-                              height: 48,
-                              child: windArrow,
-                            )
-                            )
-                          ]
+                            Padding(
+                                padding: EdgeInsets.only(bottom: 11, left: 8),
+                                child: Text(
+                                  localizeVisibilityUnit(
+                                      visibilityUnit, context.locale),
+                                  style: TextStyle(
+                                      fontSize: 20,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onTertiaryContainer,
+                                      fontWeight: FontWeight.w500),
+                                ))
+                          ],
                         ),
-                      ),
+                      ],
                     ),
                   ),
-                  ]
+                ],
+              ),
+            ),
+            Container(
+                margin: EdgeInsets.fromLTRB(
+                    12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
+                padding: EdgeInsets.all(20),
+                decoration: BoxDecoration(
+                  border: Border.all(
+                    width: 1,
+                    color: Theme.of(context).colorScheme.outlineVariant,
                   ),
-                  const SizedBox(height: 10),
-
-                  Text("$formattedWindSpeed", style: TextStyle(fontSize: 14, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text(hour, style: TextStyle(fontSize: 15, color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500)),
-                ],
-              ),
-              );
-          },
-        ),
-       ),
-
-
-      ],
-      ),
-      ),
-      Container(
-              margin: EdgeInsets.fromLTRB(12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
-              padding: EdgeInsets.all(20),
-              decoration: BoxDecoration(
-              border: Border.all(
-                width: 1,
-                color: Theme.of(context).colorScheme.outlineVariant,
-              ),
-              borderRadius: BorderRadius.circular(18),
-              ),
-              child:  Column(  
-              spacing: 20,
-                children: [
-                  Text("wind_info".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                ],
-              )
-          )
-        ]
-      );
-     }
-    );
+                  borderRadius: BorderRadius.circular(18),
+                ),
+                child: Column(
+                  spacing: 20,
+                  children: [
+                    Text("visibility_info".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                  ],
+                ))
+          ]);
+        });
   }
 
-
-Widget buildUVExtended(){
+  Widget buildWindExtended() {
     return FutureBuilder<Map<String, dynamic>?>(
-    future: getWeatherWidgets(),
-    builder: (context, snapshot) {
-      if (snapshot.connectionState == ConnectionState.waiting) {
-        return const Center(child: CircularProgressIndicator());
-      } else if (snapshot.hasError) {
-        return Center(child: Text('Error: ${snapshot.error}'));
-      } else if (!snapshot.hasData || snapshot.data == null) {
-        return Center(child: Text('no_data_available'.tr()));
-      }
-
-      final data = snapshot.data!;
-      final weather = data['data'];
-
-
-
-    final hourly = weather['hourly'];
-    final List<dynamic> hourlyTime = hourly['time'];
-final List<dynamic> uvIndexes = hourly['uv_index'];
-
-
-
-    final offset = Duration(seconds: int.parse(weather['utc_offset_seconds'].toString()));
-    final nowUtc = DateTime.now().toUtc();
-    final nowLocal = nowUtc.add(offset);
-
-    final timeUnit = PreferencesHelper.getString("selectedTimeUnit") ?? '12 hr';
-
-
-    final roundedNow = DateTime(nowLocal.year, nowLocal.month, nowLocal.day, nowLocal.hour);
-
-    int startIndex = hourlyTime.indexWhere((timeStr) {
-      final forecastLocal = DateTime.parse(timeStr); 
-      return !forecastLocal.isBefore(roundedNow);
-    });
-
-    if (startIndex == -1) startIndex = 0;
-
-
-final nonNullUvIndexes = uvIndexes.whereType<num>().toList();
-final double minUv = nonNullUvIndexes.isNotEmpty ? nonNullUvIndexes.reduce((a, b) => a < b ? a : b).toDouble() : 0;
-final double maxUv = nonNullUvIndexes.isNotEmpty ? nonNullUvIndexes.reduce((a, b) => a > b ? a : b).toDouble() : 1;
-
-
-  List<double> todayUvIndexes = [];
-
-  for (int i =  8; i <= 18 && i < uvIndexes.length; i++) {
-    final uv = uvIndexes[i];
-    if (uv is num) {
-      todayUvIndexes.add(uv.toDouble());
-    }
-  }
-  final double avgUv = todayUvIndexes.isNotEmpty
-    ? todayUvIndexes.reduce((a, b) => a + b) / todayUvIndexes.length
-    : 0;
-
-     return Column(
-   children: [ 
-
-       Container(
-      height: 360,
-        decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceContainer,
-          borderRadius: BorderRadius.circular(18),
-        ),
-        padding: EdgeInsets.only(top: 12, bottom: 0),
-        margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
-        child: Column(
-        children: [
-        Container(
-          padding: EdgeInsets.fromLTRB(20, 10, 20, 0),
-          alignment: Alignment.centerLeft,
-       child:  Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text("todays_avg".tr(), style: TextStyle(fontSize: 20,  color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500)),
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Text(avgUv != null ? "${avgUv.round()}" : "--", style: TextStyle(fontSize: 50,  color: Theme.of(context).colorScheme.secondary, fontWeight: FontWeight.w500),),
-                Padding(padding: EdgeInsets.only(bottom: 11, left: 8),
-               child: Text(avgUv != null ? getUvIndexType(avgUv.round()) : "Not available", style: TextStyle(fontSize: 20,  color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500),))
-              ],
-            )
-            
-          ],
-      ),
-      ),
-
-
-    SizedBox(
-        height: 216,
-        child: ListView.builder(
-          scrollDirection: Axis.horizontal,
-          physics: BouncingScrollPhysics(),
-          itemCount: 24 + 24 - startIndex,
-          itemBuilder: (context, index) {
-          final dataIndex = startIndex + index;
-
-          if (dataIndex >= hourlyTime.length) return const SizedBox();
-          final forecastLocal = DateTime.parse(hourlyTime[dataIndex]);
-
-          final roundedDisplayTime = DateTime(
-            forecastLocal.year,
-            forecastLocal.month,
-            forecastLocal.day,
-            forecastLocal.hour,
-          );
-            final hour = timeUnit == '24 hr' ? "${roundedDisplayTime.hour.toString().padLeft(2, '0')}:00" : UnitConverter.formatTo12Hour(roundedDisplayTime);
-
-
-
-          final uv = uvIndexes[dataIndex];
-          final bool isValidUv = uv is num;
-          final double? uvValue = isValidUv ? uv.toDouble() : null;
-          final double uvPercentage = uvValue != null && maxUv != minUv
-              ? ((uvValue - minUv) / (maxUv - minUv)) * 100
-              : 0;
-
-
-          EdgeInsets itemMargin = EdgeInsets.only(
-              left: index == 0 ? 10 : 0,
-              right: index == 24 + 24 - startIndex - 1 ? 10 : 0,
-
-            );
-
-            Color getUvColor(double uv, BuildContext context) {
-            if (uv <= 2) return Colors.green;
-            if (uv <= 5) return Colors.yellow;
-            if (uv <= 7) return Colors.orange;
-            if (uv <= 10) return Colors.red;
-            return Colors.purple;
+        future: getWeatherWidgets(),
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.waiting) {
+            return const Center(child: CircularProgressIndicator());
+          } else if (snapshot.hasError) {
+            return Center(child: Text('Error: ${snapshot.error}'));
+          } else if (!snapshot.hasData || snapshot.data == null) {
+            return Center(child: Text('no_data_available'.tr()));
           }
 
-            return Container(
-              width: 53,
-              margin: itemMargin,
+          final data = snapshot.data!;
+          final weather = data['data'];
+
+          final hourly = weather['hourly'];
+          final List<dynamic> hourlyTime = hourly['time'];
+          final List<double> windSpeeds =
+              (hourly['wind_speed_10m'] as List<dynamic>)
+                  .map((e) => (e as num).toDouble())
+                  .toList();
+          final List<dynamic> windDirections = hourly['wind_direction_10m'];
+
+          final offset = Duration(
+              seconds: int.parse(weather['utc_offset_seconds'].toString()));
+          final nowUtc = DateTime.now().toUtc();
+          final nowLocal = nowUtc.add(offset);
+
+          final timeUnit =
+              PreferencesHelper.getString("selectedTimeUnit") ?? '12 hr';
+
+          final roundedNow = DateTime(
+              nowLocal.year, nowLocal.month, nowLocal.day, nowLocal.hour);
+
+          int startIndex = hourlyTime.indexWhere((timeStr) {
+            final forecastLocal = DateTime.parse(timeStr);
+            return !forecastLocal.isBefore(roundedNow);
+          });
+
+          if (startIndex == -1) startIndex = 0;
+
+          final double minWind = windSpeeds.reduce((a, b) => a < b ? a : b);
+          final double maxWind = windSpeeds.reduce((a, b) => a > b ? a : b);
+
+          List<double> todayWindSpeeds = [];
+
+          for (int i = 8; i <= 23 && i < windSpeeds.length; i++) {
+            final speed = windSpeeds[i];
+            if (speed is num) {
+              todayWindSpeeds.add(speed.toDouble());
+            }
+          }
+
+          final double avgWind = todayWindSpeeds.isNotEmpty
+              ? todayWindSpeeds.reduce((a, b) => a + b) / todayWindSpeeds.length
+              : 0;
+          final windUnit =
+              PreferencesHelper.getString("selectedWindUnit") ?? 'Km/h';
+
+          final formattedAvgWindSpeed = windUnit == 'Mph'
+              ? UnitConverter.kmhToMph(avgWind)
+              : windUnit == 'M/s'
+                  ? UnitConverter.kmhToMs(avgWind)
+                  : windUnit == 'Bft'
+                      ? UnitConverter.kmhToBeaufort(avgWind)
+                      : avgWind;
+
+          return Column(children: [
+            Container(
+              height: 360,
               decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(12),
+                color: Theme.of(context).colorScheme.surfaceContainer,
+                borderRadius: BorderRadius.circular(18),
               ),
+              padding: EdgeInsets.only(top: 12, bottom: 0),
+              margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
               child: Column(
-                mainAxisAlignment: MainAxisAlignment.end,
                 children: [
-                  Stack(
-                  alignment: Alignment.bottomCenter,
-                  clipBehavior: Clip.none, 
-                  children: [
                   Container(
-                    width: 20,
-                    height: 160,
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.surface,
-                      borderRadius: BorderRadius.circular(50),
+                    padding: EdgeInsets.fromLTRB(20, 10, 20, 0),
+                    alignment: Alignment.centerLeft,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text("todays_avg".tr(),
+                            style: TextStyle(
+                                fontSize: 20,
+                                color: Theme.of(context).colorScheme.onSurface,
+                                fontWeight: FontWeight.w500)),
+                        Row(
+                          crossAxisAlignment: CrossAxisAlignment.end,
+                          children: [
+                            Text(
+                              "${PreferencesHelper.getString("selectedWindUnit") == 'M/s' ? formattedAvgWindSpeed.toStringAsFixed(1) : formattedAvgWindSpeed.round()}",
+                              style: TextStyle(
+                                  fontSize: 50,
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
+                                  fontWeight: FontWeight.w500),
+                            ),
+                            Padding(
+                                padding: EdgeInsets.only(bottom: 11, left: 8),
+                                child: Text(
+                                  localizeWindUnit(windUnit, context.locale),
+                                  style: TextStyle(
+                                      fontSize: 20,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurfaceVariant,
+                                      fontWeight: FontWeight.w500),
+                                ))
+                          ],
+                        )
+                      ],
                     ),
                   ),
+                  SizedBox(
+                    height: 216,
+                    child: ListView.builder(
+                      scrollDirection: Axis.horizontal,
+                      physics: BouncingScrollPhysics(),
+                      itemCount: 24 + 24 - startIndex,
+                      itemBuilder: (context, index) {
+                        final dataIndex = startIndex + index;
+
+                        if (dataIndex >= hourlyTime.length)
+                          return const SizedBox();
+                        final forecastLocal =
+                            DateTime.parse(hourlyTime[dataIndex]);
+
+                        final roundedDisplayTime = DateTime(
+                          forecastLocal.year,
+                          forecastLocal.month,
+                          forecastLocal.day,
+                          forecastLocal.hour,
+                        );
+                        final hour = timeUnit == '24 hr'
+                            ? "${roundedDisplayTime.hour.toString().padLeft(2, '0')}:00"
+                            : UnitConverter.formatTo12Hour(roundedDisplayTime);
+                        final windSpeed = windSpeeds[dataIndex];
+                        final windDirection = windDirections[dataIndex];
+
+                        final windPercentage =
+                            ((windSpeed - minWind) / (maxWind - minWind)) * 100;
+
+                        final windUnit =
+                            PreferencesHelper.getString("selectedWindUnit") ??
+                                'Km/h';
+
+                        final formattedWindSpeed = windUnit == 'Mph'
+                            ? UnitConverter.kmhToMph(windSpeed)
+                                .toStringAsFixed(1)
+                            : windUnit == 'M/s'
+                                ? UnitConverter.kmhToMs(windSpeed)
+                                    .toStringAsFixed(1)
+                                : windUnit == 'Bft'
+                                    ? UnitConverter.kmhToBeaufort(windSpeed)
+                                        .round()
+                                    : windSpeed.toStringAsFixed(1);
+
+                        Widget windArrow = Transform.rotate(
+                          angle: windDirection * (3.1415926535 / 180),
+                          child: Icon(
+                            Icons.navigation,
+                            size: 20,
+                            color: Theme.of(context)
+                                .colorScheme
+                                .onPrimaryContainer,
+                          ),
+                        );
+
+                        EdgeInsets itemMargin = EdgeInsets.only(
+                          left: index == 0 ? 10 : 0,
+                          right: index == 24 + 24 - startIndex - 1 ? 10 : 0,
+                        );
+
+                        return Container(
+                          width: 53,
+                          margin: itemMargin,
+                          decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.end,
+                            children: [
+                              Stack(
+                                  alignment: Alignment.bottomCenter,
+                                  clipBehavior: Clip.none,
+                                  children: [
+                                    Container(
+                                      width: 20,
+                                      height: 160,
+                                      decoration: BoxDecoration(
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .surface,
+                                        borderRadius: BorderRadius.circular(50),
+                                      ),
+                                    ),
+                                    Container(
+                                      clipBehavior: Clip.none,
+                                      width: 43,
+                                      height: math.max(
+                                          (windPercentage / 100) * 160, 48),
+                                      decoration: BoxDecoration(
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .primary,
+                                        borderRadius: BorderRadius.circular(50),
+                                      ),
+                                      child: Align(
+                                        alignment: Alignment.topCenter,
+                                        child: SizedBox(
+                                          width: 60,
+                                          height: 60,
+                                          child: Stack(
+                                              alignment: Alignment.center,
+                                              children: [
+                                                Positioned(
+                                                  top: 0,
+                                                  child: SvgPicture.string(
+                                                    '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            <path d="M20.3091 8.60363C20.4924 8.454 20.584 8.37919 20.6677 8.31603C22.6389 6.82799 25.3611 6.82799 27.3323 8.31603C27.416 8.37919 27.5076 8.454 27.6909 8.60363C27.7727 8.67042 27.8136 8.70381 27.8541 8.7356C28.7818 9.46445 29.9191 9.87748 31.0993 9.91409C31.1508 9.91569 31.2037 9.91634 31.3094 9.91765C31.5462 9.92059 31.6646 9.92206 31.7694 9.92733C34.2381 10.0516 36.3234 11.7974 36.8747 14.2015C36.8982 14.3036 36.9202 14.4197 36.9642 14.6518C36.9838 14.7555 36.9937 14.8073 37.0042 14.8576C37.2452 16.0109 37.8504 17.0567 38.7309 17.8416C38.7693 17.8759 38.8094 17.9103 38.8895 17.9791C39.069 18.1332 39.1588 18.2102 39.2357 18.2815C41.0467 19.96 41.5194 22.6347 40.393 24.8299C40.3451 24.9231 40.2872 25.0262 40.1714 25.2322C40.1196 25.3242 40.0938 25.3702 40.0694 25.4155C39.5111 26.4536 39.3009 27.6429 39.4697 28.8088C39.4771 28.8597 39.4856 28.9117 39.5027 29.0158C39.5409 29.249 39.56 29.3656 39.573 29.4695C39.879 31.9168 38.5179 34.2689 36.2407 35.2281C36.1441 35.2688 36.0333 35.3106 35.8118 35.3942C35.7129 35.4315 35.6635 35.4501 35.6156 35.4692C34.5192 35.9063 33.592 36.6826 32.9701 37.684C32.943 37.7277 32.916 37.7731 32.862 37.8637C32.741 38.0669 32.6806 38.1685 32.6236 38.2564C31.2814 40.3273 28.7233 41.2563 26.3609 40.5306C26.2606 40.4998 26.1489 40.4608 25.9253 40.3827C25.8256 40.3479 25.7757 40.3305 25.7268 40.3144C24.6052 39.9461 23.3948 39.9461 22.2732 40.3144C22.2243 40.3305 22.1744 40.3479 22.0747 40.3827C21.8511 40.4608 21.7394 40.4998 21.6391 40.5306C19.2767 41.2563 16.7186 40.3273 15.3764 38.2564C15.3194 38.1685 15.259 38.0669 15.138 37.8637C15.084 37.7731 15.057 37.7277 15.0299 37.684C14.408 36.6826 13.4808 35.9063 12.3844 35.4692C12.3365 35.4501 12.2871 35.4315 12.1882 35.3942C11.9667 35.3106 11.8559 35.2688 11.7593 35.2281C9.48205 34.2689 8.12097 31.9168 8.42698 29.4695C8.43997 29.3656 8.45908 29.249 8.4973 29.0158C8.51436 28.9117 8.52289 28.8597 8.53026 28.8088C8.69906 27.6429 8.48889 26.4536 7.93056 25.4155C7.90621 25.3702 7.88035 25.3242 7.82863 25.2322C7.71278 25.0262 7.65485 24.9231 7.60704 24.8299C6.48057 22.6347 6.95327 19.96 8.76433 18.2815C8.8412 18.2102 8.93096 18.1332 9.11047 17.9791C9.19061 17.9103 9.23068 17.8759 9.26908 17.8416C10.1496 17.0567 10.7548 16.0109 10.9958 14.8576C11.0063 14.8073 11.0162 14.7555 11.0358 14.6518C11.0798 14.4197 11.1019 14.3036 11.1253 14.2015C11.6766 11.7974 13.7619 10.0516 16.2306 9.92733C16.3354 9.92206 16.4538 9.92059 16.6906 9.91765C16.7963 9.91634 16.8492 9.91569 16.9007 9.91409C18.0809 9.87748 19.2182 9.46445 20.1459 8.7356C20.1864 8.70381 20.2273 8.67042 20.3091 8.60363Z" fill="#${Theme.of(context).colorScheme.primaryContainer.value.toRadixString(16).padLeft(8, '0').substring(2)}"/>
+                            </svg> ''',
+                                                  ),
+                                                ),
+                                                Positioned(
+                                                    top: 0,
+                                                    child: SizedBox(
+                                                      height: 48,
+                                                      child: windArrow,
+                                                    ))
+                                              ]),
+                                        ),
+                                      ),
+                                    ),
+                                  ]),
+                              const SizedBox(height: 10),
+                              Text("$formattedWindSpeed",
+                                  style: TextStyle(
+                                      fontSize: 14,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurfaceVariant,
+                                      fontWeight: FontWeight.w500)),
+                              Text(hour,
+                                  style: TextStyle(
+                                      fontSize: 15,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurface,
+                                      fontWeight: FontWeight.w500)),
+                            ],
+                          ),
+                        );
+                      },
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            Container(
+                margin: EdgeInsets.fromLTRB(
+                    12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
+                padding: EdgeInsets.all(20),
+                decoration: BoxDecoration(
+                  border: Border.all(
+                    width: 1,
+                    color: Theme.of(context).colorScheme.outlineVariant,
+                  ),
+                  borderRadius: BorderRadius.circular(18),
+                ),
+                child: Column(
+                  spacing: 20,
+                  children: [
+                    Text("wind_info".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                  ],
+                ))
+          ]);
+        });
+  }
+
+  Widget buildUVExtended() {
+    return FutureBuilder<Map<String, dynamic>?>(
+        future: getWeatherWidgets(),
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.waiting) {
+            return const Center(child: CircularProgressIndicator());
+          } else if (snapshot.hasError) {
+            return Center(child: Text('Error: ${snapshot.error}'));
+          } else if (!snapshot.hasData || snapshot.data == null) {
+            return Center(child: Text('no_data_available'.tr()));
+          }
+
+          final data = snapshot.data!;
+          final weather = data['data'];
+
+          final hourly = weather['hourly'];
+          final List<dynamic> hourlyTime = hourly['time'];
+          final List<dynamic> uvIndexes = hourly['uv_index'];
+
+          final offset = Duration(
+              seconds: int.parse(weather['utc_offset_seconds'].toString()));
+          final nowUtc = DateTime.now().toUtc();
+          final nowLocal = nowUtc.add(offset);
+
+          final timeUnit =
+              PreferencesHelper.getString("selectedTimeUnit") ?? '12 hr';
+
+          final roundedNow = DateTime(
+              nowLocal.year, nowLocal.month, nowLocal.day, nowLocal.hour);
+
+          int startIndex = hourlyTime.indexWhere((timeStr) {
+            final forecastLocal = DateTime.parse(timeStr);
+            return !forecastLocal.isBefore(roundedNow);
+          });
+
+          if (startIndex == -1) startIndex = 0;
+
+          final nonNullUvIndexes = uvIndexes.whereType<num>().toList();
+          final double minUv = nonNullUvIndexes.isNotEmpty
+              ? nonNullUvIndexes.reduce((a, b) => a < b ? a : b).toDouble()
+              : 0;
+          final double maxUv = nonNullUvIndexes.isNotEmpty
+              ? nonNullUvIndexes.reduce((a, b) => a > b ? a : b).toDouble()
+              : 1;
+
+          List<double> todayUvIndexes = [];
+
+          for (int i = 8; i <= 18 && i < uvIndexes.length; i++) {
+            final uv = uvIndexes[i];
+            if (uv is num) {
+              todayUvIndexes.add(uv.toDouble());
+            }
+          }
+          final double avgUv = todayUvIndexes.isNotEmpty
+              ? todayUvIndexes.reduce((a, b) => a + b) / todayUvIndexes.length
+              : 0;
+
+          return Column(children: [
+            Container(
+              height: 360,
+              decoration: BoxDecoration(
+                color: Theme.of(context).colorScheme.surfaceContainer,
+                borderRadius: BorderRadius.circular(18),
+              ),
+              padding: EdgeInsets.only(top: 12, bottom: 0),
+              margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
+              child: Column(
+                children: [
                   Container(
-                    clipBehavior: Clip.none,
-                        width: 43,
-                        height: math.max((uvPercentage / 100) * 160, 48), 
-                        decoration: BoxDecoration(
-                          color: getUvColor(uvValue ?? 0, context),
-                          borderRadius: BorderRadius.circular(50),
-                        ),
-                      child:  Align(
-                      alignment: Alignment.topCenter, 
-                      child: SizedBox(
-                        width: 60,
-                        height: 60,
-                        child: Stack(
-                           alignment: Alignment.center,
+                    padding: EdgeInsets.fromLTRB(20, 10, 20, 0),
+                    alignment: Alignment.centerLeft,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text("todays_avg".tr(),
+                            style: TextStyle(
+                                fontSize: 20,
+                                color: Theme.of(context).colorScheme.onSurface,
+                                fontWeight: FontWeight.w500)),
+                        Row(
+                          crossAxisAlignment: CrossAxisAlignment.end,
                           children: [
-                            Positioned(
-                              top: 0,
-                              child:SvgPicture.string(
-                              '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+                            Text(
+                              avgUv != null ? "${avgUv.round()}" : "--",
+                              style: TextStyle(
+                                  fontSize: 50,
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
+                                  fontWeight: FontWeight.w500),
+                            ),
+                            Padding(
+                                padding: EdgeInsets.only(bottom: 11, left: 8),
+                                child: Text(
+                                  avgUv != null
+                                      ? getUvIndexType(avgUv.round())
+                                      : "Not available",
+                                  style: TextStyle(
+                                      fontSize: 20,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurfaceVariant,
+                                      fontWeight: FontWeight.w500),
+                                ))
+                          ],
+                        )
+                      ],
+                    ),
+                  ),
+                  SizedBox(
+                    height: 216,
+                    child: ListView.builder(
+                      scrollDirection: Axis.horizontal,
+                      physics: BouncingScrollPhysics(),
+                      itemCount: 24 + 24 - startIndex,
+                      itemBuilder: (context, index) {
+                        final dataIndex = startIndex + index;
+
+                        if (dataIndex >= hourlyTime.length)
+                          return const SizedBox();
+                        final forecastLocal =
+                            DateTime.parse(hourlyTime[dataIndex]);
+
+                        final roundedDisplayTime = DateTime(
+                          forecastLocal.year,
+                          forecastLocal.month,
+                          forecastLocal.day,
+                          forecastLocal.hour,
+                        );
+                        final hour = timeUnit == '24 hr'
+                            ? "${roundedDisplayTime.hour.toString().padLeft(2, '0')}:00"
+                            : UnitConverter.formatTo12Hour(roundedDisplayTime);
+
+                        final uv = uvIndexes[dataIndex];
+                        final bool isValidUv = uv is num;
+                        final double? uvValue =
+                            isValidUv ? uv.toDouble() : null;
+                        final double uvPercentage =
+                            uvValue != null && maxUv != minUv
+                                ? ((uvValue - minUv) / (maxUv - minUv)) * 100
+                                : 0;
+
+                        EdgeInsets itemMargin = EdgeInsets.only(
+                          left: index == 0 ? 10 : 0,
+                          right: index == 24 + 24 - startIndex - 1 ? 10 : 0,
+                        );
+
+                        Color getUvColor(double uv, BuildContext context) {
+                          if (uv <= 2) return Colors.green;
+                          if (uv <= 5) return Colors.yellow;
+                          if (uv <= 7) return Colors.orange;
+                          if (uv <= 10) return Colors.red;
+                          return Colors.purple;
+                        }
+
+                        return Container(
+                          width: 53,
+                          margin: itemMargin,
+                          decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.end,
+                            children: [
+                              Stack(
+                                  alignment: Alignment.bottomCenter,
+                                  clipBehavior: Clip.none,
+                                  children: [
+                                    Container(
+                                      width: 20,
+                                      height: 160,
+                                      decoration: BoxDecoration(
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .surface,
+                                        borderRadius: BorderRadius.circular(50),
+                                      ),
+                                    ),
+                                    Container(
+                                      clipBehavior: Clip.none,
+                                      width: 43,
+                                      height: math.max(
+                                          (uvPercentage / 100) * 160, 48),
+                                      decoration: BoxDecoration(
+                                        color:
+                                            getUvColor(uvValue ?? 0, context),
+                                        borderRadius: BorderRadius.circular(50),
+                                      ),
+                                      child: Align(
+                                        alignment: Alignment.topCenter,
+                                        child: SizedBox(
+                                          width: 60,
+                                          height: 60,
+                                          child: Stack(
+                                              alignment: Alignment.center,
+                                              children: [
+                                                Positioned(
+                                                  top: 0,
+                                                  child: SvgPicture.string(
+                                                    '''<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
                             <path d="M20.3091 8.60363C20.4924 8.454 20.584 8.37919 20.6677 8.31603C22.6389 6.82799 25.3611 6.82799 27.3323 8.31603C27.416 8.37919 27.5076 8.454 27.6909 8.60363C27.7727 8.67042 27.8136 8.70381 27.8541 8.7356C28.7818 9.46445 29.9191 9.87748 31.0993 9.91409C31.1508 9.91569 31.2037 9.91634 31.3094 9.91765C31.5462 9.92059 31.6646 9.92206 31.7694 9.92733C34.2381 10.0516 36.3234 11.7974 36.8747 14.2015C36.8982 14.3036 36.9202 14.4197 36.9642 14.6518C36.9838 14.7555 36.9937 14.8073 37.0042 14.8576C37.2452 16.0109 37.8504 17.0567 38.7309 17.8416C38.7693 17.8759 38.8094 17.9103 38.8895 17.9791C39.069 18.1332 39.1588 18.2102 39.2357 18.2815C41.0467 19.96 41.5194 22.6347 40.393 24.8299C40.3451 24.9231 40.2872 25.0262 40.1714 25.2322C40.1196 25.3242 40.0938 25.3702 40.0694 25.4155C39.5111 26.4536 39.3009 27.6429 39.4697 28.8088C39.4771 28.8597 39.4856 28.9117 39.5027 29.0158C39.5409 29.249 39.56 29.3656 39.573 29.4695C39.879 31.9168 38.5179 34.2689 36.2407 35.2281C36.1441 35.2688 36.0333 35.3106 35.8118 35.3942C35.7129 35.4315 35.6635 35.4501 35.6156 35.4692C34.5192 35.9063 33.592 36.6826 32.9701 37.684C32.943 37.7277 32.916 37.7731 32.862 37.8637C32.741 38.0669 32.6806 38.1685 32.6236 38.2564C31.2814 40.3273 28.7233 41.2563 26.3609 40.5306C26.2606 40.4998 26.1489 40.4608 25.9253 40.3827C25.8256 40.3479 25.7757 40.3305 25.7268 40.3144C24.6052 39.9461 23.3948 39.9461 22.2732 40.3144C22.2243 40.3305 22.1744 40.3479 22.0747 40.3827C21.8511 40.4608 21.7394 40.4998 21.6391 40.5306C19.2767 41.2563 16.7186 40.3273 15.3764 38.2564C15.3194 38.1685 15.259 38.0669 15.138 37.8637C15.084 37.7731 15.057 37.7277 15.0299 37.684C14.408 36.6826 13.4808 35.9063 12.3844 35.4692C12.3365 35.4501 12.2871 35.4315 12.1882 35.3942C11.9667 35.3106 11.8559 35.2688 11.7593 35.2281C9.48205 34.2689 8.12097 31.9168 8.42698 29.4695C8.43997 29.3656 8.45908 29.249 8.4973 29.0158C8.51436 28.9117 8.52289 28.8597 8.53026 28.8088C8.69906 27.6429 8.48889 26.4536 7.93056 25.4155C7.90621 25.3702 7.88035 25.3242 7.82863 25.2322C7.71278 25.0262 7.65485 24.9231 7.60704 24.8299C6.48057 22.6347 6.95327 19.96 8.76433 18.2815C8.8412 18.2102 8.93096 18.1332 9.11047 17.9791C9.19061 17.9103 9.23068 17.8759 9.26908 17.8416C10.1496 17.0567 10.7548 16.0109 10.9958 14.8576C11.0063 14.8073 11.0162 14.7555 11.0358 14.6518C11.0798 14.4197 11.1019 14.3036 11.1253 14.2015C11.6766 11.7974 13.7619 10.0516 16.2306 9.92733C16.3354 9.92206 16.4538 9.92059 16.6906 9.91765C16.7963 9.91634 16.8492 9.91569 16.9007 9.91409C18.0809 9.87748 19.2182 9.46445 20.1459 8.7356C20.1864 8.70381 20.2273 8.67042 20.3091 8.60363Z" fill="#${Theme.of(context).colorScheme.primary.value.toRadixString(16).padLeft(8, '0').substring(2)}"/>
                             </svg> ''',
-                            ),
-                            ),
-                            Positioned(
-                            top: 0,
-                            child: SizedBox(
-                              height: 48,
-                              child: Icon(Symbols.sunny, color: Theme.of(context).colorScheme.onPrimary, fill: 1, size: 20,),
-                            )
-                            )
-                          ]
-                        ),
-                      ),
+                                                  ),
+                                                ),
+                                                Positioned(
+                                                    top: 0,
+                                                    child: SizedBox(
+                                                      height: 48,
+                                                      child: Icon(
+                                                        Symbols.sunny,
+                                                        color: Theme.of(context)
+                                                            .colorScheme
+                                                            .onPrimary,
+                                                        fill: 1,
+                                                        size: 20,
+                                                      ),
+                                                    ))
+                                              ]),
+                                        ),
+                                      ),
+                                    ),
+                                  ]),
+                              const SizedBox(height: 10),
+                              Text(
+                                  uvValue != null ? "${uvValue.round()}" : "--",
+                                  style: TextStyle(
+                                      fontSize: 14,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurfaceVariant,
+                                      fontWeight: FontWeight.w500)),
+                              Text(hour,
+                                  style: TextStyle(
+                                      fontSize: 15,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurface,
+                                      fontWeight: FontWeight.w500)),
+                            ],
+                          ),
+                        );
+                      },
                     ),
                   ),
-                  ]
+                ],
+              ),
+            ),
+            Container(
+                margin: EdgeInsets.fromLTRB(
+                    12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
+                padding: EdgeInsets.all(20),
+                decoration: BoxDecoration(
+                  border: Border.all(
+                    width: 1,
+                    color: Theme.of(context).colorScheme.outlineVariant,
                   ),
-                  const SizedBox(height: 10),
-
-                  Text(uvValue != null ? "${uvValue.round()}" : "--", style: TextStyle(fontSize: 14, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text(hour, style: TextStyle(fontSize: 15, color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500)),
-                ],
-              ),
-              );
-          },
-        ),
-       ),
-
-
-      ],
-      ),
-      ),
-      Container(
-              margin: EdgeInsets.fromLTRB(12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
-              padding: EdgeInsets.all(20),
-              decoration: BoxDecoration(
-              border: Border.all(
-                width: 1,
-                color: Theme.of(context).colorScheme.outlineVariant,
-              ),
-              borderRadius: BorderRadius.circular(18),
-              ),
-              child:  Column(  
-              spacing: 20,
-                children: [
-                  Text("uv_index_info".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text("uv_index_info_2".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text("uv_index_info_3".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text("uv_index_info_4".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text("uv_index_info_5".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                ],
-              )
-          )
-        ]
-      );
-     }
-    );
+                  borderRadius: BorderRadius.circular(18),
+                ),
+                child: Column(
+                  spacing: 20,
+                  children: [
+                    Text("uv_index_info".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                    Text("uv_index_info_2".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                    Text("uv_index_info_3".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                    Text("uv_index_info_4".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                    Text("uv_index_info_5".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                  ],
+                ))
+          ]);
+        });
   }
 
-  Widget buildAQIExtended(){
+  Widget buildAQIExtended() {
     int selectedIndex = 0;
 
-    final aqiUnit = PreferencesHelper.getString("selectedAQIUnit") ?? "United States";
-
-
-    final ValueNotifier<int> tabIndexNotifier = ValueNotifier<int>(aqiUnit == 'European' ? 1 : 0);
+    final aqiUnit =
+        PreferencesHelper.getString("selectedAQIUnit") ?? "United States";
 
+    final ValueNotifier<int> tabIndexNotifier =
+        ValueNotifier<int>(aqiUnit == 'European' ? 1 : 0);
 
     return FutureBuilder<Map<String, dynamic>?>(
-    future: getWeatherWidgets(),
-    builder: (context, snapshot) {
-      if (snapshot.connectionState == ConnectionState.waiting) {
-        return const Center(child: CircularProgressIndicator());
-      } else if (snapshot.hasError) {
-        return Center(child: Text('Error: ${snapshot.error}'));
-      } else if (!snapshot.hasData || snapshot.data == null) {
-        return Center(child: Text('no_data_available'.tr()));
-      }
+        future: getWeatherWidgets(),
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.waiting) {
+            return const Center(child: CircularProgressIndicator());
+          } else if (snapshot.hasError) {
+            return Center(child: Text('Error: ${snapshot.error}'));
+          } else if (!snapshot.hasData || snapshot.data == null) {
+            return Center(child: Text('no_data_available'.tr()));
+          }
 
-      final data = snapshot.data!;
-      final weather = data['data'];
-      final airQualityData = weather['air_quality']['current'];
+          final data = snapshot.data!;
+          final weather = data['data'];
+          final airQualityData = weather['air_quality']['current'];
 
+          final aqiFormat = aqiUnit == 'European'
+              ? airQualityData['european_aqi']
+              : airQualityData['us_aqi'];
 
-    final aqiFormat = aqiUnit == 'European' ? airQualityData['european_aqi'] : airQualityData['us_aqi'];
-
-
-      return Column(
-        children: [ 
-        Container(
-        clipBehavior: Clip.hardEdge,
-         height: 300,
-        decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceContainer,
-          borderRadius: BorderRadius.circular(18),
-        ),
-        padding: EdgeInsets.only(top: 12, bottom: 0),
-        margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
-        child: Column(
-        children: [
-        Container(
-          padding: EdgeInsets.fromLTRB(20, 10, 20, 0),
-          alignment: Alignment.centerLeft,
-       child:  Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text("current_conditions".tr(), style: TextStyle(fontSize: 20,  color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500)),
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Text("$aqiFormat", style: TextStyle(fontSize: 50,  color: Theme.of(context).colorScheme.secondary, fontWeight: FontWeight.w500),),
-                Padding(padding: EdgeInsets.only(bottom: 11, left: 8),
-               child: Text(getAQIIndexType(aqiFormat, aqiUnit == 'European' ? true : false), style: TextStyle(fontSize: 20,  color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500),))
-              ],
-            ),
-          ],
-        ),
-      ),
-
-      Container(
-        height: 20,
-        clipBehavior: Clip.none,
-        padding: EdgeInsets.fromLTRB(12, 0, 12, 0),
-        margin: EdgeInsets.only(top: 10),
-       child:  Stack(   
-        children: [
-          AQISliderBar(
-            aqi: airQualityData['us_aqi'], 
-            width: 380,
-            height: 20,
-            ),
-        ],
-      ),
-      ),   
-
-    Container(
-      padding: EdgeInsets.fromLTRB(20, 20, 20, 0),
-     child: Column(
-        spacing: 10,
-        children: [
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          return Column(
             children: [
-              Text("${"united_states_aqi".tr()}:", style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontSize: 15),),
               Container(
-                padding: EdgeInsets.only(left: 10, right: 10),
+                clipBehavior: Clip.hardEdge,
+                height: 300,
                 decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(50),
-                  color: Theme.of(context).colorScheme.tertiary
+                  color: Theme.of(context).colorScheme.surfaceContainer,
+                  borderRadius: BorderRadius.circular(18),
                 ),
-                child: Text("${airQualityData['us_aqi']}", style: TextStyle(color: Theme.of(context).colorScheme.onTertiary, fontSize: 16, fontWeight: FontWeight.w500)),
-              )
-            ],
-          ),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Text("${"european_aqi".tr()}:", style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontSize: 15)),
-              Container(
-                padding: EdgeInsets.only(left: 10, right: 10),
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(50),
-                  color: Theme.of(context).colorScheme.tertiary
-                ),
-                child: Text("${airQualityData['european_aqi']}", style: TextStyle(color: Theme.of(context).colorScheme.onTertiary, fontSize: 16, fontWeight: FontWeight.w500)),
-              )
-            ],
-          )
-        ],
-      )
-      ),
-
-      SizedBox(height: 20,),
-            ValueListenableBuilder<int>(
-                  valueListenable: tabIndexNotifier,
-                  builder: (context, selectedIndex, _) {
-                    return Container(
-                      padding: const EdgeInsets.symmetric(horizontal: 20),
-                      child: Row(
+                padding: EdgeInsets.only(top: 12, bottom: 0),
+                margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
+                child: Column(
+                  children: [
+                    Container(
+                      padding: EdgeInsets.fromLTRB(20, 10, 20, 0),
+                      alignment: Alignment.centerLeft,
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-                          _buildTabButton(context, "united_states_aqi".tr(), 0, selectedIndex, tabIndexNotifier),
-                          _buildTabButton(context, "european_aqi".tr(), 1, selectedIndex, tabIndexNotifier),
+                          Text("current_conditions".tr(),
+                              style: TextStyle(
+                                  fontSize: 20,
+                                  color:
+                                      Theme.of(context).colorScheme.onSurface,
+                                  fontWeight: FontWeight.w500)),
+                          Row(
+                            crossAxisAlignment: CrossAxisAlignment.end,
+                            children: [
+                              Text(
+                                "$aqiFormat",
+                                style: TextStyle(
+                                    fontSize: 50,
+                                    color:
+                                        Theme.of(context).colorScheme.secondary,
+                                    fontWeight: FontWeight.w500),
+                              ),
+                              Padding(
+                                  padding: EdgeInsets.only(bottom: 11, left: 8),
+                                  child: Text(
+                                    getAQIIndexType(aqiFormat,
+                                        aqiUnit == 'European' ? true : false),
+                                    style: TextStyle(
+                                        fontSize: 20,
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .onSurfaceVariant,
+                                        fontWeight: FontWeight.w500),
+                                  ))
+                            ],
+                          ),
                         ],
                       ),
-                    );
-                  },
+                    ),
+                    Container(
+                      height: 20,
+                      clipBehavior: Clip.none,
+                      padding: EdgeInsets.fromLTRB(12, 0, 12, 0),
+                      margin: EdgeInsets.only(top: 10),
+                      child: Stack(
+                        children: [
+                          AQISliderBar(
+                            aqi: airQualityData['us_aqi'],
+                            width: 380,
+                            height: 20,
+                          ),
+                        ],
+                      ),
+                    ),
+                    Container(
+                        padding: EdgeInsets.fromLTRB(20, 20, 20, 0),
+                        child: Column(
+                          spacing: 10,
+                          children: [
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text(
+                                  "${"united_states_aqi".tr()}:",
+                                  style: TextStyle(
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurface,
+                                      fontSize: 15),
+                                ),
+                                Container(
+                                  padding: EdgeInsets.only(left: 10, right: 10),
+                                  decoration: BoxDecoration(
+                                      borderRadius: BorderRadius.circular(50),
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .tertiary),
+                                  child: Text("${airQualityData['us_aqi']}",
+                                      style: TextStyle(
+                                          color: Theme.of(context)
+                                              .colorScheme
+                                              .onTertiary,
+                                          fontSize: 16,
+                                          fontWeight: FontWeight.w500)),
+                                )
+                              ],
+                            ),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text("${"european_aqi".tr()}:",
+                                    style: TextStyle(
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .onSurface,
+                                        fontSize: 15)),
+                                Container(
+                                  padding: EdgeInsets.only(left: 10, right: 10),
+                                  decoration: BoxDecoration(
+                                      borderRadius: BorderRadius.circular(50),
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .tertiary),
+                                  child: Text(
+                                      "${airQualityData['european_aqi']}",
+                                      style: TextStyle(
+                                          color: Theme.of(context)
+                                              .colorScheme
+                                              .onTertiary,
+                                          fontSize: 16,
+                                          fontWeight: FontWeight.w500)),
+                                )
+                              ],
+                            )
+                          ],
+                        )),
+                    SizedBox(
+                      height: 20,
+                    ),
+                    ValueListenableBuilder<int>(
+                      valueListenable: tabIndexNotifier,
+                      builder: (context, selectedIndex, _) {
+                        return Container(
+                          padding: const EdgeInsets.symmetric(horizontal: 20),
+                          child: Row(
+                            children: [
+                              _buildTabButton(context, "united_states_aqi".tr(),
+                                  0, selectedIndex, tabIndexNotifier),
+                              _buildTabButton(context, "european_aqi".tr(), 1,
+                                  selectedIndex, tabIndexNotifier),
+                            ],
+                          ),
+                        );
+                      },
+                    ),
+                  ],
                 ),
-              ],
-            ),
-          ),
-      SizedBox(height: 20,),
-
-        ValueListenableBuilder<int>(
-            valueListenable: tabIndexNotifier,
-            builder: (context, selectedIndex, _) {
-              return AnimatedSwitcher(
-                duration: const Duration(milliseconds: 250),
-                
-                child: selectedIndex == 0
-                    ? _buildAQIDetailsCard(
-                        context,
-                        "aqi_info_us".tr(),
-                        [
-                          "0–50: ${"air_quality_satisfactory".tr()}",
-                          "51–100: ${"air_quality_acceptable".tr()}",
-                          "101–150: ${"sensitive_groups_health_effects".tr()}",
-                          "151–200: ${"health_effects_public".tr()}",
-                          "201–300: ${"emergency_conditions".tr()}",
-                        ],
-                        key: const ValueKey('us'),
-                      )
-                    : _buildAQIDetailsCard(
-                        context,
-                        "aqi_info_eu".tr(),
-                        [
-                          "0–25: ${"air_quality_satisfactory".tr()}",
-                          "26–50: ${"air_quality_acceptable".tr()}",
-                          "51–75: ${"sensitive_groups_health_effects".tr()}",
-                          "76–100: ${"health_effects_public".tr()}",
-                          "100+: ${"emergency_conditions".tr()}",
-                        ],
-                        key: const ValueKey('eu'),
-                        )
-                      );
-            },
-          ),
-          ],
-            
-  );
-
-     }
-    );
-}
-
-Widget _buildTabButton(
-  BuildContext context,
-  String label,
-  int index,
-  int selectedIndex,
-  ValueNotifier<int> tabIndexNotifier,
-) {
-  final isSelected = selectedIndex == index;
-  final isFirst = index == 0;
-  final isLast = index == 1; 
-
-  BorderRadius borderRadius;
-
-  if (isSelected) {
-    borderRadius = BorderRadius.circular(50); 
-  } else if (isFirst) {
-    borderRadius = const BorderRadius.only(
-      topLeft: Radius.circular(50),
-      bottomLeft: Radius.circular(50),
-      bottomRight: Radius.circular(10),
-      topRight: Radius.circular(10)
-    );
-  } else if (isLast) {
-    borderRadius = const BorderRadius.only(
-      topRight: Radius.circular(50),
-      bottomRight: Radius.circular(50),
-      bottomLeft: Radius.circular(10),
-      topLeft: Radius.circular(10)
-    );
-  } else {
-    borderRadius = BorderRadius.zero;
+              ),
+              SizedBox(
+                height: 20,
+              ),
+              ValueListenableBuilder<int>(
+                valueListenable: tabIndexNotifier,
+                builder: (context, selectedIndex, _) {
+                  return AnimatedSwitcher(
+                      duration: const Duration(milliseconds: 250),
+                      child: selectedIndex == 0
+                          ? _buildAQIDetailsCard(
+                              context,
+                              "aqi_info_us".tr(),
+                              [
+                                "0–50: ${"air_quality_satisfactory".tr()}",
+                                "51–100: ${"air_quality_acceptable".tr()}",
+                                "101–150: ${"sensitive_groups_health_effects".tr()}",
+                                "151–200: ${"health_effects_public".tr()}",
+                                "201–300: ${"emergency_conditions".tr()}",
+                              ],
+                              key: const ValueKey('us'),
+                            )
+                          : _buildAQIDetailsCard(
+                              context,
+                              "aqi_info_eu".tr(),
+                              [
+                                "0–25: ${"air_quality_satisfactory".tr()}",
+                                "26–50: ${"air_quality_acceptable".tr()}",
+                                "51–75: ${"sensitive_groups_health_effects".tr()}",
+                                "76–100: ${"health_effects_public".tr()}",
+                                "100+: ${"emergency_conditions".tr()}",
+                              ],
+                              key: const ValueKey('eu'),
+                            ));
+                },
+              ),
+            ],
+          );
+        });
   }
 
-  return Expanded(
-  child: GestureDetector(
-    onTap: () => tabIndexNotifier.value = index,
-    child: TweenAnimationBuilder<BorderRadius>(
-      duration: const Duration(milliseconds: 1000),
-      curve: Curves.elasticOut,
-      tween: Tween<BorderRadius>(begin: BorderRadius.zero, end: borderRadius),
-      builder: (context, radius, child) {
-        return Container(
-          alignment: Alignment.center,
-          padding: const EdgeInsets.symmetric(vertical: 12),
-          decoration: BoxDecoration(
-            color: isSelected
-                ? Theme.of(context).colorScheme.primary
-                : Theme.of(context).colorScheme.primaryContainer,
-            borderRadius: radius,
-          ),
-          child: Text(
-            label,
-            style: TextStyle(
-              color: isSelected
-                  ? Theme.of(context).colorScheme.onPrimary
-                  : Theme.of(context).colorScheme.onPrimaryContainer,
-              fontWeight: FontWeight.w500,
-            ),
-          ),
-        );
-      },
-    ),
-  ),
-);
+  Widget _buildTabButton(
+    BuildContext context,
+    String label,
+    int index,
+    int selectedIndex,
+    ValueNotifier<int> tabIndexNotifier,
+  ) {
+    final isSelected = selectedIndex == index;
+    final isFirst = index == 0;
+    final isLast = index == 1;
 
-}
+    BorderRadius borderRadius;
 
+    if (isSelected) {
+      borderRadius = BorderRadius.circular(50);
+    } else if (isFirst) {
+      borderRadius = const BorderRadius.only(
+          topLeft: Radius.circular(50),
+          bottomLeft: Radius.circular(50),
+          bottomRight: Radius.circular(10),
+          topRight: Radius.circular(10));
+    } else if (isLast) {
+      borderRadius = const BorderRadius.only(
+          topRight: Radius.circular(50),
+          bottomRight: Radius.circular(50),
+          bottomLeft: Radius.circular(10),
+          topLeft: Radius.circular(10));
+    } else {
+      borderRadius = BorderRadius.zero;
+    }
 
-
-
-Widget _buildAQIDetailsCard(
-  BuildContext context,
-  String title,
-  List<String> lines, {
-  required Key key,
-}) {
-  return Container(
-    key: key,
-    margin: EdgeInsets.fromLTRB(12, 0, 12, MediaQuery.of(context).padding.bottom + 26),
-    padding: const EdgeInsets.all(20),
-    decoration: BoxDecoration(
-      border: Border.all(color: Theme.of(context).colorScheme.outlineVariant),
-      borderRadius: BorderRadius.circular(18),
-    ),
-    child: Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(title,
-            style: TextStyle(
-              fontSize: 17,
-              fontWeight: FontWeight.w500,
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
-            )),
-        const SizedBox(height: 10),
-        for (var line in lines)
-          Padding(
-            padding: const EdgeInsets.only(bottom: 6),
-            child: Text(
-              line,
-              style: TextStyle(
-                fontSize: 16,
-                color: Theme.of(context).colorScheme.onSurfaceVariant,
-              ),
-            ),
-          ),
-      ],
-    ),
-  );
-}
-
-Widget buildPrecipExtended(){
-    return FutureBuilder<Map<String, dynamic>?>(
-    future: getWeatherWidgets(),
-    builder: (context, snapshot) {
-      if (snapshot.connectionState == ConnectionState.waiting) {
-        return const Center(child: CircularProgressIndicator());
-      } else if (snapshot.hasError) {
-        return Center(child: Text('Error: ${snapshot.error}'));
-      } else if (!snapshot.hasData || snapshot.data == null) {
-        return Center(child: Text('no_data_available'.tr()));
-      }
-
-      final data = snapshot.data!;
-      final weather = data['data'];
-
-
-
-    final hourly = weather['hourly'];
-    final daily = weather['daily'];
-    final List<dynamic> hourlyTime = hourly['time'];
-    final List<dynamic> precipProb = hourly['precipitation_probability'];
-    final List<double> precipAmount = 
-    (hourly['precipitation'] as List<dynamic>)
-        .map((e) => (e as num).toDouble())
-        .toList();
-    final double precipHours = daily['precipitation_hours'][0];
-    final double todaysAMOUNT = daily['precipitation_sum'][0];
-
-    
-    final offset = Duration(seconds: int.parse(weather['utc_offset_seconds'].toString()));
-    final nowUtc = DateTime.now().toUtc();
-    final nowLocal = nowUtc.add(offset);
-
-    final timeUnit = PreferencesHelper.getString("selectedTimeUnit") ?? '12 hr';
-
-    final precipitationUnit = PreferencesHelper.getString("selectedPrecipitationUnit") ?? 'mm';
-
-    final convertedPrecip = precipitationUnit == 'cm'
-        ? UnitConverter.mmToCm(todaysAMOUNT)
-        : precipitationUnit == 'in'
-            ? UnitConverter.mmToIn(todaysAMOUNT)
-            : todaysAMOUNT;
-
-
-    final roundedNow = DateTime(nowLocal.year, nowLocal.month, nowLocal.day, nowLocal.hour);
-
-    int startIndex = hourlyTime.indexWhere((timeStr) {
-      final forecastLocal = DateTime.parse(timeStr); 
-      return !forecastLocal.isBefore(roundedNow);
-    });
-
-    if (startIndex == -1) startIndex = 0;
-
-final double minprecipAmount = precipAmount.reduce((a, b) => a < b ? a : b);
-final double maxprecipAmount = precipAmount.reduce((a, b) => a > b ? a : b);
-
-
-     return Column(
-   children: [ 
-
-       Container(
-      height: 360,
-        decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceContainer,
-          borderRadius: BorderRadius.circular(18),
-        ),
-        padding: EdgeInsets.only(top: 12, bottom: 0),
-        margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
-        child: Column(
-        children: [
-        Container(
-          padding: EdgeInsets.fromLTRB(20, 10, 20, 0),
-          alignment: Alignment.centerLeft,
-       child:  Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text("today's_amount".tr(), style: TextStyle(fontSize: 20,  color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500)),
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Text("${double.parse(convertedPrecip.toStringAsFixed(2))}", style: TextStyle(fontSize: 50,  color: Theme.of(context).colorScheme.secondary, fontWeight: FontWeight.w500),),
-                Padding(padding: EdgeInsets.only(bottom: 11, left: 8),
-               child: Text('${localizePrecipUnit(precipitationUnit, context.locale)} • ${precipHours.round()} ${'hrs_sub_text'.tr()}', style: TextStyle(fontSize: 20,  color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500),))
-              ],
-            )
-            
-          ],
-      ),
-      ),
-
-
-    SizedBox(
-        height: 216,
-        child: ListView.builder(
-          scrollDirection: Axis.horizontal,
-          physics: BouncingScrollPhysics(),
-          itemCount: 24 + 24 - startIndex,
-          itemBuilder: (context, index) {
-          final dataIndex = startIndex + index;
-
-          if (dataIndex >= hourlyTime.length) return const SizedBox();
-          final forecastLocal = DateTime.parse(hourlyTime[dataIndex]);
-
-          final roundedDisplayTime = DateTime(
-            forecastLocal.year,
-            forecastLocal.month,
-            forecastLocal.day,
-            forecastLocal.hour,
-          );
-            final hour = timeUnit == '24 hr' ? "${roundedDisplayTime.hour.toString().padLeft(2, '0')}:00" : UnitConverter.formatTo12Hour(roundedDisplayTime);
-
-
-
-          final precipAmountMain = precipAmount[dataIndex];
-          final precipProbMain = precipProb[dataIndex];
-
-
-          final double rainValue = (precipAmountMain is num) ? precipAmountMain.toDouble() : 0;
-          final double rainPercentage = ((rainValue - minprecipAmount) / (maxprecipAmount - minprecipAmount)) * 100;
-
-          
-    final convertedPrecipAmount = precipitationUnit == 'cm'
-        ? UnitConverter.mmToCm(rainValue)
-        : precipitationUnit == 'in'
-            ? UnitConverter.mmToIn(rainValue)
-            : rainValue;
-
-
-          EdgeInsets itemMargin = EdgeInsets.only(
-              left: index == 0 ? 10 : 0,
-              right: index == 24 + 24 - startIndex - 1 ? 10 : 0,
-
-            );
-
+    return Expanded(
+      child: GestureDetector(
+        onTap: () => tabIndexNotifier.value = index,
+        child: TweenAnimationBuilder<BorderRadius>(
+          duration: const Duration(milliseconds: 1000),
+          curve: Curves.elasticOut,
+          tween:
+              Tween<BorderRadius>(begin: BorderRadius.zero, end: borderRadius),
+          builder: (context, radius, child) {
             return Container(
-              width: 53,
-              margin: itemMargin,
+              alignment: Alignment.center,
+              padding: const EdgeInsets.symmetric(vertical: 12),
               decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(12),
+                color: isSelected
+                    ? Theme.of(context).colorScheme.primary
+                    : Theme.of(context).colorScheme.primaryContainer,
+                borderRadius: radius,
               ),
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.end,
-                children: [
-                Stack(
-                  alignment: Alignment.bottomCenter,
-                  clipBehavior: Clip.none, 
-                  children: [
-                  Container(
-                    width: 20,
-                    height: 160,
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.surface,
-                      borderRadius: BorderRadius.circular(50),
-                    ),
-                  ),
-                  Container(
-                    clipBehavior: Clip.none,
-                        width: 43,
-                        height: math.max((rainPercentage / 100) * 160, 45), 
-                        decoration: BoxDecoration(
-                          color: Theme.of(context).colorScheme.primary,
-                          borderRadius: BorderRadius.circular(50),
-                        ),
-                      child:  Align(
-                      alignment: Alignment.topCenter, 
-                      child: SizedBox(
-                        width: 60,
-                        height: 60,
-                        child: Stack(
-                           alignment: Alignment.center,
-                          children: [
-                            Positioned(
-                              top: 3,
-                              child:
-                            CircleAvatar(
-                                child:  Text("$precipProbMain%", style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13),),
-                            )
-                            ),
-                          ]
-                        ),
-                      ),
-                    ),
-                  ),
-                  ]
+              child: Text(
+                label,
+                style: TextStyle(
+                  color: isSelected
+                      ? Theme.of(context).colorScheme.onPrimary
+                      : Theme.of(context).colorScheme.onPrimaryContainer,
+                  fontWeight: FontWeight.w500,
                 ),
-                  const SizedBox(height: 10),
-
-                  Text("${double.parse(convertedPrecipAmount.toStringAsFixed(2))}", style: TextStyle(fontSize: 14, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text(hour, style: TextStyle(fontSize: 15, color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500)),
-                ],
               ),
-              );
+            );
           },
         ),
-       ),
-
-
-      ],
       ),
-      ),
-      Container(
-              margin: EdgeInsets.fromLTRB(12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
-              padding: EdgeInsets.all(20),
-              decoration: BoxDecoration(
-              border: Border.all(
-                width: 1,
-                color: Theme.of(context).colorScheme.outlineVariant,
-              ),
-              borderRadius: BorderRadius.circular(18),
-              ),
-              child:  Column(  
-              spacing: 20,
-                children: [
-                  Text("precip_info".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text("precip_info_2".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text("precip_info_3".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                  Text("precip_info_4".tr(), style: TextStyle(fontSize: 17, color: Theme.of(context).colorScheme.onSurfaceVariant, fontWeight: FontWeight.w500)),
-                ],
-              )
-          )
-        ]
-      );
-     }
     );
   }
 
+  Widget _buildAQIDetailsCard(
+    BuildContext context,
+    String title,
+    List<String> lines, {
+    required Key key,
+  }) {
+    return Container(
+      key: key,
+      margin: EdgeInsets.fromLTRB(
+          12, 0, 12, MediaQuery.of(context).padding.bottom + 26),
+      padding: const EdgeInsets.all(20),
+      decoration: BoxDecoration(
+        border: Border.all(color: Theme.of(context).colorScheme.outlineVariant),
+        borderRadius: BorderRadius.circular(18),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(title,
+              style: TextStyle(
+                fontSize: 17,
+                fontWeight: FontWeight.w500,
+                color: Theme.of(context).colorScheme.onSurfaceVariant,
+              )),
+          const SizedBox(height: 10),
+          for (var line in lines)
+            Padding(
+              padding: const EdgeInsets.only(bottom: 6),
+              child: Text(
+                line,
+                style: TextStyle(
+                  fontSize: 16,
+                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
 
+  Widget buildPrecipExtended() {
+    return FutureBuilder<Map<String, dynamic>?>(
+        future: getWeatherWidgets(),
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.waiting) {
+            return const Center(child: CircularProgressIndicator());
+          } else if (snapshot.hasError) {
+            return Center(child: Text('Error: ${snapshot.error}'));
+          } else if (!snapshot.hasData || snapshot.data == null) {
+            return Center(child: Text('no_data_available'.tr()));
+          }
 
+          final data = snapshot.data!;
+          final weather = data['data'];
+
+          final hourly = weather['hourly'];
+          final daily = weather['daily'];
+          final List<dynamic> hourlyTime = hourly['time'];
+          final List<dynamic> precipProb = hourly['precipitation_probability'];
+          final List<double> precipAmount =
+              (hourly['precipitation'] as List<dynamic>)
+                  .map((e) => (e as num).toDouble())
+                  .toList();
+          final double precipHours = daily['precipitation_hours'][0];
+          final double todaysAMOUNT = daily['precipitation_sum'][0];
+
+          final offset = Duration(
+              seconds: int.parse(weather['utc_offset_seconds'].toString()));
+          final nowUtc = DateTime.now().toUtc();
+          final nowLocal = nowUtc.add(offset);
+
+          final timeUnit =
+              PreferencesHelper.getString("selectedTimeUnit") ?? '12 hr';
+
+          final precipitationUnit =
+              PreferencesHelper.getString("selectedPrecipitationUnit") ?? 'mm';
+
+          final convertedPrecip = precipitationUnit == 'cm'
+              ? UnitConverter.mmToCm(todaysAMOUNT)
+              : precipitationUnit == 'in'
+                  ? UnitConverter.mmToIn(todaysAMOUNT)
+                  : todaysAMOUNT;
+
+          final roundedNow = DateTime(
+              nowLocal.year, nowLocal.month, nowLocal.day, nowLocal.hour);
+
+          int startIndex = hourlyTime.indexWhere((timeStr) {
+            final forecastLocal = DateTime.parse(timeStr);
+            return !forecastLocal.isBefore(roundedNow);
+          });
+
+          if (startIndex == -1) startIndex = 0;
+
+          final double minprecipAmount =
+              precipAmount.reduce((a, b) => a < b ? a : b);
+          final double maxprecipAmount =
+              precipAmount.reduce((a, b) => a > b ? a : b);
+
+          return Column(children: [
+            Container(
+              height: 360,
+              decoration: BoxDecoration(
+                color: Theme.of(context).colorScheme.surfaceContainer,
+                borderRadius: BorderRadius.circular(18),
+              ),
+              padding: EdgeInsets.only(top: 12, bottom: 0),
+              margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
+              child: Column(
+                children: [
+                  Container(
+                    padding: EdgeInsets.fromLTRB(20, 10, 20, 0),
+                    alignment: Alignment.centerLeft,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text("today's_amount".tr(),
+                            style: TextStyle(
+                                fontSize: 20,
+                                color: Theme.of(context).colorScheme.onSurface,
+                                fontWeight: FontWeight.w500)),
+                        Row(
+                          crossAxisAlignment: CrossAxisAlignment.end,
+                          children: [
+                            Text(
+                              "${double.parse(convertedPrecip.toStringAsFixed(2))}",
+                              style: TextStyle(
+                                  fontSize: 50,
+                                  color:
+                                      Theme.of(context).colorScheme.secondary,
+                                  fontWeight: FontWeight.w500),
+                            ),
+                            Padding(
+                                padding: EdgeInsets.only(bottom: 11, left: 8),
+                                child: Text(
+                                  '${localizePrecipUnit(precipitationUnit, context.locale)} • ${precipHours.round()} ${'hrs_sub_text'.tr()}',
+                                  style: TextStyle(
+                                      fontSize: 20,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurfaceVariant,
+                                      fontWeight: FontWeight.w500),
+                                ))
+                          ],
+                        )
+                      ],
+                    ),
+                  ),
+                  SizedBox(
+                    height: 216,
+                    child: ListView.builder(
+                      scrollDirection: Axis.horizontal,
+                      physics: BouncingScrollPhysics(),
+                      itemCount: 24 + 24 - startIndex,
+                      itemBuilder: (context, index) {
+                        final dataIndex = startIndex + index;
+
+                        if (dataIndex >= hourlyTime.length)
+                          return const SizedBox();
+                        final forecastLocal =
+                            DateTime.parse(hourlyTime[dataIndex]);
+
+                        final roundedDisplayTime = DateTime(
+                          forecastLocal.year,
+                          forecastLocal.month,
+                          forecastLocal.day,
+                          forecastLocal.hour,
+                        );
+                        final hour = timeUnit == '24 hr'
+                            ? "${roundedDisplayTime.hour.toString().padLeft(2, '0')}:00"
+                            : UnitConverter.formatTo12Hour(roundedDisplayTime);
+
+                        final precipAmountMain = precipAmount[dataIndex];
+                        final precipProbMain = precipProb[dataIndex];
+
+                        final double rainValue = (precipAmountMain is num)
+                            ? precipAmountMain.toDouble()
+                            : 0;
+                        final double rainPercentage =
+                            ((rainValue - minprecipAmount) /
+                                    (maxprecipAmount - minprecipAmount)) *
+                                100;
+
+                        final convertedPrecipAmount = precipitationUnit == 'cm'
+                            ? UnitConverter.mmToCm(rainValue)
+                            : precipitationUnit == 'in'
+                                ? UnitConverter.mmToIn(rainValue)
+                                : rainValue;
+
+                        EdgeInsets itemMargin = EdgeInsets.only(
+                          left: index == 0 ? 10 : 0,
+                          right: index == 24 + 24 - startIndex - 1 ? 10 : 0,
+                        );
+
+                        return Container(
+                          width: 53,
+                          margin: itemMargin,
+                          decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.end,
+                            children: [
+                              Stack(
+                                  alignment: Alignment.bottomCenter,
+                                  clipBehavior: Clip.none,
+                                  children: [
+                                    Container(
+                                      width: 20,
+                                      height: 160,
+                                      decoration: BoxDecoration(
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .surface,
+                                        borderRadius: BorderRadius.circular(50),
+                                      ),
+                                    ),
+                                    Container(
+                                      clipBehavior: Clip.none,
+                                      width: 43,
+                                      height: math.max(
+                                          (rainPercentage / 100) * 160, 45),
+                                      decoration: BoxDecoration(
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .primary,
+                                        borderRadius: BorderRadius.circular(50),
+                                      ),
+                                      child: Align(
+                                        alignment: Alignment.topCenter,
+                                        child: SizedBox(
+                                          width: 60,
+                                          height: 60,
+                                          child: Stack(
+                                              alignment: Alignment.center,
+                                              children: [
+                                                Positioned(
+                                                    top: 3,
+                                                    child: CircleAvatar(
+                                                      child: Text(
+                                                        "$precipProbMain%",
+                                                        style: TextStyle(
+                                                            fontWeight:
+                                                                FontWeight.bold,
+                                                            fontSize: 13),
+                                                      ),
+                                                    )),
+                                              ]),
+                                        ),
+                                      ),
+                                    ),
+                                  ]),
+                              const SizedBox(height: 10),
+                              Text(
+                                  "${double.parse(convertedPrecipAmount.toStringAsFixed(2))}",
+                                  style: TextStyle(
+                                      fontSize: 14,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurfaceVariant,
+                                      fontWeight: FontWeight.w500)),
+                              Text(hour,
+                                  style: TextStyle(
+                                      fontSize: 15,
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .onSurface,
+                                      fontWeight: FontWeight.w500)),
+                            ],
+                          ),
+                        );
+                      },
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            Container(
+                margin: EdgeInsets.fromLTRB(
+                    12, 20, 12, MediaQuery.of(context).padding.bottom + 26),
+                padding: EdgeInsets.all(20),
+                decoration: BoxDecoration(
+                  border: Border.all(
+                    width: 1,
+                    color: Theme.of(context).colorScheme.outlineVariant,
+                  ),
+                  borderRadius: BorderRadius.circular(18),
+                ),
+                child: Column(
+                  spacing: 20,
+                  children: [
+                    Text("precip_info".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                    Text("precip_info_2".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                    Text("precip_info_3".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                    Text("precip_info_4".tr(),
+                        style: TextStyle(
+                            fontSize: 17,
+                            color:
+                                Theme.of(context).colorScheme.onSurfaceVariant,
+                            fontWeight: FontWeight.w500)),
+                  ],
+                ))
+          ]);
+        });
+  }
 }
 
-
-  Widget buildAirQualityBox(String label, double value, String type) {
-    return Container(
-      padding: EdgeInsets.all(12),
-      margin: EdgeInsets.symmetric(vertical: 6),
-      decoration: BoxDecoration(
-        color: getColor(value, type),
-        borderRadius: BorderRadius.circular(10),
-      ),
-      child: Text(
-        "$label: $value",
-        style: TextStyle(color: Colors.black, fontSize: 16),
-      ),
-    );
-  }
-
-
-
-
+Widget buildAirQualityBox(String label, double value, String type) {
+  return Container(
+    padding: EdgeInsets.all(12),
+    margin: EdgeInsets.symmetric(vertical: 6),
+    decoration: BoxDecoration(
+      color: getColor(value, type),
+      borderRadius: BorderRadius.circular(10),
+    ),
+    child: Text(
+      "$label: $value",
+      style: TextStyle(color: Colors.black, fontSize: 16),
+    ),
+  );
+}
 
 Color getColor(double value, String type) {
   switch (type) {
@@ -1967,39 +2305,38 @@ Color getColor(double value, String type) {
 }
 
 String getAQIIndexType(int aqiIndex, bool isEU) {
-  if(!isEU){
-  if(aqiIndex <= 50){
-    return "good".tr();
-  } else if (aqiIndex <= 100){
-    return "fair".tr();
-  } else if (aqiIndex <= 150){
-    return "moderate".tr();
-  } else if (aqiIndex <= 200){
-    return "poor".tr();
+  if (!isEU) {
+    if (aqiIndex <= 50) {
+      return "good".tr();
+    } else if (aqiIndex <= 100) {
+      return "fair".tr();
+    } else if (aqiIndex <= 150) {
+      return "moderate".tr();
+    } else if (aqiIndex <= 200) {
+      return "poor".tr();
+    } else {
+      return "very_poor".tr();
+    }
   } else {
-    return "very_poor".tr();
-  } 
-  } else{
-      if(aqiIndex <= 25){
-    return "good".tr();
-  } else if (aqiIndex <= 50){
-    return "fair".tr();
-  } else if (aqiIndex <= 75){
-    return "moderate".tr();
-  } else if (aqiIndex <= 100){
-    return "poor".tr();
-  } else {
-    return "very_poor".tr();
-  } 
+    if (aqiIndex <= 25) {
+      return "good".tr();
+    } else if (aqiIndex <= 50) {
+      return "fair".tr();
+    } else if (aqiIndex <= 75) {
+      return "moderate".tr();
+    } else if (aqiIndex <= 100) {
+      return "poor".tr();
+    } else {
+      return "very_poor".tr();
+    }
   }
 }
 // AQI WIDGET
 
-
 class AQISliderBar extends StatelessWidget {
   final double width;
   final double height;
-  final int aqi; 
+  final int aqi;
 
   const AQISliderBar({
     super.key,
@@ -2016,79 +2353,77 @@ class AQISliderBar extends StatelessWidget {
     return Positioned(
       left: 0,
       right: 0,
-       child:  Stack(
-          clipBehavior: Clip.none,
-          children: [
-            Container(
-              height: height,
-              margin: EdgeInsets.only(left: 10, right: 10),
-              decoration: const BoxDecoration(
-                borderRadius: BorderRadius.all(Radius.circular(999)),
-                gradient: LinearGradient(
-                  begin: Alignment.centerLeft,
-                  end: Alignment.centerRight,
-                  colors: [
-                    Color(0xFF00E400), // Green
-                    Color(0xFFFFFF00), // Yellow
-                    Color(0xFFFF7E00), // Orange
-                    Color(0xFFFF0000), // Red
-                    Color(0xFF8F3F97), // Purple
-                    Color(0xFF7E0023), // Maroon
-                  ],
-                  stops: [
-                    0.1,
-                    0.2,
-                    0.4,
-                    0.6,
-                    0.8,
-                    1.0,
-                  ],
-                ),
-              ),
-            ),
-
-            Positioned(
-              left: thumbPosition - 10, 
-              top: -5,
-              child: Column(
-                children: [
-                  Container(
-                    width: 16,
-                    height: 30,
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.inversePrimary,
-                      borderRadius: BorderRadius.circular(50),
-                      border: Border.all(color: Theme.of(context).colorScheme.primary),
-                    ),
-                  ),
+      child: Stack(
+        clipBehavior: Clip.none,
+        children: [
+          Container(
+            height: height,
+            margin: EdgeInsets.only(left: 10, right: 10),
+            decoration: const BoxDecoration(
+              borderRadius: BorderRadius.all(Radius.circular(999)),
+              gradient: LinearGradient(
+                begin: Alignment.centerLeft,
+                end: Alignment.centerRight,
+                colors: [
+                  Color(0xFF00E400), // Green
+                  Color(0xFFFFFF00), // Yellow
+                  Color(0xFFFF7E00), // Orange
+                  Color(0xFFFF0000), // Red
+                  Color(0xFF8F3F97), // Purple
+                  Color(0xFF7E0023), // Maroon
+                ],
+                stops: [
+                  0.1,
+                  0.2,
+                  0.4,
+                  0.6,
+                  0.8,
+                  1.0,
                 ],
               ),
             ),
-          ],
-        ),
+          ),
+          Positioned(
+            left: thumbPosition - 10,
+            top: -5,
+            child: Column(
+              children: [
+                Container(
+                  width: 16,
+                  height: 30,
+                  decoration: BoxDecoration(
+                    color: Theme.of(context).colorScheme.inversePrimary,
+                    borderRadius: BorderRadius.circular(50),
+                    border: Border.all(
+                        color: Theme.of(context).colorScheme.primary),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
       // ],
     );
   }
 }
 
 int getStartIndex(utc_offset_seconds, hourlyTime) {
-    final offset = Duration(seconds: int.parse(utc_offset_seconds));
-    final nowUtc = DateTime.now().toUtc();
-    final nowLocal = nowUtc.add(offset);
+  final offset = Duration(seconds: int.parse(utc_offset_seconds));
+  final nowUtc = DateTime.now().toUtc();
+  final nowLocal = nowUtc.add(offset);
 
-    final timeUnit = PreferencesHelper.getString("selectedTimeUnit") ?? '12 hr';
+  final timeUnit = PreferencesHelper.getString("selectedTimeUnit") ?? '12 hr';
 
+  final roundedNow =
+      DateTime(nowLocal.year, nowLocal.month, nowLocal.day, nowLocal.hour);
 
-    final roundedNow = DateTime(nowLocal.year, nowLocal.month, nowLocal.day, nowLocal.hour);
+  int startIndex = hourlyTime.indexWhere((timeStr) {
+    final forecastLocal = DateTime.parse(timeStr);
+    return !forecastLocal.isBefore(roundedNow);
+  });
 
-    int startIndex = hourlyTime.indexWhere((timeStr) {
-      final forecastLocal = DateTime.parse(timeStr); 
-      return !forecastLocal.isBefore(roundedNow);
-    });
+  if (startIndex == -1) startIndex = 0;
 
-    if (startIndex == -1) startIndex = 0;
-
-    return startIndex;
+  return startIndex;
 }
-
-
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index 33cbceb28..b02a01eac 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -254,17 +254,18 @@ class _WeatherHomeState extends State<WeatherHome> {
 
     if (!hasInternet) {
       _isAppFullyLoaded = true;
-    } else if (isHomeLocation && lastUpdated != null) {
+      SnackUtil.showSnackBar(
+          context: context, message: "network_unavailable".tr());
+    } else if (lastUpdated != null) {
       final lastUpdateTime = DateTime.tryParse(lastUpdated);
       final now = DateTime.now();
       if (lastUpdateTime != null &&
-          now.difference(lastUpdateTime).inMinutes < 450) {
+          now.difference(lastUpdateTime).inMinutes < 45) {
         _isAppFullyLoaded = true;
       } else {
         checkAndUpdateHomeLocation();
       }
     }
-
     return json.decode(cached);
   }
 
@@ -1300,6 +1301,10 @@ class _WeatherHomeState extends State<WeatherHome> {
                               );
                             },
                             onClosed: (result) async {
+                              PreferencesHelper.setBool(
+                                  "firstLoadedLocations", true);
+
+                              await Future.delayed(Duration(milliseconds: 300));
                               if (result != null) {
                                 if (result['viewLocaton'] == true) {
                                   final weatherService = WeatherService();
@@ -1314,7 +1319,6 @@ class _WeatherHomeState extends State<WeatherHome> {
                                     context: context,
                                     isOnlyView: true,
                                   );
-
                                   if (result == null) {
                                   } else {
                                     setState(() {
@@ -1428,3 +1432,30 @@ class _WeatherHomeState extends State<WeatherHome> {
         });
   }
 }
+
+// Workaround for flickering
+// OverlayEntry? _loaderOverlay;
+
+// void showLoader(BuildContext context) {
+//   if (_loaderOverlay != null) return;
+//   _loaderOverlay = OverlayEntry(
+//     builder: (context) => Positioned.fill(
+//       child: Container(
+//         color: Theme.of(context).colorScheme.surface,
+//         child: const Center(
+//           child: LoaderWidget(
+//             size: 60,
+//             isContained: false,
+//           ),
+//         ),
+//       ),
+//     ),
+//   );
+
+//   Overlay.of(context)?.insert(_loaderOverlay!);
+// }
+
+// void hideLoader() {
+//   _loaderOverlay?.remove();
+//   _loaderOverlay = null;
+// }
diff --git a/lib/screens/home_location.dart b/lib/screens/home_location.dart
index fe67fbd5d..3e654e2a4 100644
--- a/lib/screens/home_location.dart
+++ b/lib/screens/home_location.dart
@@ -7,7 +7,6 @@ import '../utils/geo_location.dart';
 import '../services/fetch_data.dart';
 import 'package:easy_localization/easy_localization.dart';
 import '../models/loading_me.dart';
-import 'package:geolocator/geolocator.dart';
 
 class HomeLocationScreen extends StatelessWidget {
   const HomeLocationScreen({super.key});
@@ -172,98 +171,59 @@ class HomeLocationScreen extends StatelessWidget {
                                   borderRadius: BorderRadius.circular(99.0),
                                 ),
                                 child: ListTile(
-                                  contentPadding:
-                                      EdgeInsets.only(left: 5, right: 20),
-                                  minTileHeight: 68,
-                                  splashColor: Colors.transparent,
-                                  leading: isSelected
-                                      ? Stack(
-                                          alignment: Alignment.center,
-                                          children: [
-                                            SvgPicture.string(buildSvg(
-                                                Theme.of(context)
-                                                    .colorScheme
-                                                    .primary)),
-                                            Icon(Icons.check,
-                                                color: Theme.of(context)
-                                                    .colorScheme
-                                                    .onPrimary),
-                                          ],
-                                        )
-                                      : Stack(
-                                          alignment: Alignment.center,
-                                          children: [
-                                            SvgPicture.string(buildSvg(
-                                                Theme.of(context)
-                                                    .colorScheme
-                                                    .tertiary)),
-                                            Icon(Icons.my_location,
-                                                color: Theme.of(context)
-                                                    .colorScheme
-                                                    .onTertiary),
-                                          ],
-                                        ),
-                                  title: Text(
-                                    "your_device_location".tr(),
-                                    style: TextStyle(
-                                      fontWeight: FontWeight.w500,
-                                      color: isSelected
-                                          ? Theme.of(context)
-                                              .colorScheme
-                                              .onPrimaryContainer
-                                          : null,
+                                    contentPadding:
+                                        EdgeInsets.only(left: 5, right: 20),
+                                    minTileHeight: 68,
+                                    splashColor: Colors.transparent,
+                                    leading: isSelected
+                                        ? Stack(
+                                            alignment: Alignment.center,
+                                            children: [
+                                              SvgPicture.string(buildSvg(
+                                                  Theme.of(context)
+                                                      .colorScheme
+                                                      .primary)),
+                                              Icon(Icons.check,
+                                                  color: Theme.of(context)
+                                                      .colorScheme
+                                                      .onPrimary),
+                                            ],
+                                          )
+                                        : Stack(
+                                            alignment: Alignment.center,
+                                            children: [
+                                              SvgPicture.string(buildSvg(
+                                                  Theme.of(context)
+                                                      .colorScheme
+                                                      .tertiary)),
+                                              Icon(Icons.my_location,
+                                                  color: Theme.of(context)
+                                                      .colorScheme
+                                                      .onTertiary),
+                                            ],
+                                          ),
+                                    title: Text(
+                                      "your_device_location".tr(),
+                                      style: TextStyle(
+                                        fontWeight: FontWeight.w500,
+                                        color: isSelected
+                                            ? Theme.of(context)
+                                                .colorScheme
+                                                .onPrimaryContainer
+                                            : null,
+                                      ),
                                     ),
-                                  ),
-                                  subtitle: isSelected
-                                      ? Text(
-                                          "${homeData['city']}, ${homeData['country']}")
-                                      : Text("current_location_tile_sub".tr()),
-                                  onTap: () async {
-                                    if (!isSelected) {
-                                      bool serviceEnabled;
-                                      LocationPermission permission;
-
-                                      serviceEnabled = await Geolocator
-                                          .isLocationServiceEnabled();
-                                      if (!serviceEnabled) {
-                                        ScaffoldMessenger.of(context)
-                                            .showSnackBar(
-                                          const SnackBar(
-                                              content: Text(
-                                                  'Location services are disabled. Please enable them.')),
-                                        );
-                                        return;
-                                      }
-
-                                      // Check location permission
-                                      permission =
-                                          await Geolocator.checkPermission();
-                                      if (permission ==
-                                          LocationPermission.denied) {
-                                        permission = await Geolocator
-                                            .requestPermission();
-                                        if (permission ==
-                                            LocationPermission.denied) {
-                                          ScaffoldMessenger.of(context)
-                                              .showSnackBar(
-                                            const SnackBar(
-                                                content: Text(
-                                                    'Location permission denied.')),
-                                          );
-                                          return;
-                                        }
-                                      }
-
-                                      if (permission ==
-                                          LocationPermission.deniedForever) {
-                                        ScaffoldMessenger.of(context)
-                                            .showSnackBar(
-                                          const SnackBar(
-                                              content: Text(
-                                                  'Location permission permanently denied. Please enable it in settings.')),
-                                        );
-                                        return;
-                                      }
+                                    subtitle: isSelected
+                                        ? Text(
+                                            "${homeData['city']}, ${homeData['country']}")
+                                        : Text(
+                                            "current_location_tile_sub".tr()),
+                                    onTap: () async {
+                                      bool ready =
+                                          await LocationPermissionHelper
+                                              .checkServicesAndPermission(
+                                                  context);
+                                      if (!ready) return;
                                       showDialog(
                                         context: context,
                                         barrierDismissible: false,
@@ -328,9 +288,7 @@ class HomeLocationScreen extends StatelessWidget {
                                                   'Error: ${e.toString()}')),
                                         );
                                       }
-                                    }
-                                  },
-                                ),
+                                    }),
                               ),
                             );
                           }
diff --git a/lib/screens/locations.dart b/lib/screens/locations.dart
index b20145179..d70039ed0 100644
--- a/lib/screens/locations.dart
+++ b/lib/screens/locations.dart
@@ -27,11 +27,17 @@ final GlobalKey<ScaffoldMessengerState> _scaffoldMessengerKey =
 class _LocationsScreenState extends State<LocationsScreen> {
   List<SavedLocation> savedLocations = [];
   bool _isFirstBuild = true;
+  final bool _isFirstTrueBuild =
+      PreferencesHelper.getBool("firstLoadedLocations") ?? true;
 
   @override
   void initState() {
     super.initState();
-    loadSavedLocations();
+
+    if (_isFirstTrueBuild) {
+      loadSavedLocations();
+      PreferencesHelper.setBool("firstLoadedLocations", false);
+    }
   }
 
   Future<void> loadSavedLocations() async {
@@ -199,8 +205,6 @@ class _LocationsScreenState extends State<LocationsScreen> {
               }
             },
           ),
-          floatingActionButtonLocation:
-              FloatingActionButtonLocation.centerFloat,
         ));
   }
 
diff --git a/lib/screens/searchlocations.dart b/lib/screens/searchlocations.dart
index 17dd7abd4..9fcab380b 100644
--- a/lib/screens/searchlocations.dart
+++ b/lib/screens/searchlocations.dart
@@ -239,7 +239,7 @@ class _SearchLocationsScreenState extends State<SearchLocationsScreen> {
     final colorTheme = Theme.of(context).colorScheme;
 
     return Scaffold(
-      backgroundColor: colorTheme.surfaceContainerHigh,
+      backgroundColor: colorTheme.surface,
       appBar: AppBar(
           elevation: 0,
           title: TextField(
@@ -258,7 +258,7 @@ class _SearchLocationsScreenState extends State<SearchLocationsScreen> {
           titleSpacing: 0,
           toolbarHeight: 65 + 10,
           scrolledUnderElevation: 0,
-          backgroundColor: colorTheme.surfaceContainerHigh,
+          backgroundColor: colorTheme.surface,
           shape: Border(
               bottom: BorderSide(
                   color: Theme.of(context).colorScheme.outline.withOpacity(0.8),
diff --git a/lib/services/fetch_data.dart b/lib/services/fetch_data.dart
index acd7207c9..7928cd6bc 100644
--- a/lib/services/fetch_data.dart
+++ b/lib/services/fetch_data.dart
@@ -17,140 +17,147 @@ class WeatherService {
     }
     return Hive.box(_boxName);
   }
-  
 
-
-  Future<Map<String, dynamic>?> fetchWeather(double lat, double lon, {String? locationName, BuildContext? context, bool isOnlyView = false, bool isBackground = false}) async {
+  Future<Map<String, dynamic>?> fetchWeather(double lat, double lon,
+      {String? locationName,
+      BuildContext? context,
+      bool isOnlyView = false,
+      bool isBackground = false}) async {
     final timezone = tzmap.latLngToTimezoneString(lat, lon);
     final key = locationName ?? 'loc_${lat}_${lon}';
     final box = await _openBox();
 
-    final selectedModel = PreferencesHelper.getString("selectedWeatherModel") ?? "best_match";
-    
-    final uri = Uri.parse('https://api.open-meteo.com/v1/forecast').replace(queryParameters: {
+    final selectedModel =
+        PreferencesHelper.getString("selectedWeatherModel") ?? "best_match";
+
+    final uri = Uri.parse('https://api.open-meteo.com/v1/forecast')
+        .replace(queryParameters: {
       'latitude': lat.toString(),
       'longitude': lon.toString(),
-      'current': 'temperature_2m,is_day,apparent_temperature,pressure_msl,relative_humidity_2m,precipitation,weather_code,cloud_cover,wind_speed_10m,wind_direction_10m,wind_gusts_10m',
-      'hourly': 'wind_speed_10m,wind_direction_10m,relative_humidity_2m,pressure_msl,cloud_cover,temperature_2m,dew_point_2m,apparent_temperature,precipitation_probability,precipitation,weather_code,visibility,uv_index',
-      'daily': 'weather_code,temperature_2m_max,temperature_2m_min,sunrise,sunset,daylight_duration,uv_index_max,precipitation_sum,precipitation_probability_max,precipitation_hours,wind_speed_10m_max,wind_gusts_10m_max',
+      'current':
+          'temperature_2m,is_day,apparent_temperature,pressure_msl,relative_humidity_2m,precipitation,weather_code,cloud_cover,wind_speed_10m,wind_direction_10m,wind_gusts_10m',
+      'hourly':
+          'wind_speed_10m,wind_direction_10m,relative_humidity_2m,pressure_msl,cloud_cover,temperature_2m,dew_point_2m,apparent_temperature,precipitation_probability,precipitation,weather_code,visibility,uv_index',
+      'daily':
+          'weather_code,temperature_2m_max,temperature_2m_min,sunrise,sunset,daylight_duration,uv_index_max,precipitation_sum,precipitation_probability_max,precipitation_hours,wind_speed_10m_max,wind_gusts_10m_max',
       'timezone': timezone,
       'forecast_days': '7',
       'models': selectedModel
     });
-    final airQualityUri = Uri.parse('https://air-quality-api.open-meteo.com/v1/air-quality').replace(queryParameters: {
-    'latitude': lat.toString(),
-    'longitude': lon.toString(),
-    'current': 'us_aqi,european_aqi,pm10,pm2_5,carbon_monoxide,nitrogen_dioxide,sulphur_dioxide,ozone,alder_pollen,birch_pollen,grass_pollen,mugwort_pollen,olive_pollen,ragweed_pollen',
-    'timezone': timezone,
-    'forecast_hours': '1',
-  });
+    final airQualityUri =
+        Uri.parse('https://air-quality-api.open-meteo.com/v1/air-quality')
+            .replace(queryParameters: {
+      'latitude': lat.toString(),
+      'longitude': lon.toString(),
+      'current':
+          'us_aqi,european_aqi,pm10,pm2_5,carbon_monoxide,nitrogen_dioxide,sulphur_dioxide,ozone,alder_pollen,birch_pollen,grass_pollen,mugwort_pollen,olive_pollen,ragweed_pollen',
+      'timezone': timezone,
+      'forecast_hours': '1',
+    });
 
+    // Prepare list of HTTP requests (always include weather and air quality)
+    final requests = <Future<http.Response>>[
+      http.get(uri),
+      http.get(airQualityUri),
+    ];
 
-  // Prepare list of HTTP requests (always include weather and air quality)
-  final requests = <Future<http.Response>>[
-    http.get(uri),
-    http.get(airQualityUri),
-  ];
+    final responses = await Future.wait(requests);
 
-  final responses = await Future.wait(requests);
-  
+    // Parse responses
+    final weatherData = json.decode(responses[0].body) as Map<String, dynamic>;
+    final airQualityData =
+        json.decode(responses[1].body) as Map<String, dynamic>;
 
-  // Parse responses
-  final weatherData = json.decode(responses[0].body) as Map<String, dynamic>;
-  final airQualityData = json.decode(responses[1].body) as Map<String, dynamic>;
+    // Check if we need fallback data for missing fields
+    Map<String, dynamic> finalWeatherData = weatherData;
+    if (selectedModel != "best_match" && _hasIncompleteData(weatherData)) {
+      finalWeatherData = await _fetchWithFallback(
+          lat, lon, timezone, weatherData, selectedModel);
+    }
 
+    finalWeatherData['current'] = sanitizeCurrent(finalWeatherData['current']);
+    finalWeatherData['hourly'] = sanitizeHourly(finalWeatherData['hourly']);
+    finalWeatherData['daily'] = sanitizeDaily(finalWeatherData['daily']);
 
-  // Check if we need fallback data for missing fields
-  Map<String, dynamic> finalWeatherData = weatherData;
-  if (selectedModel != "best_match" && _hasIncompleteData(weatherData)) {
-    finalWeatherData = await _fetchWithFallback(lat, lon, timezone, weatherData, selectedModel);
-  }
+    if (finalWeatherData['error'] == true || airQualityData['error'] == true) {
+      final reason = finalWeatherData['reason'] ??
+          airQualityData['reason'] ??
+          'Unknown error';
 
-  finalWeatherData['current'] = sanitizeCurrent(finalWeatherData['current']);
-  finalWeatherData['hourly'] = sanitizeHourly(finalWeatherData['hourly']);
-  finalWeatherData['daily'] = sanitizeDaily(finalWeatherData['daily']);
-
-   if (finalWeatherData['error'] == true || airQualityData['error'] == true) {
-    final reason = finalWeatherData['reason'] ?? airQualityData['reason'] ?? 'Unknown error';
-    
-    if (context != null) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          duration: Duration(seconds: 10),
-          content: Text("$reason. Please change your model"),
-          
-          action: SnackBarAction(
-            label: 'Change model',
-            onPressed: () {
-              Navigator.of(context).push(
+      if (context != null) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            duration: Duration(seconds: 10),
+            content: Text("$reason. Please change your model"),
+            action: SnackBarAction(
+              label: 'Change model',
+              onPressed: () {
+                Navigator.of(context).push(
                   MaterialPageRoute(builder: (_) => const MeteoModelsPage()),
                 );
-            },
+              },
+            ),
           ),
-        ),
-      );
+        );
+      }
+
+      return null;
     }
 
-
-    return null; 
-  }
-
-
-  final combinedDataForView = {
-    ...finalWeatherData,
-    'air_quality': airQualityData,
-  };
-
-  final nowForView = DateTime.now().toIso8601String();
-
- if (isOnlyView) {
-    log("Only viewing data for $key. Not saving to cache.");
-    return {
-      'data': combinedDataForView,
-      'last_updated': nowForView,
-      'from_cache': false,
+    final combinedDataForView = {
+      ...finalWeatherData,
+      'air_quality': airQualityData,
     };
-  }
 
-  final existingJson = box.get(key);
-  if (existingJson != null) {
-    final cachedMap = json.decode(existingJson);
-    final cachedData = cachedMap['data'];
-    final lastUpdated = cachedMap['last_updated'];
+    final nowForView = DateTime.now().toIso8601String();
 
-    if (json.encode(cachedData['current']) == json.encode(finalWeatherData['current']) &&
-        json.encode(cachedData['air_quality'] ?? {}) == json.encode(airQualityData)) {
-      log("Hive: No update needed for $key");
+    if (isOnlyView) {
+      log("Only viewing data for $key. Not saving to cache.");
       return {
-        'data': cachedData,
-        'last_updated': lastUpdated,
-        'from_cache': true,
+        'data': combinedDataForView,
+        'last_updated': nowForView,
+        'from_cache': false,
       };
     }
-  }
 
+    final existingJson = box.get(key);
+    if (existingJson != null) {
+      final cachedMap = json.decode(existingJson);
+      final cachedData = cachedMap['data'];
+      final lastUpdated = cachedMap['last_updated'];
 
+      if (json.encode(cachedData['current']) ==
+              json.encode(finalWeatherData['current']) &&
+          json.encode(cachedData['air_quality'] ?? {}) ==
+              json.encode(airQualityData)) {
+        log("Hive: No update needed for $key");
+        return {
+          'data': cachedData,
+          'last_updated': lastUpdated,
+          'from_cache': true,
+        };
+      }
+    }
 
+    final now = DateTime.now().toIso8601String();
+    final combinedData = {
+      ...finalWeatherData,
+      'air_quality': airQualityData,
+    };
 
-  final now = DateTime.now().toIso8601String();
-  final combinedData = {
-    ...finalWeatherData,
-    'air_quality': airQualityData,
-  };
+    final wrappedData = {
+      'data': combinedData,
+      'last_updated': now,
+    };
 
-  final wrappedData = {
-    'data': combinedData,
-    'last_updated': now,
-  };
+    await box.put(key, json.encode(wrappedData));
+    log("Hive: Updated cache for $key at $now");
 
-  await box.put(key, json.encode(wrappedData));
-  log("Hive: Updated cache for $key at $now");
-
-  return {
-    'data': combinedData,
-    'last_updated': now,
-    'from_cache': false,
-  };
+    return {
+      'data': combinedData,
+      'last_updated': now,
+      'from_cache': false,
+    };
   }
 
   /// Check if weather data has missing or incomplete fields
@@ -158,14 +165,22 @@ class WeatherService {
     // Check current data completeness
     final current = weatherData['current'] as Map<String, dynamic>?;
     if (current == null) return true;
-    
+
     // All fields requested in the API call that should be available
     final allCurrentFields = [
-      'temperature_2m', 'is_day', 'apparent_temperature', 'pressure_msl', 
-      'relative_humidity_2m', 'precipitation', 'weather_code', 'cloud_cover', 
-      'wind_speed_10m', 'wind_direction_10m', 'wind_gusts_10m'
+      'temperature_2m',
+      'is_day',
+      'apparent_temperature',
+      'pressure_msl',
+      'relative_humidity_2m',
+      'precipitation',
+      'weather_code',
+      'cloud_cover',
+      'wind_speed_10m',
+      'wind_direction_10m',
+      'wind_gusts_10m'
     ];
-    
+
     // Check for missing current fields
     int missingCurrentFields = 0;
     for (final field in allCurrentFields) {
@@ -173,17 +188,27 @@ class WeatherService {
         missingCurrentFields++;
       }
     }
-    
+
     // Check hourly data completeness
     final hourly = weatherData['hourly'] as Map<String, dynamic>?;
     if (hourly == null) return true;
-    
+
     final allHourlyFields = [
-      'wind_speed_10m', 'wind_direction_10m', 'relative_humidity_2m', 'pressure_msl', 
-      'cloud_cover', 'temperature_2m', 'dew_point_2m', 'apparent_temperature', 
-      'precipitation_probability', 'precipitation', 'weather_code', 'visibility', 'uv_index'
+      'wind_speed_10m',
+      'wind_direction_10m',
+      'relative_humidity_2m',
+      'pressure_msl',
+      'cloud_cover',
+      'temperature_2m',
+      'dew_point_2m',
+      'apparent_temperature',
+      'precipitation_probability',
+      'precipitation',
+      'weather_code',
+      'visibility',
+      'uv_index'
     ];
-    
+
     // Check for missing hourly fields
     int missingHourlyFields = 0;
     for (final field in allHourlyFields) {
@@ -192,17 +217,26 @@ class WeatherService {
         missingHourlyFields++;
       }
     }
-    
+
     // Check daily data completeness
     final daily = weatherData['daily'] as Map<String, dynamic>?;
     if (daily == null) return true;
-    
+
     final allDailyFields = [
-      'weather_code', 'temperature_2m_max', 'temperature_2m_min', 'sunrise', 'sunset', 
-      'daylight_duration', 'uv_index_max', 'precipitation_sum', 'precipitation_probability_max', 
-      'precipitation_hours', 'wind_speed_10m_max', 'wind_gusts_10m_max'
+      'weather_code',
+      'temperature_2m_max',
+      'temperature_2m_min',
+      'sunrise',
+      'sunset',
+      'daylight_duration',
+      'uv_index_max',
+      'precipitation_sum',
+      'precipitation_probability_max',
+      'precipitation_hours',
+      'wind_speed_10m_max',
+      'wind_gusts_10m_max'
     ];
-    
+
     // Check for missing daily fields
     int missingDailyFields = 0;
     for (final field in allDailyFields) {
@@ -211,35 +245,40 @@ class WeatherService {
         missingDailyFields++;
       }
     }
-    
+
     // Trigger fallback if any fields are missing
-    final totalMissing = missingCurrentFields + missingHourlyFields + missingDailyFields;
+    final totalMissing =
+        missingCurrentFields + missingHourlyFields + missingDailyFields;
     return totalMissing > 0;
   }
 
   /// Fetch weather data with fallback to best_match for missing fields
   Future<Map<String, dynamic>> _fetchWithFallback(
-    double lat, 
-    double lon, 
-    String timezone, 
-    Map<String, dynamic> primaryData, 
-    String selectedModel
-  ) async {
+      double lat,
+      double lon,
+      String timezone,
+      Map<String, dynamic> primaryData,
+      String selectedModel) async {
     try {
       // Fetch fallback data using best_match
-      final fallbackUri = Uri.parse('https://api.open-meteo.com/v1/forecast').replace(queryParameters: {
+      final fallbackUri = Uri.parse('https://api.open-meteo.com/v1/forecast')
+          .replace(queryParameters: {
         'latitude': lat.toString(),
         'longitude': lon.toString(),
-        'current': 'temperature_2m,is_day,apparent_temperature,pressure_msl,relative_humidity_2m,precipitation,weather_code,cloud_cover,wind_speed_10m,wind_direction_10m,wind_gusts_10m',
-        'hourly': 'wind_speed_10m,wind_direction_10m,relative_humidity_2m,pressure_msl,cloud_cover,temperature_2m,dew_point_2m,apparent_temperature,precipitation_probability,precipitation,weather_code,visibility,uv_index',
-        'daily': 'weather_code,temperature_2m_max,temperature_2m_min,sunrise,sunset,daylight_duration,uv_index_max,precipitation_sum,precipitation_probability_max,precipitation_hours,wind_speed_10m_max,wind_gusts_10m_max',
+        'current':
+            'temperature_2m,is_day,apparent_temperature,pressure_msl,relative_humidity_2m,precipitation,weather_code,cloud_cover,wind_speed_10m,wind_direction_10m,wind_gusts_10m',
+        'hourly':
+            'wind_speed_10m,wind_direction_10m,relative_humidity_2m,pressure_msl,cloud_cover,temperature_2m,dew_point_2m,apparent_temperature,precipitation_probability,precipitation,weather_code,visibility,uv_index',
+        'daily':
+            'weather_code,temperature_2m_max,temperature_2m_min,sunrise,sunset,daylight_duration,uv_index_max,precipitation_sum,precipitation_probability_max,precipitation_hours,wind_speed_10m_max,wind_gusts_10m_max',
         'timezone': timezone,
         'forecast_days': '7',
         'models': 'best_match'
       });
 
       final fallbackResponse = await http.get(fallbackUri);
-      final fallbackData = json.decode(fallbackResponse.body) as Map<String, dynamic>;
+      final fallbackData =
+          json.decode(fallbackResponse.body) as Map<String, dynamic>;
 
       if (fallbackData['error'] == true) {
         return primaryData;
@@ -254,50 +293,41 @@ class WeatherService {
 
   /// Merge primary weather data with fallback data, prioritizing primary data
   Map<String, dynamic> _mergeWeatherData(
-    Map<String, dynamic> primary, 
-    Map<String, dynamic> fallback
-  ) {
+      Map<String, dynamic> primary, Map<String, dynamic> fallback) {
     final merged = Map<String, dynamic>.from(primary);
-    
+
     // Merge current data
     merged['current'] = _mergeSection(
-      primary['current'] as Map<String, dynamic>?, 
-      fallback['current'] as Map<String, dynamic>?
-    );
-    
+        primary['current'] as Map<String, dynamic>?,
+        fallback['current'] as Map<String, dynamic>?);
+
     // Merge hourly data
-    merged['hourly'] = _mergeSection(
-      primary['hourly'] as Map<String, dynamic>?, 
-      fallback['hourly'] as Map<String, dynamic>?
-    );
-    
+    merged['hourly'] = _mergeSection(primary['hourly'] as Map<String, dynamic>?,
+        fallback['hourly'] as Map<String, dynamic>?);
+
     // Merge daily data
-    merged['daily'] = _mergeSection(
-      primary['daily'] as Map<String, dynamic>?, 
-      fallback['daily'] as Map<String, dynamic>?
-    );
-    
+    merged['daily'] = _mergeSection(primary['daily'] as Map<String, dynamic>?,
+        fallback['daily'] as Map<String, dynamic>?);
+
     // Keep other fields from primary, fallback if missing
     for (final key in fallback.keys) {
       if (!merged.containsKey(key) || merged[key] == null) {
         merged[key] = fallback[key];
       }
     }
-    
+
     return merged;
   }
 
   /// Merge a specific section (current/hourly/daily) with fallback data
   Map<String, dynamic> _mergeSection(
-    Map<String, dynamic>? primary, 
-    Map<String, dynamic>? fallback
-  ) {
+      Map<String, dynamic>? primary, Map<String, dynamic>? fallback) {
     if (primary == null && fallback == null) return {};
     if (primary == null) return Map<String, dynamic>.from(fallback!);
     if (fallback == null) return Map<String, dynamic>.from(primary);
-    
+
     final merged = Map<String, dynamic>.from(primary);
-    
+
     for (final key in fallback.keys) {
       if (!merged.containsKey(key) || merged[key] == null) {
         merged[key] = fallback[key];
@@ -305,51 +335,52 @@ class WeatherService {
         // For array fields, merge element by element, filling null values from fallback
         final primaryList = merged[key] as List;
         final fallbackList = fallback[key] as List;
-        
+
         // Create a new list with the same length as primary, filling nulls from fallback
         final mergedList = <dynamic>[];
-        final maxLength = primaryList.length > fallbackList.length ? primaryList.length : fallbackList.length;
-        
+        final maxLength = primaryList.length > fallbackList.length
+            ? primaryList.length
+            : fallbackList.length;
+
         for (int i = 0; i < maxLength; i++) {
           final primaryValue = i < primaryList.length ? primaryList[i] : null;
-          final fallbackValue = i < fallbackList.length ? fallbackList[i] : null;
-          
+          final fallbackValue =
+              i < fallbackList.length ? fallbackList[i] : null;
+
           // Use primary value if not null, otherwise use fallback
           mergedList.add(primaryValue ?? fallbackValue);
         }
-        
+
         merged[key] = mergedList;
       }
     }
-    
+
     return merged;
   }
 
-T nullSafeValue<T extends num>(dynamic value) {
-  if (value == null) {
-    if (T == int) return 0000 as T;
-    if (T == double) return 0.0000001 as T;
-    return 0 as T;
+  T nullSafeValue<T extends num>(dynamic value) {
+    if (value == null) {
+      if (T == int) return 0000 as T;
+      if (T == double) return 0.0000001 as T;
+      return 0 as T;
+    }
+
+    if (value is T) return value;
+
+    if (value is num) {
+      if (T == int) return value.toInt() as T;
+      if (T == double) return value.toDouble() as T;
+    }
+
+    return T == int ? 0 as T : 0.0000001 as T;
   }
 
-  if (value is T) return value;
-
-  if (value is num) {
-    if (T == int) return value.toInt() as T;
-    if (T == double) return value.toDouble() as T;
-  }
-
-  return T == int ? 0 as T : 0.0000001 as T;
-}
-
-
-
-
   Map<String, dynamic> sanitizeCurrent(Map? current) {
     current ??= {};
     return {
       'temperature_2m': nullSafeValue<double>(current['temperature_2m']),
-      'apparent_temperature': nullSafeValue<double>(current['apparent_temperature']),
+      'apparent_temperature':
+          nullSafeValue<double>(current['apparent_temperature']),
       'pressure_msl': nullSafeValue<double>(current['pressure_msl']),
       'relative_humidity_2m': nullSafeValue(current['relative_humidity_2m']),
       'precipitation': nullSafeValue<double>(current['precipitation']),
@@ -366,19 +397,59 @@ T nullSafeValue<T extends num>(dynamic value) {
     hourly ??= {};
     return {
       'time': (hourly['time'] as List?) ?? [],
-      'wind_speed_10m': (hourly['wind_speed_10m'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
-      'wind_direction_10m': (hourly['wind_direction_10m'] as List?)?.map((v) => nullSafeValue<int>(v)).toList() ?? [],
-      'relative_humidity_2m': (hourly['relative_humidity_2m'] as List?)?.map((v) => nullSafeValue<int>(v)).toList() ?? [],
-      'pressure_msl': (hourly['pressure_msl'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
-      'cloud_cover': (hourly['cloud_cover'] as List?)?.map((v) => nullSafeValue<int>(v)).toList() ?? [],
-      'temperature_2m': (hourly['temperature_2m'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
-      'dew_point_2m': (hourly['dew_point_2m'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
-      'apparent_temperature': (hourly['apparent_temperature'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
-      'precipitation_probability': (hourly['precipitation_probability'] as List?)?.map((v) => nullSafeValue<int>(v)).toList() ?? [],
-      'precipitation': (hourly['precipitation'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
-      'weather_code': (hourly['weather_code'] as List?)?.map((v) => nullSafeValue<int>(v)).toList() ?? [],
-      'visibility': (hourly['visibility'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
-      'uv_index': (hourly['uv_index'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
+      'wind_speed_10m': (hourly['wind_speed_10m'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
+      'wind_direction_10m': (hourly['wind_direction_10m'] as List?)
+              ?.map((v) => nullSafeValue<int>(v))
+              .toList() ??
+          [],
+      'relative_humidity_2m': (hourly['relative_humidity_2m'] as List?)
+              ?.map((v) => nullSafeValue<int>(v))
+              .toList() ??
+          [],
+      'pressure_msl': (hourly['pressure_msl'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
+      'cloud_cover': (hourly['cloud_cover'] as List?)
+              ?.map((v) => nullSafeValue<int>(v))
+              .toList() ??
+          [],
+      'temperature_2m': (hourly['temperature_2m'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
+      'dew_point_2m': (hourly['dew_point_2m'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
+      'apparent_temperature': (hourly['apparent_temperature'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
+      'precipitation_probability':
+          (hourly['precipitation_probability'] as List?)
+                  ?.map((v) => nullSafeValue<int>(v))
+                  .toList() ??
+              [],
+      'precipitation': (hourly['precipitation'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
+      'weather_code': (hourly['weather_code'] as List?)
+              ?.map((v) => nullSafeValue<int>(v))
+              .toList() ??
+          [],
+      'visibility': (hourly['visibility'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
+      'uv_index': (hourly['uv_index'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
     };
   }
 
@@ -386,18 +457,49 @@ T nullSafeValue<T extends num>(dynamic value) {
     daily ??= {};
     return {
       'time': (daily['time'] as List?) ?? [],
-      'weather_code': (daily['weather_code'] as List?)?.map((v) => nullSafeValue<int>(v)).toList() ?? [],
-      'temperature_2m_max': (daily['temperature_2m_max'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
-      'temperature_2m_min': (daily['temperature_2m_min'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
+      'weather_code': (daily['weather_code'] as List?)
+              ?.map((v) => nullSafeValue<int>(v))
+              .toList() ??
+          [],
+      'temperature_2m_max': (daily['temperature_2m_max'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
+      'temperature_2m_min': (daily['temperature_2m_min'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
       'sunrise': (daily['sunrise'] as List?) ?? [],
       'sunset': (daily['sunset'] as List?) ?? [],
-      'daylight_duration': (daily['daylight_duration'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
-      'uv_index_max': (daily['uv_index_max'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
-      'precipitation_sum': (daily['precipitation_sum'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
-      'precipitation_probability_max': (daily['precipitation_probability_max'] as List?)?.map((v) => nullSafeValue<int>(v)).toList() ?? [],
-      'precipitation_hours': (daily['precipitation_hours'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
-      'wind_speed_10m_max': (daily['wind_speed_10m_max'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
-      'wind_gusts_10m_max': (daily['wind_gusts_10m_max'] as List?)?.map((v) => nullSafeValue<double>(v)).toList() ?? [],
+      'daylight_duration': (daily['daylight_duration'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
+      'uv_index_max': (daily['uv_index_max'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
+      'precipitation_sum': (daily['precipitation_sum'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
+      'precipitation_probability_max':
+          (daily['precipitation_probability_max'] as List?)
+                  ?.map((v) => nullSafeValue<int>(v))
+                  .toList() ??
+              [],
+      'precipitation_hours': (daily['precipitation_hours'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
+      'wind_speed_10m_max': (daily['wind_speed_10m_max'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
+      'wind_gusts_10m_max': (daily['wind_gusts_10m_max'] as List?)
+              ?.map((v) => nullSafeValue<double>(v))
+              .toList() ??
+          [],
     };
   }
-}
\ No newline at end of file
+}
diff --git a/lib/utils/geo_location.dart b/lib/utils/geo_location.dart
index ee4e4e178..838b12f63 100644
--- a/lib/utils/geo_location.dart
+++ b/lib/utils/geo_location.dart
@@ -12,34 +12,6 @@ class Position {
   });
 }
 
-class LocationServiceDisabledException implements Exception {
-  final String message;
-  LocationServiceDisabledException(
-      [this.message = "Location services are disabled."]);
-
-  @override
-  String toString() => "LocationServiceDisabledException: $message";
-}
-
-class LocationPermissionDeniedException implements Exception {
-  final String message;
-  LocationPermissionDeniedException(
-      [this.message = "Location permission denied."]);
-
-  @override
-  String toString() => "LocationPermissionDeniedException: $message";
-}
-
-class LocationPermissionPermanentlyDeniedException implements Exception {
-  final String message;
-  LocationPermissionPermanentlyDeniedException(
-      [this.message =
-          "Location permission permanently denied. Open settings to enable."]);
-
-  @override
-  String toString() => "LocationPermissionPermanentlyDeniedException: $message";
-}
-
 class NativeLocation {
   static const platform = MethodChannel('native_location');
 
diff --git a/lib/utils/open_links.dart b/lib/utils/open_links.dart
index 4d32b3216..d292c624d 100644
--- a/lib/utils/open_links.dart
+++ b/lib/utils/open_links.dart
@@ -2,9 +2,9 @@ import 'package:url_launcher/url_launcher.dart';
 import 'dart:async';
 
 Future<void> openLink(String urlString) async {
-    final Uri url = Uri.parse(urlString);
+  final Uri url = Uri.parse(urlString);
 
-    if (!await launchUrl(url, mode: LaunchMode.externalApplication)) {
-      throw Exception('Could not launch $url');
-    }
-  }
\ No newline at end of file
+  if (!await launchUrl(url, mode: LaunchMode.externalApplication)) {
+    throw Exception('Could not launch $url');
+  }
+}
diff --git a/lib/widget_background.dart b/lib/widget_background.dart
index 34782f793..52c2fc9d3 100644
--- a/lib/widget_background.dart
+++ b/lib/widget_background.dart
@@ -219,6 +219,9 @@ Future<void> updateHomeWidget(weather, {bool updatedFromHome = false}) async {
     await HomeWidget.updateWidget(
         name: 'WeatherWidgetCastProvider', iOSName: null);
     await HomeWidget.updateWidget(name: 'PillWidgetProvider', iOSName: null);
+    await HomeWidget.updateWidget(name: 'GlanceWidgetProvider', iOSName: null);
+    await HomeWidget.updateWidget(
+        name: 'DateCurrentWidgetProvider', iOSName: null);
 
     print('[WidgetUpdate] Called updateWidget');
   } catch (e, stack) {
diff --git a/lib/widgets/pollen_card.dart b/lib/widgets/pollen_card.dart
index 384209de6..760b7c197 100644
--- a/lib/widgets/pollen_card.dart
+++ b/lib/widgets/pollen_card.dart
@@ -87,7 +87,7 @@ class PollenCard extends StatelessWidget {
     return Container(
       decoration: BoxDecoration(
         color: Color(selectedContainerBgIndex),
-        borderRadius: BorderRadius.circular(28),
+        borderRadius: BorderRadius.circular(18),
       ),
       padding: EdgeInsets.only(top: 12, bottom: 12),
       margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
diff --git a/lib/widgets/top_summary_block.dart b/lib/widgets/top_summary_block.dart
index 415bf09c9..968ff6d53 100644
--- a/lib/widgets/top_summary_block.dart
+++ b/lib/widgets/top_summary_block.dart
@@ -7,7 +7,6 @@ import 'package:provider/provider.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 import '../helper/locale_helper.dart';
 
-
 class SummaryCard extends StatefulWidget {
   final int selectedContainerBgIndex;
   final Map<String, dynamic> hourlyData;
@@ -16,282 +15,270 @@ class SummaryCard extends StatefulWidget {
   final Map<String, dynamic> airQualityData;
   final String utcOffsetSeconds;
 
-
-  const SummaryCard({super.key, 
-  required this.selectedContainerBgIndex,
-  required this.hourlyData,
-  required this.dailyData,
-  required this.currentData,
-  required this.airQualityData,
-  required this.utcOffsetSeconds
-  });
-
+  const SummaryCard(
+      {super.key,
+      required this.selectedContainerBgIndex,
+      required this.hourlyData,
+      required this.dailyData,
+      required this.currentData,
+      required this.airQualityData,
+      required this.utcOffsetSeconds});
 
   @override
   State<SummaryCard> createState() => _SummaryCardState();
 }
 
-
 class _SummaryCardState extends State<SummaryCard> {
-
-
-
   String? _headline;
   List<String>? _bullets;
   String? _readableDayLengthTime;
 
   bool isSummaryLoaded = false;
 
-@override
-void initState() {
-  super.initState();
- isSummaryLoaded = false;
-}
+  @override
+  void initState() {
+    super.initState();
+    isSummaryLoaded = false;
+  }
 
   Map<String, dynamic> findPeakUv(Map<String, dynamic> hourly) {
-  final times = hourly['time'] as List<dynamic>;
-  final uvs = hourly['uv_index'] as List<dynamic>;
-  int peakIndex = 0;
-  double peakValue = 0;
+    final times = hourly['time'] as List<dynamic>;
+    final uvs = hourly['uv_index'] as List<dynamic>;
+    int peakIndex = 0;
+    double peakValue = 0;
 
-  for (int i = 0; i < times.length; i++) {
-    final hour = DateTime.parse(times[i]).hour;
-    if (hour >= 9 && hour <= 15) {
-      final uv = uvs[i]?.toDouble() ?? 0;
-      if (uv > peakValue) {
-        peakValue = uv;
-        peakIndex = i;
+    for (int i = 0; i < times.length; i++) {
+      final hour = DateTime.parse(times[i]).hour;
+      if (hour >= 9 && hour <= 15) {
+        final uv = uvs[i]?.toDouble() ?? 0;
+        if (uv > peakValue) {
+          peakValue = uv;
+          peakIndex = i;
+        }
       }
     }
+
+    return {
+      'value': peakValue,
+      'time': times[peakIndex],
+    };
   }
 
-  return {
-    'value': peakValue,
-    'time': times[peakIndex],
-  };
-}
+  bool isStormy(int code) => [95, 96, 99].contains(code);
+  bool isRainy(int code) => [61, 63, 65, 80, 81, 82].contains(code);
+  bool isCloudy(double cloud) => cloud > 70;
+  bool isClear(double cloud) => cloud < 30;
 
-bool isStormy(int code) => [95, 96, 99].contains(code);
-bool isRainy(int code) => [61, 63, 65, 80, 81, 82].contains(code);
-bool isCloudy(double cloud) => cloud > 70;
-bool isClear(double cloud) => cloud < 30;
+  Map<String, dynamic> getEveningHumidityAndDew(Map<String, dynamic> hourly) {
+    final times = (hourly['time'] as List<dynamic>).take(24).toList();
+    final humidity =
+        (hourly['relative_humidity_2m'] as List<dynamic>).take(24).toList();
+    final dew = (hourly['dew_point_2m'] as List<dynamic>).take(24).toList();
 
-Map<String, dynamic> getEveningHumidityAndDew(Map<String, dynamic> hourly) {
-  final times = (hourly['time'] as List<dynamic>).take(24).toList();
-  final humidity = (hourly['relative_humidity_2m'] as List<dynamic>).take(24).toList();
-  final dew = (hourly['dew_point_2m'] as List<dynamic>).take(24).toList();
-
-
-  for (int i = times.length - 1; i >= 0; i--) {
-    final hour = DateTime.parse(times[i]).hour;
-    if (hour >= 18) {
-      return {
-        'humidity': humidity[i]?.toDouble() ?? 0,
-        'dewPoint': dew[i]?.toDouble() ?? 0,
-        'time': times[i],
-      };
+    for (int i = times.length - 1; i >= 0; i--) {
+      final hour = DateTime.parse(times[i]).hour;
+      if (hour >= 18) {
+        return {
+          'humidity': humidity[i]?.toDouble() ?? 0,
+          'dewPoint': dew[i]?.toDouble() ?? 0,
+          'time': times[i],
+        };
+      }
     }
+
+    return {
+      'humidity': humidity.last?.toDouble() ?? 0,
+      'dewPoint': dew.last?.toDouble() ?? 0,
+      'time': times.last,
+    };
   }
 
-  return {
-    'humidity': humidity.last?.toDouble() ?? 0,
-    'dewPoint': dew.last?.toDouble() ?? 0,
-    'time': times.last,
-  };
-}
+  String generateHeadline(double temp, double uv, double wind, double humidity,
+      double cloudCover, int weatherCode, TimeOfDayPeriod period,
+      {int? airQuality}) {
+    List<String> options;
 
-
-
-
-String generateHeadline(
-  double temp,
-  double uv,
-  double wind,
-  double humidity,
-  double cloudCover,
-  int weatherCode,
-  TimeOfDayPeriod period,
-  {int? airQuality}
-) {
-  List<String> options;
-
-  if (isStormy(weatherCode)) {
-    options = [
-      "summary_headlines_1".tr(),
-      "summary_headlines_2".tr(),
-      "summary_headlines_3".tr(),
-    ];
-  } else if (isRainy(weatherCode)) {
-    options = [
-      "summary_headlines_4".tr(),
-      "summary_headlines_5".tr(),
-      "summary_headlines_6".tr(),
-    ];
-  } else if (isCloudy(cloudCover)) {
-    // Adjust cloudy phrases by time of day:
-    switch (period) {
-      case TimeOfDayPeriod.morning:
-        options = [
-          "summary_headlines_9".tr(),  
-          "summary_headlines_8".tr(),
-          "summary_headlines_7".tr(),
-        ];
-        break;
-      case TimeOfDayPeriod.afternoon:
-        options = [
-          "summary_headlines_28".tr(),
-          "summary_headlines_29".tr(),
-          "summary_headlines_30".tr(),
-        ];
-        break;
-      case TimeOfDayPeriod.evening:
-        options = [
-          "summary_headlines_31".tr(),
-          "summary_headlines_32".tr(),
-          "summary_headlines_33".tr(),
-        ];
-        break;
-      case TimeOfDayPeriod.night:
-        options = [
-          "summary_headlines_34".tr(),
-          "summary_headlines_35".tr(),
-          "summary_headlines_36".tr(),
-        ];
-        break;
+    if (isStormy(weatherCode)) {
+      options = [
+        "summary_headlines_1".tr(),
+        "summary_headlines_2".tr(),
+        "summary_headlines_3".tr(),
+      ];
+    } else if (isRainy(weatherCode)) {
+      options = [
+        "summary_headlines_4".tr(),
+        "summary_headlines_5".tr(),
+        "summary_headlines_6".tr(),
+      ];
+    } else if (isCloudy(cloudCover)) {
+      // Adjust cloudy phrases by time of day:
+      switch (period) {
+        case TimeOfDayPeriod.morning:
+          options = [
+            "summary_headlines_9".tr(),
+            "summary_headlines_8".tr(),
+            "summary_headlines_7".tr(),
+          ];
+          break;
+        case TimeOfDayPeriod.afternoon:
+          options = [
+            "summary_headlines_28".tr(),
+            "summary_headlines_29".tr(),
+            "summary_headlines_30".tr(),
+          ];
+          break;
+        case TimeOfDayPeriod.evening:
+          options = [
+            "summary_headlines_31".tr(),
+            "summary_headlines_32".tr(),
+            "summary_headlines_33".tr(),
+          ];
+          break;
+        case TimeOfDayPeriod.night:
+          options = [
+            "summary_headlines_34".tr(),
+            "summary_headlines_35".tr(),
+            "summary_headlines_36".tr(),
+          ];
+          break;
+      }
+    } else if ((period == TimeOfDayPeriod.morning ||
+            period == TimeOfDayPeriod.afternoon) &&
+        uv > 7 &&
+        temp > 23 &&
+        isClear(cloudCover)) {
+      options = [
+        "summary_headlines_10".tr(),
+        "summary_headlines_11".tr(),
+        "summary_headlines_12".tr(),
+      ];
+    } else if ((period == TimeOfDayPeriod.morning ||
+            period == TimeOfDayPeriod.afternoon) &&
+        uv > 7 &&
+        isClear(cloudCover)) {
+      options = [
+        "summary_headlines_13".tr(),
+        "summary_headlines_14".tr(),
+        "summary_headlines_15".tr(),
+      ];
+    } else if (humidity > 75) {
+      options = [
+        "summary_headlines_16".tr(),
+        "summary_headlines_17".tr(),
+        "summary_headlines_18".tr(),
+      ];
+    } else if (wind > 15) {
+      options = [
+        "summary_headlines_19".tr(),
+        "summary_headlines_20".tr(),
+        "summary_headlines_21".tr(),
+      ];
+    } else if (temp < 15) {
+      options = [
+        "summary_headlines_22".tr(),
+        "summary_headlines_23".tr(),
+        "summary_headlines_24".tr(),
+      ];
+    } else {
+      options = [
+        "summary_headlines_25".tr(),
+        "summary_headlines_26".tr(),
+        "summary_headlines_27".tr(),
+      ];
     }
-  } else if ((period == TimeOfDayPeriod.morning || period == TimeOfDayPeriod.afternoon) && uv > 7 && temp > 23 && isClear(cloudCover)) {
-    options = [
-      "summary_headlines_10".tr(),
-      "summary_headlines_11".tr(),
-      "summary_headlines_12".tr(),
-    ];
-  } else if ((period == TimeOfDayPeriod.morning || period == TimeOfDayPeriod.afternoon) && uv > 7 && isClear(cloudCover)) {
-    options = [
-      "summary_headlines_13".tr(),
-      "summary_headlines_14".tr(),
-      "summary_headlines_15".tr(),
-    ];
-  } else if (humidity > 75) {
-    options = [
-      "summary_headlines_16".tr(),
-      "summary_headlines_17".tr(),
-      "summary_headlines_18".tr(),
-    ];
-  } else if (wind > 15) {
-    options = [
-      "summary_headlines_19".tr(),
-      "summary_headlines_20".tr(),
-      "summary_headlines_21".tr(),
-    ];
-  } else if (temp < 15) {
-    options = [
-      "summary_headlines_22".tr(),
-      "summary_headlines_23".tr(),
-      "summary_headlines_24".tr(),
-    ];
-  } else {
-    options = [
-      "summary_headlines_25".tr(),
-      "summary_headlines_26".tr(),
-      "summary_headlines_27".tr(),
-    ];
+
+    final base = _random(options);
+
+    final suffix = getHeadlineSuffix(
+      uv: uv,
+      wind: wind,
+      airQuality: airQuality,
+      temp: temp,
+      humidity: humidity,
+      period: period,
+    );
+
+    return "$base$suffix";
   }
 
-  final base = _random(options);
+  String getHeadlineSuffix(
+      {required double uv,
+      required double wind,
+      required int? airQuality,
+      required double temp,
+      required double humidity,
+      required TimeOfDayPeriod period}) {
+    final suffixes = <String>[];
 
-  final suffix = getHeadlineSuffix(
-    uv: uv,
-    wind: wind,
-    airQuality: airQuality,
-    temp: temp,
-    humidity: humidity,
-    period: period,
-  );
+    if ((period == TimeOfDayPeriod.morning ||
+            period == TimeOfDayPeriod.afternoon) &&
+        uv >= 7) {
+      suffixes.add(_random([
+        "summary_suffixes_1".tr(),
+        "summary_suffixes_2".tr(),
+        "summary_suffixes_3".tr(),
+        "summary_suffixes_4".tr(),
+      ]));
+    }
 
-  return "$base$suffix";
-}
+    if (wind >= 15) {
+      suffixes.add(_random([
+        "summary_suffixes_5".tr(),
+        "summary_suffixes_6".tr(),
+        "summary_suffixes_7".tr(),
+      ]));
+    }
 
+    if ((airQuality ?? 0) > 100) {
+      suffixes.add(_random([
+        "summary_suffixes_8".tr(),
+        "summary_suffixes_9".tr(),
+        "summary_suffixes_10".tr(),
+      ]));
+    }
 
-String getHeadlineSuffix({
-  required double uv,
-  required double wind,
-  required int? airQuality,
-  required double temp,
-  required double humidity,
-  required TimeOfDayPeriod period
-}) {
-  final suffixes = <String>[];
+    if (humidity > 70 && temp > 23) {
+      suffixes.add(_random([
+        "summary_suffixes_11".tr(),
+        "summary_suffixes_12".tr(),
+        "summary_suffixes_13".tr(),
+      ]));
+    }
 
-  if ((period == TimeOfDayPeriod.morning || period == TimeOfDayPeriod.afternoon) && uv >= 7) {
-    suffixes.add(_random([
-      "summary_suffixes_1".tr(),
-      "summary_suffixes_2".tr(),
-      "summary_suffixes_3".tr(),
-      "summary_suffixes_4".tr(),
-    ]));
+    if (suffixes.isEmpty) return ".";
+
+    final selected = suffixes.take(2).join(" ${"summary_suffixes_and".tr()} ");
+    return " — $selected.";
   }
 
-  if (wind >= 15) {
-    suffixes.add(_random([
-      "summary_suffixes_5".tr(),
-      "summary_suffixes_6".tr(),
-      "summary_suffixes_7".tr(),
-    ]));
+  String _random(List<String> options) {
+    return options[Random().nextInt(options.length)];
   }
 
-  if ((airQuality ?? 0) > 100) {
-    suffixes.add(_random([
-      "summary_suffixes_8".tr(),
-      "summary_suffixes_9".tr(),
-      "summary_suffixes_10".tr(),
-    ]));
-  }
+  void computeWeatherSummary() {
+    final currentTemp = widget.currentData['temperature_2m']?.toDouble() ?? 0;
+    final windSpeed = widget.currentData['wind_speed_10m']?.toDouble() ?? 0;
+    final airQuality = widget.airQualityData['current']['us_aqi']?.toInt();
+    final tempMin = widget.dailyData['temperature_2m_min']?[0]?.toDouble() ?? 0;
+    final tempMax = widget.dailyData['temperature_2m_max']?[0]?.toDouble() ?? 0;
 
-  if (humidity > 70 && temp > 23) {
-    suffixes.add(_random([
-      "summary_suffixes_11".tr(),
-      "summary_suffixes_12".tr(),
-      "summary_suffixes_13".tr(),
-    ]));
-  }
+    final uvData = findPeakUv(widget.hourlyData);
+    final peakUv = uvData['value'] as double;
+    final uvHour = DateTime.parse(uvData['time']).hour;
 
-  if (suffixes.isEmpty) return ".";
+    final evening = getEveningHumidityAndDew(widget.hourlyData);
+    final humidity = evening['humidity'] as double;
+    final dewPoint = evening['dewPoint'] as double;
+    final dewHour = DateTime.parse(evening['time']).hour;
 
-  final selected = suffixes.take(2).join(" ${"summary_suffixes_and".tr()} ");
-  return " — $selected.";
-}
-
-String _random(List<String> options) {
-  return options[Random().nextInt(options.length)];
-}
-
-
-
-void computeWeatherSummary() {
-  final currentTemp = widget.currentData['temperature_2m']?.toDouble() ?? 0;
-  final windSpeed = widget.currentData['wind_speed_10m']?.toDouble() ?? 0;
-  final airQuality = widget.airQualityData['current']['us_aqi']?.toInt();
-  final tempMin = widget.dailyData['temperature_2m_min']?[0]?.toDouble() ?? 0;
-  final tempMax = widget.dailyData['temperature_2m_max']?[0]?.toDouble() ?? 0;
-
-  final uvData = findPeakUv(widget.hourlyData);
-  final peakUv = uvData['value'] as double;
-  final uvHour = DateTime.parse(uvData['time']).hour;
-
-  final evening = getEveningHumidityAndDew(widget.hourlyData);
-  final humidity = evening['humidity'] as double;
-  final dewPoint = evening['dewPoint'] as double;
-  final dewHour = DateTime.parse(evening['time']).hour;
-
-  final weatherCodeNow = widget.currentData['weather_code']?.toInt() ?? 0;
-  final cloudCoverNow = widget.currentData['cloud_cover']?.toDouble() ?? 100;
-
-  final currentDayLength = widget.dailyData['daylight_duration'][0];
-  final secondsDayLength = currentDayLength.toInt();
-  final dayLengthDuration = Duration(seconds: secondsDayLength);
-  final readableDayLengthTime =
-      "${dayLengthDuration.inHours} ${"hrs_sub_text".tr()} ${dayLengthDuration.inMinutes.remainder(60)} ${"mins_sub_text".tr()}";
+    final weatherCodeNow = widget.currentData['weather_code']?.toInt() ?? 0;
+    final cloudCoverNow = widget.currentData['cloud_cover']?.toDouble() ?? 100;
 
+    final currentDayLength = widget.dailyData['daylight_duration'][0];
+    final secondsDayLength = currentDayLength.toInt();
+    final dayLengthDuration = Duration(seconds: secondsDayLength);
+    final readableDayLengthTime =
+        "${dayLengthDuration.inHours} ${"hrs_sub_text".tr()} ${dayLengthDuration.inMinutes.remainder(60)} ${"mins_sub_text".tr()}";
 
     int offsetSeconds = int.parse(widget.utcOffsetSeconds);
     DateTime utcNow = DateTime.now().toUtc();
@@ -308,250 +295,249 @@ void computeWeatherSummary() {
       now.microsecond,
     );
 
-final period = getTimeOfDayPeriod(now);
+    final period = getTimeOfDayPeriod(now);
 
-  setState(() {
-    _headline = generateHeadline(
-      currentTemp,
-      peakUv,
-      windSpeed,
-      humidity,
-      cloudCoverNow,
-      weatherCodeNow,
-       period,
-      airQuality: airQuality,
-    );
+    setState(() {
+      _headline = generateHeadline(
+        currentTemp,
+        peakUv,
+        windSpeed,
+        humidity,
+        cloudCoverNow,
+        weatherCodeNow,
+        period,
+        airQuality: airQuality,
+      );
 
-    _bullets = generateBulletPoints(
-      tempMin: tempMin,
-      tempMax: tempMax,
-      uvIndex: peakUv,
-      uvHour: uvHour,
-      humidity: humidity,
-      dewPoint: dewPoint,
-      dewHour: dewHour,
-      windSpeed: windSpeed,
-      airQuality: airQuality,
-    );
+      _bullets = generateBulletPoints(
+        tempMin: tempMin,
+        tempMax: tempMax,
+        uvIndex: peakUv,
+        uvHour: uvHour,
+        humidity: humidity,
+        dewPoint: dewPoint,
+        dewHour: dewHour,
+        windSpeed: windSpeed,
+        airQuality: airQuality,
+      );
 
-    _readableDayLengthTime = readableDayLengthTime;
-  });
-}
+      _readableDayLengthTime = readableDayLengthTime;
+    });
+  }
 
-Widget buildWeatherSummaryWidget(BuildContext context, bool isExpanded) {
-
-  return Padding(
-   padding: EdgeInsets.only(left: 16, right: 12), 
-  
-   child: Column(
-    crossAxisAlignment: CrossAxisAlignment.start,
-    children: [
-      SizedBox(width: 8),
-      Text(
-        _headline ?? '',
-        style: TextStyle(
-          fontWeight: FontWeight.w500,
-          color: Theme.of(context).colorScheme.onSurface,
-        ),
-        textAlign: TextAlign.left,
+  Widget buildWeatherSummaryWidget(BuildContext context, bool isExpanded) {
+    return Padding(
+      padding: EdgeInsets.only(left: 16, right: 12),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          SizedBox(width: 8),
+          Text(
+            _headline ?? '',
+            style: TextStyle(
+              fontWeight: FontWeight.w500,
+              color: Theme.of(context).colorScheme.onSurface,
+            ),
+            textAlign: TextAlign.left,
+          ),
+          // ),
+          SizedBox(height: 8),
+          AnimatedSwitcher(
+            duration: Duration(milliseconds: 300),
+            switchInCurve: Curves.easeIn,
+            switchOutCurve: Curves.easeOut,
+            transitionBuilder: (Widget child, Animation<double> animation) {
+              return FadeTransition(
+                opacity: animation,
+                child: child,
+              );
+            },
+            child: isExpanded
+                ? Column(
+                    key: ValueKey(true),
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                        ...?_bullets?.map(
+                          (b) => Padding(
+                            padding: const EdgeInsets.only(
+                                bottom: 8, left: 5, right: 5),
+                            child: Text(
+                              '• $b',
+                              style: TextStyle(
+                                color: Theme.of(context)
+                                    .colorScheme
+                                    .onSurfaceVariant,
+                              ),
+                            ),
+                          ),
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.only(
+                              bottom: 8, left: 5, right: 5),
+                          child: Text(
+                            '• ${"day_length".tr()}: $_readableDayLengthTime',
+                            style: TextStyle(
+                              color: Theme.of(context)
+                                  .colorScheme
+                                  .onSurfaceVariant,
+                            ),
+                          ),
+                        ),
+                      ])
+                : const SizedBox.shrink(
+                    key: ValueKey(false),
+                  ),
+          ),
+        ],
       ),
-      // ),
-      SizedBox(height: 8),
-    AnimatedSwitcher(
-  duration: Duration(milliseconds: 300),
-  switchInCurve: Curves.easeIn,
-  switchOutCurve: Curves.easeOut,
-  transitionBuilder: (Widget child, Animation<double> animation) {
-    return FadeTransition(
-      opacity: animation,
-      child: child,
     );
-  },
-  child: isExpanded
-      ? Column(
-          key: ValueKey(true), 
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-          ...?_bullets?.map(
-            (b) => Padding(
-              padding: const EdgeInsets.only(bottom: 8, left: 5, right: 5),
-              child: Text(
-                '• $b',
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
-              ),
-            ),
-          ),
+  }
 
-          Padding(
-            padding: const EdgeInsets.only(bottom: 8, left: 5, right: 5),
-            child: Text(
-              '• ${"day_length".tr()}: $_readableDayLengthTime',
-              style: TextStyle(
-                color: Theme.of(context).colorScheme.onSurfaceVariant,
-              ),
-            ),
-          ),
-          ]
-        )
-      : const SizedBox.shrink(
-          key: ValueKey(false),
-        ),
-    ),
+  List<String> generateBulletPoints({
+    required double tempMin,
+    required double tempMax,
+    required double uvIndex,
+    required int uvHour,
+    required double humidity,
+    required double dewPoint,
+    required int dewHour,
+    required double windSpeed,
+    required int? airQuality,
+  }) {
+    final rand = Random();
+    final bullets = <String>[];
 
-    ],
-  ),
-  );
-}
+    final tempUnit = context.watch<UnitSettingsNotifier>().tempUnit;
+    final windUnit = context.watch<UnitSettingsNotifier>().windUnit;
 
-List<String> generateBulletPoints({
-  required double tempMin,
-  required double tempMax,
-  required double uvIndex,
-  required int uvHour,
-  required double humidity,
-  required double dewPoint,
-  required int dewHour,
-  required double windSpeed,
-  required int? airQuality,
-}) {
-  final rand = Random();
-  final bullets = <String>[];
+    final isFahrenheit = tempUnit == 'Fahrenheit';
 
+    final tempOptions = [
+      "bulletstempOptions_1".tr(namedArgs: {
+        'min': isFahrenheit
+            ? UnitConverter.celsiusToFahrenheit(tempMin).round().toString()
+            : tempMin.toStringAsFixed(0),
+        'max': isFahrenheit
+            ? UnitConverter.celsiusToFahrenheit(tempMax).round().toString()
+            : tempMax.toStringAsFixed(0),
+      }),
+      "bulletstempOptions_2".tr(namedArgs: {
+        'min': isFahrenheit
+            ? UnitConverter.celsiusToFahrenheit(tempMin).round().toString()
+            : tempMin.toStringAsFixed(0),
+        'max': isFahrenheit
+            ? UnitConverter.celsiusToFahrenheit(tempMax).round().toString()
+            : tempMax.toStringAsFixed(0),
+      }),
+      "bulletstempOptions_3".tr(namedArgs: {
+        'max': isFahrenheit
+            ? UnitConverter.celsiusToFahrenheit(tempMax).round().toString()
+            : tempMax.toStringAsFixed(0),
+      }),
+    ];
 
-final tempUnit = context.watch<UnitSettingsNotifier>().tempUnit;
-final windUnit = context.watch<UnitSettingsNotifier>().windUnit;
+    bullets.add(tempOptions[rand.nextInt(tempOptions.length)]);
 
-final isFahrenheit = tempUnit == 'Fahrenheit';
-
-final tempOptions = [
-  "bulletstempOptions_1".tr(namedArgs: {
-    'min': isFahrenheit
-        ? UnitConverter.celsiusToFahrenheit(tempMin).round().toString()
-        : tempMin.toStringAsFixed(0),
-    'max': isFahrenheit
-        ? UnitConverter.celsiusToFahrenheit(tempMax).round().toString()
-        : tempMax.toStringAsFixed(0),
-  }),
-
-    "bulletstempOptions_2".tr(namedArgs: {
-    'min': isFahrenheit
-        ? UnitConverter.celsiusToFahrenheit(tempMin).round().toString()
-        : tempMin.toStringAsFixed(0),
-    'max': isFahrenheit
-        ? UnitConverter.celsiusToFahrenheit(tempMax).round().toString()
-        : tempMax.toStringAsFixed(0),
-  }),
-
-
-    "bulletstempOptions_3".tr(namedArgs: {
-    'max': isFahrenheit
-        ? UnitConverter.celsiusToFahrenheit(tempMax).round().toString()
-        : tempMax.toStringAsFixed(0),
-  }),
-
-];
-
-  bullets.add(tempOptions[rand.nextInt(tempOptions.length)]);
-
-  if (uvIndex > 2) {
-    final uvTime = context.watch<UnitSettingsNotifier>().timeUnit == '24 hr' ? "$uvHour:00" : formatHour(uvHour);
+    if (uvIndex > 2) {
+      final uvTime = context.watch<UnitSettingsNotifier>().timeUnit == '24 hr'
+          ? "$uvHour:00"
+          : formatHour(uvHour);
       final uvOptions = [
-      "bulletsUVOptions_1".tr(namedArgs: {
-      'uvTime': uvTime.toString(),
-      'uvIndex': uvIndex.toStringAsFixed(0),
-    }),
-
-      "bulletsUVOptions_2".tr(namedArgs: {
-        'uvTime': uvTime.toString(),
-    }),
-      "bulletsUVOptions_3".tr(namedArgs: {
-      'uvTime': uvTime.toString(),
-    }),
-  ];
-    bullets.add(uvOptions[rand.nextInt(uvOptions.length)]);
-  }
-
-  if (humidity > 60) {
-    final time = context.watch<UnitSettingsNotifier>().timeUnit == '24 hr' ? "$dewHour:00" : formatHour(dewHour);
-    final humidityOptions = [
-      "bulletsHUMIDITYOptions_1".tr(namedArgs: {
-        'humidity': humidity.toStringAsFixed(0),
-        'dewpoint': tempUnit == 'Fahrenheit'
-            ? UnitConverter.celsiusToFahrenheit(dewPoint).round().toString() : dewPoint.toStringAsFixed(0),
-        'time': time.toString()
-      }),
-
-        "bulletsHUMIDITYOptions_2".tr(namedArgs: {
-        'dewpoint': tempUnit == 'Fahrenheit'
-            ? UnitConverter.celsiusToFahrenheit(dewPoint).round().toString() : dewPoint.toStringAsFixed(0),
-        'time': time.toString()
-      }),
-
-
-        "bulletsHUMIDITYOptions_3".tr(namedArgs: {
-        'time': time.toString(),
-        'humidity': humidity.toStringAsFixed(0),
-      }),
-    ];
-    bullets.add(humidityOptions[rand.nextInt(humidityOptions.length)]);
-  }
-
-  if (windSpeed > 19) {
-        final convertedwindSpeed = windUnit == 'Mph'
-        ? UnitConverter.kmhToMph(windSpeed).round()
-        : windUnit == 'M/s'
-            ? UnitConverter.kmhToMs(windSpeed).toStringAsFixed(2) : windUnit == 'Bft' ? UnitConverter.kmhToBeaufort(windSpeed).round()
-            : windSpeed.toStringAsFixed(0);
-    final windOptions = [
-      "bulletsWINDOptions_1".tr(namedArgs: {
-        'windSpeed': convertedwindSpeed.toString(),
-        'windUnit': localizeWindUnit(windUnit.toString(), context.locale),
-      }),
-      "bulletsWINDOptions_2".tr(namedArgs: {
-        'windSpeed': convertedwindSpeed.toString(),
-        'windUnit': localizeWindUnit(windUnit.toString(), context.locale),
-      }),
-    ];
-    bullets.add(windOptions[rand.nextInt(windOptions.length)]);
-  }
-
-  if (airQuality != null) {
-    if (airQuality > 100) {
-      bullets.add("bulletsAQIOptions_1".tr());
-    } else {
-      final airOptions = [
-        "bulletsAQIOptions_2".tr(),
-        "bulletsAQIOptions_3".tr(),
-        "bulletsAQIOptions_4".tr(),
+        "bulletsUVOptions_1".tr(namedArgs: {
+          'uvTime': uvTime.toString(),
+          'uvIndex': uvIndex.toStringAsFixed(0),
+        }),
+        "bulletsUVOptions_2".tr(namedArgs: {
+          'uvTime': uvTime.toString(),
+        }),
+        "bulletsUVOptions_3".tr(namedArgs: {
+          'uvTime': uvTime.toString(),
+        }),
       ];
-      bullets.add(airOptions[rand.nextInt(airOptions.length)]);
+      bullets.add(uvOptions[rand.nextInt(uvOptions.length)]);
     }
+
+    if (humidity > 60) {
+      final time = context.watch<UnitSettingsNotifier>().timeUnit == '24 hr'
+          ? "$dewHour:00"
+          : formatHour(dewHour);
+      final humidityOptions = [
+        "bulletsHUMIDITYOptions_1".tr(namedArgs: {
+          'humidity': humidity.toStringAsFixed(0),
+          'dewpoint': tempUnit == 'Fahrenheit'
+              ? UnitConverter.celsiusToFahrenheit(dewPoint).round().toString()
+              : dewPoint.toStringAsFixed(0),
+          'time': time.toString()
+        }),
+        "bulletsHUMIDITYOptions_2".tr(namedArgs: {
+          'dewpoint': tempUnit == 'Fahrenheit'
+              ? UnitConverter.celsiusToFahrenheit(dewPoint).round().toString()
+              : dewPoint.toStringAsFixed(0),
+          'time': time.toString()
+        }),
+        "bulletsHUMIDITYOptions_3".tr(namedArgs: {
+          'time': time.toString(),
+          'humidity': humidity.toStringAsFixed(0),
+        }),
+      ];
+      bullets.add(humidityOptions[rand.nextInt(humidityOptions.length)]);
+    }
+
+    if (windSpeed > 19) {
+      final convertedwindSpeed = windUnit == 'Mph'
+          ? UnitConverter.kmhToMph(windSpeed).round()
+          : windUnit == 'M/s'
+              ? UnitConverter.kmhToMs(windSpeed).toStringAsFixed(2)
+              : windUnit == 'Bft'
+                  ? UnitConverter.kmhToBeaufort(windSpeed).round()
+                  : windSpeed.toStringAsFixed(0);
+      final windOptions = [
+        "bulletsWINDOptions_1".tr(namedArgs: {
+          'windSpeed': convertedwindSpeed.toString(),
+          'windUnit': localizeWindUnit(windUnit.toString(), context.locale),
+        }),
+        "bulletsWINDOptions_2".tr(namedArgs: {
+          'windSpeed': convertedwindSpeed.toString(),
+          'windUnit': localizeWindUnit(windUnit.toString(), context.locale),
+        }),
+      ];
+      bullets.add(windOptions[rand.nextInt(windOptions.length)]);
+    }
+
+    if (airQuality != null) {
+      if (airQuality > 100) {
+        bullets.add("bulletsAQIOptions_1".tr());
+      } else {
+        final airOptions = [
+          "bulletsAQIOptions_2".tr(),
+          "bulletsAQIOptions_3".tr(),
+          "bulletsAQIOptions_4".tr(),
+        ];
+        bullets.add(airOptions[rand.nextInt(airOptions.length)]);
+      }
+    }
+
+    return bullets;
   }
 
-  return bullets;
-}
+  String formatHour(int hour) {
+    final suffix = hour >= 12 ? 'PM' : 'AM';
+    final formatted = hour > 12
+        ? hour - 12
+        : hour == 0
+            ? 12
+            : hour;
+    return '$formatted $suffix';
+  }
 
-String formatHour(int hour) {
-  final suffix = hour >= 12 ? 'PM' : 'AM';
-  final formatted = hour > 12 ? hour - 12 : hour == 0 ? 12 : hour;
-  return '$formatted $suffix';
-}
-
-  
-
-
-bool isExpanded = false;
+  bool isExpanded = false;
 
   @override
   Widget build(BuildContext context) {
-
-  if(!isSummaryLoaded){
-    computeWeatherSummary();
-    isSummaryLoaded = true;
-  }
-
+    if (!isSummaryLoaded) {
+      computeWeatherSummary();
+      isSummaryLoaded = true;
+    }
 
     final windUnit = context.watch<UnitSettingsNotifier>().windUnit;
 
@@ -559,119 +545,148 @@ bool isExpanded = false;
     final gustValue = (gustRaw is num) ? gustRaw.toDouble() : 0.000000001;
 
     final formattedWindGust = windUnit == 'Mph'
-    ? UnitConverter.kmhToMph(gustValue)
-    : windUnit == 'M/s'
-        ? UnitConverter.kmhToMs(gustValue)
-        : windUnit == 'Bft'
-            ? UnitConverter.kmhToBeaufort(gustValue)
-            : gustValue;
+        ? UnitConverter.kmhToMph(gustValue)
+        : windUnit == 'M/s'
+            ? UnitConverter.kmhToMs(gustValue)
+            : windUnit == 'Bft'
+                ? UnitConverter.kmhToBeaufort(gustValue)
+                : gustValue;
 
-
-
-  final formattedWindSpeed =  windUnit == 'Mph'
+    final formattedWindSpeed = windUnit == 'Mph'
         ? UnitConverter.kmhToMph(widget.currentData['wind_speed_10m'])
         : windUnit == 'M/s'
-            ? UnitConverter.kmhToMs(widget.currentData['wind_speed_10m']) : windUnit == 'Bft' ? UnitConverter.kmhToBeaufort(widget.currentData['wind_speed_10m'])
-            : widget.currentData['wind_speed_10m'];
+            ? UnitConverter.kmhToMs(widget.currentData['wind_speed_10m'])
+            : windUnit == 'Bft'
+                ? UnitConverter.kmhToBeaufort(
+                    widget.currentData['wind_speed_10m'])
+                : widget.currentData['wind_speed_10m'];
 
     return Container(
-        decoration: BoxDecoration(
-          color: Color(widget.selectedContainerBgIndex),
-          borderRadius: BorderRadius.circular(18),
-        ),
-        padding: EdgeInsets.only(top: 12, bottom: 10),
-        margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+      decoration: BoxDecoration(
+        color: Color(widget.selectedContainerBgIndex),
+        borderRadius: BorderRadius.circular(18),
+      ),
+      padding: EdgeInsets.only(top: 12, bottom: 10),
+      margin: EdgeInsets.fromLTRB(12, 0, 12, 0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-      GestureDetector(
-        onTap: () {
-          setState(() {
-            isExpanded = !isExpanded;
-          });
-        },
-       child:  Row(
-          crossAxisAlignment: CrossAxisAlignment.end,
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Container(
-              padding: EdgeInsets.only(left: 20),
-          child: Row(
-            children: [
-            Icon(Symbols.analytics, weight: 500, color: Theme.of(context).colorScheme.secondary, size: 20,),
-            SizedBox(width: 5,),
-            Text("quick_summary".tr(), style: TextStyle(fontWeight: FontWeight.w500, color: Theme.of(context).colorScheme.secondary, fontSize: 15.5)),
-            ]
-          )
-        ),  
-            Container(
-            padding: EdgeInsets.only(right: 20), 
-           child: Icon(isExpanded
-          ? Icons.expand_less
-          : Icons.expand_more),   
-        ),
-              
-          ]
-        ),
-    ),
-
-        Divider(height: 20, color: Theme.of(context).colorScheme.outlineVariant,),
-           GestureDetector(
-        onTap: () {
-          setState(() {
-            isExpanded = !isExpanded;
-          });
-        },
-      child:  buildWeatherSummaryWidget(context, isExpanded),
-    ),
-    Padding(
-      padding: EdgeInsets.only(left: 10, right: 10, top: 5, bottom: 8),
-     child: Row(
-        children: [
-          
-        Expanded(
-         child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            spacing: 4,
-            children: [
-              Icon(Symbols.air, weight: 500, color: Theme.of(context).colorScheme.onSurface, size: 19,),
-              Text('${windUnit == 'M/s' ? formattedWindSpeed.toStringAsFixed(1) : formattedWindSpeed.round()} ${localizeWindUnit(windUnit, context.locale)}', style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontSize: 15))
-            ],
-          ),),
-
-         
-          Expanded(
-            
-         child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            spacing: 4,
-            children: [
-              Icon(Symbols.wind_power, weight: 500, color: Theme.of(context).colorScheme.onSurface, size: 19),
-              Text(gustValue == 0.000000001 ? '--' : "${windUnit == 'M/s' ? formattedWindGust.toStringAsFixed(1) : formattedWindGust.round()} ${localizeWindUnit(windUnit, context.locale)}", style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontSize: 15), maxLines: 1, overflow: TextOverflow.ellipsis,)
-            ],
-          ),),
-          Expanded(
-         child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            spacing: 4,
-            children: [
-              Icon(Symbols.cloud, weight: 500, color: Theme.of(context).colorScheme.onSurface, size: 19),
-              Text("${widget.currentData['cloud_cover']}%", style: TextStyle(color: Theme.of(context).colorScheme.onSurface, fontSize: 15))
-            ],
-          ),),         
+          GestureDetector(
+            onTap: () {
+              setState(() {
+                isExpanded = !isExpanded;
+              });
+            },
+            child: Row(
+                crossAxisAlignment: CrossAxisAlignment.end,
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Container(
+                      padding: EdgeInsets.only(left: 20),
+                      child: Row(children: [
+                        Icon(
+                          Symbols.analytics,
+                          weight: 500,
+                          color: Theme.of(context).colorScheme.secondary,
+                          size: 20,
+                        ),
+                        SizedBox(
+                          width: 5,
+                        ),
+                        Text("quick_summary".tr(),
+                            style: TextStyle(
+                                fontWeight: FontWeight.w500,
+                                color: Theme.of(context).colorScheme.secondary,
+                                fontSize: 15.5)),
+                      ])),
+                  Container(
+                    padding: EdgeInsets.only(right: 20),
+                    child: Icon(
+                        isExpanded ? Icons.expand_less : Icons.expand_more),
+                  ),
+                ]),
+          ),
+          Divider(
+            height: 20,
+            color: Theme.of(context).colorScheme.outlineVariant,
+          ),
+          GestureDetector(
+            onTap: () {
+              setState(() {
+                isExpanded = !isExpanded;
+              });
+            },
+            child: buildWeatherSummaryWidget(context, isExpanded),
+          ),
+          Padding(
+              padding: EdgeInsets.only(left: 10, right: 10, top: 5, bottom: 8),
+              child: Row(
+                children: [
+                  Expanded(
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      spacing: 4,
+                      children: [
+                        Icon(
+                          Symbols.air,
+                          weight: 500,
+                          color: Theme.of(context).colorScheme.onSurface,
+                          size: 19,
+                        ),
+                        Text(
+                            '${windUnit == 'M/s' ? formattedWindSpeed.toStringAsFixed(1) : formattedWindSpeed.round()} ${localizeWindUnit(windUnit, context.locale)}',
+                            style: TextStyle(
+                                color: Theme.of(context).colorScheme.onSurface,
+                                fontSize: 15))
+                      ],
+                    ),
+                  ),
+                  Expanded(
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      spacing: 4,
+                      children: [
+                        Icon(Symbols.wind_power,
+                            weight: 500,
+                            color: Theme.of(context).colorScheme.onSurface,
+                            size: 19),
+                        Text(
+                          gustValue == 0.000000001
+                              ? '--'
+                              : "${windUnit == 'M/s' ? formattedWindGust.toStringAsFixed(1) : formattedWindGust.round()} ${localizeWindUnit(windUnit, context.locale)}",
+                          style: TextStyle(
+                              color: Theme.of(context).colorScheme.onSurface,
+                              fontSize: 15),
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        )
+                      ],
+                    ),
+                  ),
+                  Expanded(
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      spacing: 4,
+                      children: [
+                        Icon(Symbols.cloud,
+                            weight: 500,
+                            color: Theme.of(context).colorScheme.onSurface,
+                            size: 19),
+                        Text("${widget.currentData['cloud_cover']}%",
+                            style: TextStyle(
+                                color: Theme.of(context).colorScheme.onSurface,
+                                fontSize: 15))
+                      ],
+                    ),
+                  ),
+                ],
+              ))
         ],
-      )
-      )
-      ],
       ),
     );
   }
 }
 
-
-
-
-
 enum TimeOfDayPeriod { morning, afternoon, evening, night }
 
 TimeOfDayPeriod getTimeOfDayPeriod(DateTime now) {
diff --git a/pubspec.yaml b/pubspec.yaml
index df1cf3e41..073df6631 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2.3.1+17
+version: 2.4.0+18
 
 environment:
   sdk: ">=3.0.6 <4.0.0"
diff --git a/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.lock b/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.lock
index 83f1e96b4..7a0e4ca65 100644
Binary files a/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.lock and b/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.lock differ
diff --git a/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/resourceHashesCache.bin b/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/resourceHashesCache.bin
index e9cb03e70..5b32f2526 100644
Binary files a/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/resourceHashesCache.bin and b/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/resourceHashesCache.bin differ
diff --git a/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_343_timing.txt b/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_343_timing.txt
new file mode 100644
index 000000000..63b78069d
--- /dev/null
+++ b/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_343_timing.txt
@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 101ms
+create_cxx_tasks completed in 105ms
+