diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java
index 2c70ee3345..9ee5089486 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java
@@ -202,6 +202,7 @@ public class AMapViewWrapper implements IMogoMapView,
 
     @Override
     public void onCreate( Bundle bundle ) {
+        Logger.d( TAG, Log.getStackTraceString( new Throwable(  ) ) );
         if ( mMapView != null ) {
             mMapView.onCreate( bundle );
             Logger.d( TAG, "map onCreate" );
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 83e4e1752c..b304733aea 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -172,6 +172,8 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
     private UploadButtonAnimatorController mUploadButtonAnimatorController;
 
+    private IFragmentProvider mMessageHistoryPanelProvider;
+
     @Override
     protected int getLayoutId() {
         return R.layout.module_ext_layout_entrance;
@@ -317,8 +319,10 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
         mMsgContainer.setOnClickListener(view -> {
             try {
-                IFragmentProvider provider = (IFragmentProvider)ARouter.getInstance().build("/push/ui/message").navigation(getContext());
-                provider.createFragment( getActivity(), mMogoFragmentManager.getMessageHistoryContainerId(), null );
+                if ( mMessageHistoryPanelProvider == null ) {
+                    mMessageHistoryPanelProvider = (IFragmentProvider)ARouter.getInstance().build("/push/ui/message").navigation(getContext());
+                }
+                mMessageHistoryPanelProvider.createFragment( getActivity(), mMogoFragmentManager.getMessageHistoryContainerId(), null );
             } catch( Exception e ){
 
             }
@@ -806,8 +810,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             return;
         }
         mCameraMode.setSelected(ui == EnumMapUI.NorthUP_2D);
-        mCameraMode.setText(getString(ui == EnumMapUI.NorthUP_2D ? R.string.mode_car_up :
-                R.string.mode_north_up));
+        mCameraMode.setText(getString(ui == EnumMapUI.NorthUP_2D ? R.string.mode_car_up : R.string.mode_north_up));
     }
 
     @Override
diff --git a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/fragment/SimpleSpeedFragment.kt b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/fragment/SimpleSpeedFragment.kt
index be2d724a0e..6867534ea4 100644
--- a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/fragment/SimpleSpeedFragment.kt
+++ b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/fragment/SimpleSpeedFragment.kt
@@ -34,4 +34,10 @@ class SimpleSpeedFragment: MvpFragment<SimpleSpeedFragment, SimpleSpeedPresenter
             }
         }
     }
+
+    override fun onDestroyView() {
+        mPresenter?.destroy()
+        super.onDestroyView()
+
+    }
 }
\ No newline at end of file
diff --git a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/presenter/SimpleSpeedPresenter.kt b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/presenter/SimpleSpeedPresenter.kt
index 3c61bda6bc..73f7e05863 100644
--- a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/presenter/SimpleSpeedPresenter.kt
+++ b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/presenter/SimpleSpeedPresenter.kt
@@ -3,8 +3,11 @@ package com.zhidao.mogo.module.left.panel.presenter
 import android.os.Handler
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.commons.mvp.Presenter
+import com.mogo.map.IDestroyable
+import com.mogo.module.common.MogoApisHandler
 import com.mogo.service.IMogoServiceApis
 import com.mogo.service.MogoServicePaths
+import com.mogo.utils.logger.Logger
 import com.zhidao.mogo.module.left.panel.LeftPanelConst.MODULE_NAME
 import com.zhidao.mogo.module.left.panel.fragment.SimpleSpeedFragment
 
@@ -13,12 +16,17 @@ import com.zhidao.mogo.module.left.panel.fragment.SimpleSpeedFragment
  *
  * @author tongchenfei
  */
-class SimpleSpeedPresenter(view: SimpleSpeedFragment) : Presenter<SimpleSpeedFragment>(view) {
+class SimpleSpeedPresenter(view: SimpleSpeedFragment) : Presenter<SimpleSpeedFragment>(view), IDestroyable {
+
+    companion object {
+        @JvmField
+        val TAG: String = "SimpleSpeedPresenter.kt"
+    }
+
     private val handler = Handler()
-    private var mogoApis: IMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(view.context) as IMogoServiceApis
     init {
         // 注册相关回调，监测速度变化
-        mogoApis.registerCenterApi.registerMogoLocationListener(MODULE_NAME) {
+        MogoApisHandler.getInstance()?.apis?.registerCenterApi?.registerMogoLocationListener(MODULE_NAME) {
             handler.post {
                 mView.refreshSpeed((it.speed * 3.6).toInt())
             }
@@ -38,4 +46,9 @@ class SimpleSpeedPresenter(view: SimpleSpeedFragment) : Presenter<SimpleSpeedFra
 //
 //        })
     }
+
+    override fun destroy() {
+        Logger.d(TAG, "destroy")
+        MogoApisHandler.getInstance()?.apis?.registerCenterApi?.unregisterMogoLocationListener(MODULE_NAME)
+    }
 }
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
index ae3c36287e..5524ea6c4b 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
@@ -102,6 +102,7 @@ public class MogoModulesManager implements MogoModulesHandler {
 
     @Override
     public void loadMapModule( int containerId ) {
+        Logger.d( TAG, "loadMapModule" );
         IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance()
                 .build( MogoModulePaths.PATH_MODULE_MAP )
                 .navigation( getContext() );
@@ -181,7 +182,11 @@ public class MogoModulesManager implements MogoModulesHandler {
             Logger.e( TAG, "add fragment fail cause provider == null, container is %s", ResourcesHelper.getResNameById( getApplicationContext(), containerId ) );
             return;
         }
-        final Fragment fragment = provider.createFragment( getContext(), null );
+        Fragment fragment = null;
+        fragment = mActivity.getSupportFragmentManager().findFragmentByTag( provider.getModuleName() );
+        if ( fragment == null ) {
+            fragment = provider.createFragment( getContext(), null );
+        }
         if ( fragment == null ) {
             Logger.e( TAG, "add fragment fail  cause fragment == null, container is %s", ResourcesHelper.getResNameById( getApplicationContext(), containerId ) );
             return;
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java
index 060bfe8d67..79b4971e9a 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java
@@ -16,6 +16,7 @@ import com.mogo.service.obu.IMogoObuDataChangedListener;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author congtaowang
@@ -29,7 +30,7 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
 
     private Map< String, IMogoModuleLifecycle > mLifecycle = new HashMap<>();
     private Map< String, IMogoMapListener > mMap = new HashMap<>();
-    private Map< String, IMogoNaviListener > mNavi = new HashMap<>();
+    private Map< String, IMogoNaviListener > mNavi = new ConcurrentHashMap<>();
     private Map< String, IMogoLocationListener > mLocation = new HashMap<>();
     private Map< String, IMogoMarkerClickListener > mMarker = new HashMap<>();
     private Map< String, IMogoAimlessModeListener > mAimless = new HashMap<>();
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
index 353af2b392..f213a11094 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
@@ -16,6 +16,7 @@ import com.mogo.service.MogoServicePaths;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.statusmanager.StatusDescriptor;
+import com.mogo.utils.logger.Logger;
 
 /**
  * @author congtaowang
@@ -60,6 +61,7 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
     @Override
     public void onActivityCreated( @Nullable Bundle savedInstanceState ) {
         super.onActivityCreated( savedInstanceState );
+        Logger.d( TAG, "onActivityCreated" );
         initMapView();
     }
 
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java
index b2f7ac35cd..0b5b84d790 100644
--- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java
@@ -36,4 +36,10 @@ class PushHistoryUiProvider implements IFragmentProvider {
     public void init( Context context ) {
 
     }
+
+
+    @Override
+    public void onDestroy() {
+
+    }
 }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
index 7bad54b25c..11f2adf816 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -956,6 +956,7 @@ public class MogoServices implements IMogoMapListener,
 
     @Override
     public void onStopNavi() {
+        SpStorage.setNavigationTarget( "" );
         Logger.d( TAG, "onStopNavi: remove MSG_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH msg" );
         mHandler.removeMessages( ServiceConst.MSG_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH );
     }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/IOnlineCarPanelView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/IOnlineCarPanelView.java
index 47b330bfd2..9f361462b4 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/IOnlineCarPanelView.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/IOnlineCarPanelView.java
@@ -22,4 +22,6 @@ interface IOnlineCarPanelView extends IView {
     void renderNoNavigationInfoUi();
 
     void renderErrorUi();
+
+    void removeSelf();
 }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarListPanelProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarListPanelProvider.java
index ec0a404644..74448a1079 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarListPanelProvider.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarListPanelProvider.java
@@ -30,10 +30,14 @@ class OnlineCarListPanelProvider implements IMogoOnlineCarListPanelProvider {
 
     @Override
     public void showPanel() {
-        if ( isFragmentExist( ContainerHandler.sAttachContext ) ) {
+        Fragment fragment = null;
+        if ( ( fragment = isFragmentAdded( ContainerHandler.sAttachContext ) ) != null ) {
+            if ( fragment instanceof OnlineCarPanelFragment ) {
+                ( ( OnlineCarPanelFragment ) fragment ).refreshPanel();
+            }
             return;
         }
-        Fragment fragment = new OnlineCarPanelFragment();
+        fragment = new OnlineCarPanelFragment();
         ContainerHandler.sAttachContext
                 .getSupportFragmentManager()
                 .beginTransaction()
@@ -41,15 +45,16 @@ class OnlineCarListPanelProvider implements IMogoOnlineCarListPanelProvider {
                 .commitNowAllowingStateLoss();
     }
 
-    private boolean isFragmentExist( Context context ) {
+    private Fragment isFragmentAdded( Context context ) {
         if ( !( context instanceof FragmentActivity ) ) {
             Logger.w( TAG, "context is not a instance of FragmentActivity" );
-            return false;
+            return null;
         }
         Fragment fragment = null;
         return ( fragment = ( ( FragmentActivity ) context )
                 .getSupportFragmentManager()
-                .findFragmentByTag( TAG ) ) != null && fragment.isAdded();
+                .findFragmentByTag( TAG ) ) != null && fragment.isAdded()
+                ? fragment : null;
     }
 
     @Override
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java
index 0975324f90..004a1944c9 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java
@@ -47,7 +47,7 @@ public class OnlineCarPanelFragment extends MvpFragment< IOnlineCarPanelView, On
     @Override
     protected void initViews() {
         findViewById( R.id.module_services_id_close ).setOnClickListener( view -> {
-            MarkerServiceHandler.getApis().getOnlineCarPanelApi().hidePanel();
+            removeSelf();
         } );
         mList = findViewById( R.id.module_services_id_recycler_view );
         mRefreshPanel = findViewById( R.id.module_services_id_load_strategy_container );
@@ -70,6 +70,10 @@ public class OnlineCarPanelFragment extends MvpFragment< IOnlineCarPanelView, On
         } );
     }
 
+    public void refreshPanel(){
+        mPresenter.refreshPanel();
+    }
+
     @Override
     public void showLoading( boolean visible ) {
         if ( visible ) {
@@ -147,4 +151,17 @@ public class OnlineCarPanelFragment extends MvpFragment< IOnlineCarPanelView, On
         mLoading.setVisibility( View.GONE );
         mErrorPanel.setVisibility( View.VISIBLE );
     }
+
+    @Override
+    public void removeSelf() {
+        MarkerServiceHandler.getApis().getOnlineCarPanelApi().hidePanel();
+    }
+
+    @Override
+    public void onDestroyView() {
+        if ( mPresenter != null ) {
+            mPresenter.destroy();
+        }
+        super.onDestroyView();
+    }
 }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java
index 1602c21da7..ebdc0280a6 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java
@@ -7,10 +7,14 @@ import androidx.lifecycle.LifecycleOwner;
 
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.commons.storage.SpStorage;
+import com.mogo.map.IDestroyable;
 import com.mogo.map.MogoLatLng;
+import com.mogo.map.navi.IMogoNaviListener2;
+import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.entity.MarkerResponse;
 import com.mogo.module.service.network.RefreshCallback;
 import com.mogo.module.service.network.RefreshModel;
+import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
 
 /**
@@ -19,7 +23,12 @@ import com.mogo.utils.network.utils.GsonUtil;
  * <p>
  * 描述
  */
-class OnlineCarPanelPresenter extends Presenter< IOnlineCarPanelView > implements RefreshCallback< MarkerResponse > {
+class OnlineCarPanelPresenter extends Presenter< IOnlineCarPanelView > implements
+        RefreshCallback< MarkerResponse >,
+        IMogoNaviListener2,
+        IDestroyable {
+
+    private static final String TAG = "OnlineCarPanelPresenter";
 
     public static final int LIMIT = 20;
     private RefreshModel mRefreshModel;
@@ -31,19 +40,18 @@ class OnlineCarPanelPresenter extends Presenter< IOnlineCarPanelView > implement
     public OnlineCarPanelPresenter( IOnlineCarPanelView view ) {
         super( view );
         mRefreshModel = new RefreshModel( getContext() );
-        mStrategy = OnlineCarStrategy.Default;
+        MogoApisHandler.getInstance().getApis().getRegisterCenterApi().registerMogoNaviListener( TAG, this );
+    }
+
+    @Override
+    public void onStopNavi() {
+        mView.removeSelf();
     }
 
     @Override
     public void onCreate( @NonNull LifecycleOwner owner ) {
         super.onCreate( owner );
-        String json = SpStorage.getNavigationTarget();
-        if ( TextUtils.isEmpty( json ) ) {
-            mView.renderNoNavigationInfoUi();
-            return;
-        }
-        mNavigationTargetInfo = GsonUtil.objectFromJson( json, NavigationTargetInfo.class );
-        loadOnlineCar();
+        refreshPanel();
     }
 
     public void nextStrategy() {
@@ -55,8 +63,21 @@ class OnlineCarPanelPresenter extends Presenter< IOnlineCarPanelView > implement
         }
     }
 
+    public void refreshPanel() {
+        mStrategy = OnlineCarStrategy.Default;
+        String json = SpStorage.getNavigationTarget();
+        if ( TextUtils.isEmpty( json ) ) {
+            mView.renderNoNavigationInfoUi();
+            return;
+        }
+        Logger.d( TAG, json );
+        mNavigationTargetInfo = GsonUtil.objectFromJson( json, NavigationTargetInfo.class );
+        loadOnlineCar();
+    }
+
     public void loadOnlineCar() {
         if ( mNavigationTargetInfo == null ) {
+            mView.renderNoNavigationInfoUi();
             return;
         }
         mView.showLoading( true );
@@ -92,4 +113,9 @@ class OnlineCarPanelPresenter extends Presenter< IOnlineCarPanelView > implement
     public void onFail() {
         mView.renderErrorUi();
     }
+
+    @Override
+    public void destroy() {
+        MogoApisHandler.getInstance().getApis().getRegisterCenterApi().unregisterMogoNaviListener( TAG );
+    }
 }
diff --git a/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_body_bkg.xml b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_body_bkg.xml
index 625e224fce..f72fea0bbc 100644
--- a/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_body_bkg.xml
+++ b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_body_bkg.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <corners android:radius="@dimen/module_widgets_app_bkg_corner" />
+            <corners android:bottomLeftRadius="0px" android:bottomRightRadius="@dimen/module_widgets_app_bkg_corner" android:topLeftRadius="0px" android:topRightRadius="@dimen/module_widgets_app_bkg_corner" />
             <solid android:color="#3D3F44" />
         </shape>
     </item>
diff --git a/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_handler_bkg.xml b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_handler_bkg.xml
index b010e4976b..58689bcc7f 100644
--- a/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_handler_bkg.xml
+++ b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_handler_bkg.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <corners android:bottomLeftRadius="0px" android:bottomRightRadius="0px" android:topLeftRadius="@dimen/module_widgets_app_bkg_corner" android:topRightRadius="@dimen/module_widgets_app_bkg_corner" />
+            <corners android:bottomLeftRadius="@dimen/module_widgets_app_bkg_corner" android:bottomRightRadius="0px" android:topLeftRadius="@dimen/module_widgets_app_bkg_corner" android:topRightRadius="0px" />
             <solid android:color="#3D3F44" />
         </shape>
     </item>
diff --git a/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml
index fa0ce143ab..5b874cda9c 100644
--- a/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml
+++ b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml
@@ -1,31 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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:id="@+id/module_widgets_app_entrance_root"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
+    <LinearLayout
+        android:id="@+id/module_widgets_app_handler_container"
+        android:layout_width="@dimen/module_widgets_app_handler_width"
+        android:layout_height="match_parent"
+        android:background="@drawable/module_widgets_app_handler_bkg"
+        android:gravity="center">
+
+        <ImageView
+            android:id="@+id/module_widgets_app_handler"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/module_widgets_app_handler_close" />
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/module_widgets_app_body_bkg">
-
-        <LinearLayout
-            android:id="@+id/module_widgets_app_handler_container"
-            android:layout_width="@dimen/module_widgets_app_handler_width"
-            android:layout_height="match_parent"
-            android:gravity="center">
-
-            <ImageView
-                android:id="@+id/module_widgets_app_handler"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/module_widgets_app_handler_close" />
-        </LinearLayout>
-
         <TextView
             android:id="@+id/module_widgets_app_entrance"
             android:layout_width="wrap_content"
@@ -62,4 +60,4 @@
     </LinearLayout>
 
 
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml
index 7d4932a5ba..d23e58d061 100644
--- a/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml
@@ -3,7 +3,7 @@
     <dimen name="module_widgets_app_entrance_textSize">22px</dimen>
     <dimen name="module_widgets_app_entrance_padding">15px</dimen>
     <dimen name="module_widgets_app_entrance_corner_size">2px</dimen>
-    <dimen name="module_widgets_app_entrance_y">505px</dimen>
+    <dimen name="module_widgets_app_entrance_y">503px</dimen>
     <dimen name="module_widgets_app_entrance_x">501px</dimen>
     <dimen name="module_widgets_app_entrance_paddingTop">20px</dimen>
     <dimen name="module_widgets_app_entrance_paddingLeft">27px</dimen>
diff --git a/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml
index 7d4932a5ba..d23e58d061 100644
--- a/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml
@@ -3,7 +3,7 @@
     <dimen name="module_widgets_app_entrance_textSize">22px</dimen>
     <dimen name="module_widgets_app_entrance_padding">15px</dimen>
     <dimen name="module_widgets_app_entrance_corner_size">2px</dimen>
-    <dimen name="module_widgets_app_entrance_y">505px</dimen>
+    <dimen name="module_widgets_app_entrance_y">503px</dimen>
     <dimen name="module_widgets_app_entrance_x">501px</dimen>
     <dimen name="module_widgets_app_entrance_paddingTop">20px</dimen>
     <dimen name="module_widgets_app_entrance_paddingLeft">27px</dimen>
diff --git a/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml
index e0aabc6db4..a86836448a 100644
--- a/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -3,8 +3,8 @@
     <dimen name="module_widgets_app_entrance_textSize">40px</dimen>
     <dimen name="module_widgets_app_entrance_padding">30px</dimen>
     <dimen name="module_widgets_app_entrance_corner_size">4px</dimen>
-    <dimen name="module_widgets_app_entrance_y">836px</dimen>
-    <dimen name="module_widgets_app_entrance_x">1000px</dimen>
+    <dimen name="module_widgets_app_entrance_y">906px</dimen>
+    <dimen name="module_widgets_app_entrance_x">1316px</dimen>
     <dimen name="module_widgets_app_entrance_paddingTop">37px</dimen>
     <dimen name="module_widgets_app_entrance_paddingLeft">50px</dimen>
     <dimen name="module_widgets_app_entrance_size">71px</dimen>
diff --git a/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml
index e0aabc6db4..a86836448a 100644
--- a/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml
@@ -3,8 +3,8 @@
     <dimen name="module_widgets_app_entrance_textSize">40px</dimen>
     <dimen name="module_widgets_app_entrance_padding">30px</dimen>
     <dimen name="module_widgets_app_entrance_corner_size">4px</dimen>
-    <dimen name="module_widgets_app_entrance_y">836px</dimen>
-    <dimen name="module_widgets_app_entrance_x">1000px</dimen>
+    <dimen name="module_widgets_app_entrance_y">906px</dimen>
+    <dimen name="module_widgets_app_entrance_x">1316px</dimen>
     <dimen name="module_widgets_app_entrance_paddingTop">37px</dimen>
     <dimen name="module_widgets_app_entrance_paddingLeft">50px</dimen>
     <dimen name="module_widgets_app_entrance_size">71px</dimen>
diff --git a/modules/mogo-module-widgets/src/main/res/values/dimens.xml b/modules/mogo-module-widgets/src/main/res/values/dimens.xml
index 43846dd773..d23e58d061 100644
--- a/modules/mogo-module-widgets/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-widgets/src/main/res/values/dimens.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="module_widgets_app_entrance_textSize">22px</dimen>
-    <dimen name="module_widgets_app_entrance_padding">30px</dimen>
-    <dimen name="module_widgets_app_entrance_corner_size">4px</dimen>
-    <dimen name="module_widgets_app_entrance_y">505px</dimen>
-    <dimen name="module_widgets_app_entrance_x">1000px</dimen>
+    <dimen name="module_widgets_app_entrance_padding">15px</dimen>
+    <dimen name="module_widgets_app_entrance_corner_size">2px</dimen>
+    <dimen name="module_widgets_app_entrance_y">503px</dimen>
+    <dimen name="module_widgets_app_entrance_x">501px</dimen>
     <dimen name="module_widgets_app_entrance_paddingTop">20px</dimen>
     <dimen name="module_widgets_app_entrance_paddingLeft">27px</dimen>
     <dimen name="module_widgets_app_entrance_size">71px</dimen>
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IFragmentProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IFragmentProvider.java
index 548e0f1e0d..d7e96a313c 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IFragmentProvider.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IFragmentProvider.java
@@ -17,4 +17,6 @@ public
 interface IFragmentProvider extends IProvider {
 
     Fragment createFragment( FragmentActivity activity, int containerId, Bundle date );
+
+    public void onDestroy();
 }
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoOnlineCarListPanelProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoOnlineCarListPanelProvider.java
index 16f68b3e74..6daf1c858b 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoOnlineCarListPanelProvider.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoOnlineCarListPanelProvider.java
@@ -1,7 +1,5 @@
 package com.mogo.service.strategy;
 
-import android.content.Context;
-
 import androidx.annotation.IdRes;
 import androidx.fragment.app.FragmentActivity;
 
diff --git a/skin/mogo-skin-light/build.gradle b/skin/mogo-skin-light/build.gradle
index cfcc4a9d2f..9e7cb49f24 100644
--- a/skin/mogo-skin-light/build.gradle
+++ b/skin/mogo-skin-light/build.gradle
@@ -43,6 +43,7 @@ android {
                     'src/main/module-tanlu-res',
                     'src/main/module-commons-res',
                     'src/main/module-media-res',
+                    'src/main/mogo-module-widgets-res',
             ]
         }
     }
diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_dw_navi_info_panel_bkg_light.xml b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_dw_navi_info_panel_bkg_light.xml
new file mode 100644
index 0000000000..b7a7dc2898
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_dw_navi_info_panel_bkg_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="@dimen/module_ext_common_corner" />
+            <solid android:color="#E6262626" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-ldpi/module_widgets_app_handler_close_light.png b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-ldpi/module_widgets_app_handler_close_light.png
new file mode 100644
index 0000000000..6f4b2587ae
Binary files /dev/null and b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-ldpi/module_widgets_app_handler_close_light.png differ
diff --git a/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-ldpi/module_widgets_app_handler_open_light.png b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-ldpi/module_widgets_app_handler_open_light.png
new file mode 100644
index 0000000000..9372cba743
Binary files /dev/null and b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-ldpi/module_widgets_app_handler_open_light.png differ
diff --git a/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-mdpi/module_widgets_app_handler_close_light.png b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-mdpi/module_widgets_app_handler_close_light.png
new file mode 100644
index 0000000000..6f4b2587ae
Binary files /dev/null and b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-mdpi/module_widgets_app_handler_close_light.png differ
diff --git a/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-mdpi/module_widgets_app_handler_open_light.png b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-mdpi/module_widgets_app_handler_open_light.png
new file mode 100644
index 0000000000..9372cba743
Binary files /dev/null and b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-mdpi/module_widgets_app_handler_open_light.png differ
diff --git a/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-xhdpi/module_widgets_app_handler_close_light.png b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-xhdpi/module_widgets_app_handler_close_light.png
new file mode 100644
index 0000000000..adf3a0c94d
Binary files /dev/null and b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-xhdpi/module_widgets_app_handler_close_light.png differ
diff --git a/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-xhdpi/module_widgets_app_handler_open_light.png b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-xhdpi/module_widgets_app_handler_open_light.png
new file mode 100644
index 0000000000..56f85a5442
Binary files /dev/null and b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-xhdpi/module_widgets_app_handler_open_light.png differ
diff --git a/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable/module_widgets_app_body_bkg_light.xml b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable/module_widgets_app_body_bkg_light.xml
new file mode 100644
index 0000000000..41e0f22629
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable/module_widgets_app_body_bkg_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:bottomLeftRadius="0px" android:bottomRightRadius="@dimen/module_widgets_app_bkg_corner" android:topLeftRadius="0px" android:topRightRadius="@dimen/module_widgets_app_bkg_corner" />
+            <solid android:color="#E6FFFFFF" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable/module_widgets_app_handler_bkg_light.xml b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable/module_widgets_app_handler_bkg_light.xml
new file mode 100644
index 0000000000..2a3207ce7b
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable/module_widgets_app_handler_bkg_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:bottomLeftRadius="0px" android:bottomRightRadius="0px" android:topLeftRadius="@dimen/module_widgets_app_bkg_corner" android:topRightRadius="0px" />
+            <solid android:color="#E6F5F5F5" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/mogo-module-widgets-res/values/colors.xml b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/values/colors.xml
new file mode 100644
index 0000000000..759cfa6b94
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="module_widgets_app_entrance_textColor_light">#333333</color>
+</resources>
\ No newline at end of file