diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
index c06ce1320a..ca6121f7c8 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
@@ -7,7 +7,7 @@
     <com.mogo.eagle.core.function.hmi.map.MapContainerLayout
         android:id="@+id/mapContainerLayout"
         android:layout_width="1860dp"
-        android:layout_height="1533dp"
+        android:layout_height="match_parent"
         android:layout_marginTop="@dimen/dp_66"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
index 0122d3af7d..a71da62b6f 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -7,7 +7,7 @@
     <com.mogo.eagle.core.function.hmi.map.MapContainerLayout
         android:id="@+id/mapContainerLayout"
         android:layout_width="1860dp"
-        android:layout_height="1533dp"
+        android:layout_height="match_parent"
         android:layout_marginTop="@dimen/dp_76"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
index da0470911f..85d7e6d4f1 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
@@ -8,7 +8,7 @@
     <com.mogo.eagle.core.function.hmi.map.MapContainerLayout
         android:id="@+id/unmannedMapCL"
         android:layout_width="1860dp"
-        android:layout_height="1533dp"
+        android:layout_height="match_parent"
         android:layout_marginTop="@dimen/dp_76"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt
index 6d508bcc45..e24cc16dc4 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt
@@ -12,6 +12,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.marginBottom
+import androidx.core.view.marginEnd
 import androidx.core.view.marginStart
 import androidx.core.view.marginTop
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
@@ -44,6 +46,8 @@ class MapContainerLayout @JvmOverloads constructor(
     private var mapMaxHeight = 0
     private var maxMarginStart = 0
     private var maxMarginTop = 0
+    private var maxMarginEnd = 0
+    private var maxMarginBottom = 0
 
     private var zoomInAnimator: ValueAnimator? = null
     private var zoomOutAnimator: ValueAnimator? = null
@@ -102,6 +106,8 @@ class MapContainerLayout @JvmOverloads constructor(
         mapMinHeight = overMapView.height
         maxMarginStart = overMapView.marginStart
         maxMarginTop = overMapView.marginTop
+        maxMarginEnd = overMapView.marginEnd
+        maxMarginBottom = overMapView.marginBottom
     }
 
     override fun onAttachedToWindow() {
@@ -164,6 +170,8 @@ class MapContainerLayout @JvmOverloads constructor(
                             layoutParams.height = evaluator.evaluate(it.animatedFraction, mapMinHeight, mapMaxHeight)
                             layoutParams.leftMargin = evaluator.evaluate(it.animatedFraction, maxMarginStart, 0)
                             layoutParams.topMargin = evaluator.evaluate(it.animatedFraction, maxMarginTop, 0)
+                            layoutParams.rightMargin = evaluator.evaluate(it.animatedFraction, maxMarginEnd, 0)
+                            layoutParams.bottomMargin = evaluator.evaluate(it.animatedFraction, maxMarginBottom, 0)
                         }
                 }
                 zoomInAnimator?.interpolator = AccelerateDecelerateInterpolator()
@@ -181,6 +189,8 @@ class MapContainerLayout @JvmOverloads constructor(
                             layoutParams.height = evaluator.evaluate(it.animatedFraction, mapMaxHeight, mapMinHeight)
                             layoutParams.leftMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginStart)
                             layoutParams.topMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginTop)
+                            layoutParams.rightMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginEnd)
+                            layoutParams.bottomMargin = evaluator.evaluate(it.animatedFraction, 0, maxMarginBottom)
                         }
                 }
                 zoomOutAnimator?.interpolator = AccelerateDecelerateInterpolator()
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
index 71e98b3e88..7551ca0d15 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
@@ -23,21 +23,21 @@
         android:id="@+id/overMapView"
         android:layout_width="270dp"
         android:layout_height="270dp"
-        android:layout_marginStart="1530dp"
-        android:layout_marginTop="1204dp"
+        android:layout_marginEnd="40dp"
+        android:layout_marginBottom="40dp"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
         app:bottomPadding="160"
         app:compassDrawable="@drawable/taxt_u_p_map_car_light"
         app:endPointDrawable="@drawable/taxi_overmap_endpoint"
         app:globalPathColor="#39BA90"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:leftPadding="70"
         app:mapStyleExtraPath="over_view_style_extra.data"
         app:mapStylePath="over_view_style.data"
         app:resetDrawable="@null"
         app:rightPadding="70"
-        android:focusable="false"
-        android:focusableInTouchMode="false"
         app:roadRangeDrawable="@drawable/taxi_overmap_road_range"
         app:roadTrajectoryDrawable="@drawable/taxi_orvermap_road_trajectory"
         app:startPointDrawable="@drawable/taxi_overmap_startpoint"