diff --git a/OCH/mogo-och-bus-passenger/build.gradle b/OCH/mogo-och-bus-passenger/build.gradle
index b38804a63d..fc55956e11 100644
--- a/OCH/mogo-och-bus-passenger/build.gradle
+++ b/OCH/mogo-och-bus-passenger/build.gradle
@@ -60,6 +60,7 @@ dependencies {
         implementation rootProject.ext.dependencies.mogo_core_data
         implementation rootProject.ext.dependencies.mogo_core_function_call
         implementation rootProject.ext.dependencies.mogo_core_function_v2x
+        implementation rootProject.ext.dependencies.mogo_core_function_hmi
     }else {
         implementation project(":core:mogo-core-utils")
         implementation project(":foudations:mogo-commons")
@@ -67,6 +68,7 @@ dependencies {
         implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-function-call')
         implementation project(':core:function-impl:mogo-core-function-v2x')
+        implementation project(':core:function-impl:mogo-core-function-hmi')
     }
 }
 
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
index 77d9ef65f8..92d0795565 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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">
 
+    <com.mogo.eagle.core.function.hmi.ui.widget.SteeringWheelView
+        android:id="@+id/steering_wheel"
+        android:layout_width="@dimen/dp_300"
+        android:layout_height="@dimen/dp_300"
+        android:layout_marginLeft="@dimen/dp_90"
+        android:layout_marginTop="@dimen/dp_90"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
index 393c733fcd..ed6f67ba54 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.LayoutInflater;
 
 import androidx.annotation.NonNull;
@@ -16,20 +17,11 @@ import com.mogo.eagle.core.function.hmi.R;
  * @since: 4/7/22
  */
 public class SteeringWheelView extends ConstraintLayout {
-    public SteeringWheelView(@NonNull Context context) {
-        super(context);
-        LayoutInflater.from(context).inflate(R.layout.hmi_steering_wheel, this);
-    }
+    private static final String TAG = "SteeringWheelView";
 
     public SteeringWheelView(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
-    }
-
-    public SteeringWheelView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public SteeringWheelView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
+        LayoutInflater.from(context).inflate(R.layout.hmi_steering_wheel, this);
+        Log.d(TAG, "2");
     }
 }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java
index eb43d95c85..f0717ea872 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
@@ -17,25 +18,16 @@ import com.mogo.eagle.core.function.hmi.R;
  * @since: 4/7/22
  */
 public class TapPositionView extends ConstraintLayout {
+    private static final String TAG = "TapPositionView";
     private TextView tabP;
     private TextView tabR;
     private TextView tabN;
     private TextView tabD;
 
-    public TapPositionView(Context context) {
-        super(context);
-        LayoutInflater.from(context).inflate(R.layout.hmi_tap_position, this);
-    }
-
     public TapPositionView(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
-    }
+        Log.d(TAG, "2");
+        LayoutInflater.from(context).inflate(R.layout.hmi_tap_position, this);
 
-    public TapPositionView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public TapPositionView(Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
     }
 }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto.png
new file mode 100644
index 0000000000..748625a43c
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto_nor.png
new file mode 100644
index 0000000000..a9965aaf1f
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto_nor.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_in_steering.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_in_steering.png
new file mode 100644
index 0000000000..4545e67555
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/icon_in_steering.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/taxi_p_auto_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/taxi_p_auto_nor.png
deleted file mode 100644
index c15a11f4e4..0000000000
Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/taxi_p_auto_nor.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/taxi_p_un_auto_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/taxi_p_un_auto_nor.png
deleted file mode 100644
index 08a8e7366a..0000000000
Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/taxi_p_un_auto_nor.png and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel.xml
index 384f1a6e54..c07bc7e423 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel.xml
@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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"
-    android:layout_width="@dimen/dp_300"
-    android:layout_height="@dimen/dp_300"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     android:background="@drawable/bg_steering_wheel">
 
-
     <ProgressBar
         android:id="@+id/blue_circle"
         android:layout_width="@dimen/dp_180"
         android:layout_height="@dimen/dp_180"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/dp_34"
-        android:indeterminateDrawable="@drawable/bg_steering_outer" />
+        android:layout_marginLeft="@dimen/dp_60"
+        android:layout_marginTop="@dimen/dp_38"
+        android:layout_marginRight="@dimen/dp_60"
+        android:indeterminateDrawable="@drawable/bg_steering_outer"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_50"
+        android:gravity="right"
+        android:text="18°"
+        android:textColor="#415479"
+        android:textSize="@dimen/dp_26"
+        app:layout_constraintRight_toLeftOf="@+id/blue_circle"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.mogo.eagle.core.function.hmi.ui.widget.CircularProgressView
         android:layout_width="@dimen/dp_190"
@@ -20,27 +35,44 @@
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/dp_30"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:progColor="@color/taxi_steering_wheel_color_selector"
         app:progWidth="8px"
         app:progress="0" />
 
     <ImageView
-        android:id="@+id/module_och_autopilot_iv"
-        android:layout_width="@dimen/dp_120"
-        android:layout_height="@dimen/dp_120"
+        android:id="@+id/autopilot_iv"
+        android:layout_width="@dimen/dp_144"
+        android:layout_height="@dimen/dp_144"
         android:layout_centerHorizontal="true"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="@dimen/dp_64"
+        android:layout_marginTop="@dimen/dp_54"
         android:scaleType="fitXY"
-        android:src="@drawable/taxi_p_un_auto_nor" />
+        android:src="@drawable/bg_auto_nor"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
+        android:src="@drawable/icon_in_steering"
+        app:layout_constraintBottom_toBottomOf="@+id/autopilot_iv"
+        app:layout_constraintLeft_toLeftOf="@+id/autopilot_iv"
+        app:layout_constraintRight_toRightOf="@+id/autopilot_iv"
+        app:layout_constraintTop_toTopOf="@+id/autopilot_iv" />
+
 
     <com.mogo.eagle.core.function.hmi.ui.widget.TapPositionView
         android:id="@+id/tap_position"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_40"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="@dimen/dp_30"/>
+        android:layout_width="@dimen/dp_240"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_30"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/blue_circle" />
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file