diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml
index 6df53a85b2..81c5fe7e4e 100644
--- a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -13,7 +13,7 @@
 
     <dimen name="module_mogo_och_bus_current_station_name_text_size">32px</dimen>
     <dimen name="module_mogo_och_bus_current_station_notice_text_size">20px</dimen>
-    <dimen name="module_mogo_och_bus_station_name_text_size">41.6px</dimen>
+    <dimen name="module_mogo_och_bus_station_name_text_size">42px</dimen>
     <dimen name="module_mogo_och_bus_station_notice_text_size">32px</dimen>
 
     <dimen name="module_mogo_och_bus_station_name_margin_left">15px</dimen>
diff --git a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
index 0f357cd739..33d370bf3f 100644
--- a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
+++ b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml
@@ -1,39 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="300px"
-    android:layout_height="270px"
+    android:layout_width="@dimen/module_mogo_och_autopilot_order_bg_width"
+    android:layout_height="@dimen/module_mogo_och_autopilot_order_bg_height"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/module_och_taxi_order_status"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/module_och_taxi_order_status_marginLeft"
         android:layout_marginTop="@dimen/module_och_taxi_order_status_marginTop"
         android:text="@string/module_och_taxi_order_status_ph_text"
         android:textColor="@color/module_och_order_status_textColor"
         android:textSize="@dimen/module_och_taxi_order_status_textSize"
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <View
         android:id="@+id/module_och_taxi_order_status_divider"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="@dimen/module_och_taxi_order_status_divider_height"
         android:layout_marginLeft="@dimen/module_och_taxi_order_status_divider_marginLeft"
         android:layout_marginTop="@dimen/module_och_taxi_order_status_divider_marginTop"
         android:layout_marginRight="@dimen/module_och_taxi_order_status_divider_marginRight"
-        android:background="@color/module_och_taxi_order_status_divider_bkgColor" />
+        android:background="@color/module_och_taxi_order_status_divider_bkgColor"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_status" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/module_och_taxi_order_status_stationInfo"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/module_och_taxi_order_status_stationInfo_height"
+        android:layout_height="0dp"
         android:paddingLeft="@dimen/module_och_taxi_order_status_stationInfo_paddingLeft"
         android:paddingTop="@dimen/module_och_taxi_order_status_stationInfo_paddingTop"
         android:paddingRight="@dimen/module_och_taxi_order_status_stationInfo_paddingRight"
-        android:paddingBottom="@dimen/module_och_taxi_order_status_stationInfo_paddingBottom">
+        android:paddingBottom="@dimen/module_och_taxi_order_status_stationInfo_paddingBottom"
+        app:layout_constraintBottom_toTopOf="@+id/module_och_taxi_order_distance_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_status_divider">
 
         <ImageView
             android:id="@+id/greenDot"
@@ -48,7 +58,7 @@
             android:id="@+id/module_och_taxi_order_start_station"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5px"
+            android:layout_marginLeft="@dimen/module_och_taxi_order_start_station_marginLeft"
             android:textColor="@color/module_och_order_status_textColor"
             android:textSize="@dimen/module_och_taxi_order_start_station_textSize"
             android:textStyle="bold"
@@ -72,10 +82,11 @@
             android:id="@+id/dotLine"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
+            android:scaleType="fitXY"
             android:src="@drawable/module_och_taxi_dot_line"
+            app:layout_constraintBottom_toTopOf="@+id/blueDot"
             app:layout_constraintLeft_toLeftOf="@+id/greenDot"
             app:layout_constraintRight_toRightOf="@+id/greenDot"
-            app:layout_constraintBottom_toTopOf="@+id/blueDot"
             app:layout_constraintTop_toBottomOf="@+id/greenDot" />
 
         <ImageView
@@ -118,7 +129,10 @@
         android:id="@+id/module_och_taxi_order_distance_container"
         android:layout_width="match_parent"
         android:layout_height="@dimen/module_och_taxi_order_distance_container_height"
-        android:background="@drawable/module_och_taxi_panel_distance_bkg">
+        android:background="@drawable/module_och_taxi_panel_distance_bkg"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <TextView
             android:id="@+id/module_och_taxi_order_distance_anchor"
@@ -146,4 +160,4 @@
             app:layout_constraintLeft_toRightOf="@+id/greenDot" />
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/values-xhdpi/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml
similarity index 76%
rename from OCH/mogo-och-taxi/src/main/res/values-xhdpi/dimens.xml
rename to OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml
index 2ca27f9ddf..95796c9ef6 100644
--- a/OCH/mogo-och-taxi/src/main/res/values-xhdpi/dimens.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml
@@ -2,8 +2,9 @@
 <resources>
     <dimen name="module_och_taxi_panel_width">464px</dimen>
     <dimen name="module_och_taxi_panel_height">310px</dimen>
-    <dimen name="module_och_taxi_order_status_marginLeft">20px</dimen>
-    <dimen name="module_och_taxi_order_status_marginTop">20px</dimen>
+    <dimen name="module_och_taxi_order_start_station_marginLeft">15px</dimen>
+    <dimen name="module_och_taxi_order_status_marginLeft">25px</dimen>
+    <dimen name="module_och_taxi_order_status_marginTop">25px</dimen>
     <dimen name="module_och_taxi_order_status_textSize">20px</dimen>
     <dimen name="module_och_taxi_order_status_divider_height">1px</dimen>
     <dimen name="module_och_taxi_order_status_divider_marginLeft">20px</dimen>
@@ -11,16 +12,16 @@
     <dimen name="module_och_taxi_order_status_divider_marginRight">20px</dimen>
     <dimen name="module_och_taxi_order_status_stationInfo_height">140px</dimen>
     <dimen name="module_och_taxi_order_status_stationInfo_paddingLeft">20px</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingTop">20px</dimen>
+    <dimen name="module_och_taxi_order_status_stationInfo_paddingTop">41px</dimen>
     <dimen name="module_och_taxi_order_status_stationInfo_paddingRight">17px</dimen>
-    <dimen name="module_och_taxi_order_status_stationInfo_paddingBottom">20px</dimen>
-    <dimen name="module_och_taxi_order_start_station_textSize">26px</dimen>
-    <dimen name="module_och_taxi_order_start_station_anchor_textSize">20px</dimen>
-    <dimen name="module_och_taxi_order_end_station_anchor_textSize">20px</dimen>
-    <dimen name="module_och_taxi_order_distance_container_height">64px</dimen>
+    <dimen name="module_och_taxi_order_status_stationInfo_paddingBottom">41px</dimen>
+    <dimen name="module_och_taxi_order_start_station_textSize">42px</dimen>
+    <dimen name="module_och_taxi_order_start_station_anchor_textSize">32px</dimen>
+    <dimen name="module_och_taxi_order_end_station_anchor_textSize">32px</dimen>
+    <dimen name="module_och_taxi_order_distance_container_height">84px</dimen>
     <dimen name="module_och_taxi_order_distance_container_marginLeft">3px</dimen>
     <dimen name="module_och_taxi_order_distance_anchor_marginLeft">20px</dimen>
-    <dimen name="module_och_taxi_order_distance_anchor_textSize">20px</dimen>
-    <dimen name="module_och_taxi_order_distance_textSize">24px</dimen>
+    <dimen name="module_och_taxi_order_distance_anchor_textSize">32px</dimen>
+    <dimen name="module_och_taxi_order_distance_textSize">36px</dimen>
     <dimen name="module_och_taxi_order_distance_marginRight">17px</dimen>
 </resources>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml
index 2ca27f9ddf..954782677b 100644
--- a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml
@@ -2,6 +2,7 @@
 <resources>
     <dimen name="module_och_taxi_panel_width">464px</dimen>
     <dimen name="module_och_taxi_panel_height">310px</dimen>
+    <dimen name="module_och_taxi_order_start_station_marginLeft">5px</dimen>
     <dimen name="module_och_taxi_order_status_marginLeft">20px</dimen>
     <dimen name="module_och_taxi_order_status_marginTop">20px</dimen>
     <dimen name="module_och_taxi_order_status_textSize">20px</dimen>
diff --git a/OCH/mogo-och/src/main/res/values/dimens.xml b/OCH/mogo-och/src/main/res/values/dimens.xml
index 547b872e26..b3352fd0e7 100644
--- a/OCH/mogo-och/src/main/res/values/dimens.xml
+++ b/OCH/mogo-och/src/main/res/values/dimens.xml
@@ -26,7 +26,7 @@
 
     <dimen name="module_mogo_och_operation_status_padding">35px</dimen>
 
-    <dimen name="module_mogo_och_autopilot_order_m_t">30px</dimen>
+    <dimen name="module_mogo_och_autopilot_order_m_t">15px</dimen>
     <dimen name="module_mogo_och_autopilot_order_bg_width">300px</dimen>
     <dimen name="module_mogo_och_autopilot_order_bg_height">270px</dimen>