diff --git a/app/src/main/java/com/pranshulgg/weather_master_app/feature/shared/components/blocks/VisibilityBlock.kt b/app/src/main/java/com/pranshulgg/weather_master_app/feature/shared/components/blocks/VisibilityBlock.kt
index 9f1d6d5d4..33eb6a9ce 100644
--- a/app/src/main/java/com/pranshulgg/weather_master_app/feature/shared/components/blocks/VisibilityBlock.kt
+++ b/app/src/main/java/com/pranshulgg/weather_master_app/feature/shared/components/blocks/VisibilityBlock.kt
@@ -35,6 +35,7 @@ import com.pranshulgg.weather_master_app.core.ui.components.Gap
 import com.pranshulgg.weather_master_app.core.utils.formatters.formatLocalizedNumber
 import com.pranshulgg.weather_master_app.core.utils.locale.getCurrentAppLocale
 import java.util.Locale
+import kotlin.math.roundToInt
 
 @Composable
 
@@ -47,11 +48,15 @@ fun VisibilityBlock(
     onClickBlock: () -> Unit
 ) {
 
+    val formatter: (Double) -> Double? = {
+        DistanceUnit.M.convert(
+            it,
+            units.distanceUnit
+        )
+    }
 
-    val visibility = DistanceUnit.M.convert(
-        if (isDaily) weather.daily[dailyIndex].visibility?.toDouble() else weather.current.visibility?.toDouble(),
-        units.distanceUnit
-    )
+    val visibility =
+        if (isDaily) weather.daily[dailyIndex].visibility?.toDouble() else weather.current.visibility?.toDouble()
 
     Surface(
         color = MaterialTheme.colorScheme.surface,
@@ -80,22 +85,61 @@ fun VisibilityBlock(
                 Gap(28.dp)
                 Header()
 
-                Text(
-                    formatLocalizedNumber(
-                        number = visibility!!,
-                        decimalPlaces = 0,
-                        locale = getCurrentAppLocale()
-                    ),
-                    style = MaterialTheme.typography.displaySmall,
-                    color = MaterialTheme.colorScheme.onSurface,
-                )
+                Row(
+                ) {
+                    Text(
+                        formatLocalizedNumber(
+                            number = formatter(visibility!!)!!,
+                            decimalPlaces = 0,
+                            locale = getCurrentAppLocale()
+                        ),
+                        style = MaterialTheme.typography.displayMedium,
+                        modifier = Modifier.alignByBaseline(),
+                        color = MaterialTheme.colorScheme.onSurface,
+                    )
+                    Gap(horizontal = 2.dp)
+                    Text(
+                        units.distanceUnit.toName(true, context),
+                        modifier = Modifier.alignByBaseline(),
+                        style = MaterialTheme.typography.titleLarge,
+                        color = MaterialTheme.colorScheme.onSurface
+                    )
+                }
 
-
-                Text(
-                    units.distanceUnit.toName(context = context, inShort = true),
-                    style = MaterialTheme.typography.bodyLarge,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                )
+                if (!isDaily) {
+                    Text(
+                        stringResource(
+                            visibilityLabels(
+                                DistanceUnit.M.convert(
+                                    visibility,
+                                    DistanceUnit.KM
+                                )?.roundToInt()!!
+                            )
+                        ),
+                        style = MaterialTheme.typography.bodyLarge,
+                    )
+                } else {
+                    Text(
+                        stringResource(R.string.weather_minimum),
+                        style = MaterialTheme.typography.bodyLarge,
+                    )
+                }
+//                Text(
+//                    formatLocalizedNumber(
+//                        number = visibility!!,
+//                        decimalPlaces = 0,
+//                        locale = getCurrentAppLocale()
+//                    ),
+//                    style = MaterialTheme.typography.displaySmall,
+//                    color = MaterialTheme.colorScheme.onSurface,
+//                )
+//
+//
+//                Text(
+//                    units.distanceUnit.toName(context = context, inShort = true),
+//                    style = MaterialTheme.typography.bodyLarge,
+//                    color = MaterialTheme.colorScheme.onSurfaceVariant
+//                )
                 Gap(28.dp)
             }
         }
@@ -129,3 +173,13 @@ private fun Header() {
         )
     }
 }
+
+private fun visibilityLabels(valueKm: Int): Int {
+    return when {
+        valueKm >= 20 -> R.string.text_very_good
+        valueKm >= 10 -> R.string.text_good
+        valueKm >= 4 -> R.string.text_moderate
+        valueKm >= 1 -> R.string.text_poor
+        else -> R.string.text_very_poor
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b85511173..383cf4e03 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -376,6 +376,7 @@
 
     <string name="setting_app_font">App font</string>
     <string name="setting_system_font">System font</string>
+    <string name="weather_minimum">Minimum</string>
 </resources>
 
     <!--<string name=""></string>-->