diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java b/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java
index 714aa4dec..886c80b2c 100644
--- a/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java
@@ -301,6 +301,7 @@ public class HomeMoreRoomActivity extends BaseMvpActivity<IMainFragmentView, Mai
         CommonNavigator commonNavigator = new CommonNavigator(HomeMoreRoomActivity.this);
         MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(HomeMoreRoomActivity.this, mTabInfoList, true);
         magicIndicatorAdapter.setOnItemSelectListener(this);
+        commonNavigator.setTitleWrapContent(true);
         commonNavigator.setAdapter(magicIndicatorAdapter);
         magicIndicator.setNavigator(commonNavigator);
         commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE);
diff --git a/app/src/main/res/layout/activity_home_more_room.xml b/app/src/main/res/layout/activity_home_more_room.xml
index a1d57bdae..4dc954ef0 100644
--- a/app/src/main/res/layout/activity_home_more_room.xml
+++ b/app/src/main/res/layout/activity_home_more_room.xml
@@ -4,8 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_F9F9F9"
-    android:orientation="vertical"
-    >
+    android:orientation="vertical">
 
     <ImageView
         android:id="@+id/iv_bg_top"
@@ -20,46 +19,63 @@
         android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.core.widget.NestedScrollView
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinator_layout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@id/title_bar"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:fillViewport="true"
-        >
+        app:layout_constraintTop_toBottomOf="@id/title_bar">
 
-        <LinearLayout
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="wrap_content"
+            android:background="@color/translucent"
+            app:elevation="0dp"
+            app:layout_behavior="com.yizhuan.erban.ui.widget.AppBarLayoutBehavior">
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rv_follow_room"
+            <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="@dimen/dp_15"
-                android:paddingEnd="@dimen/dp_15"/>
+                app:contentScrim="@color/translucent"
+                app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
 
-            <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
-                android:id="@+id/magic_indicator"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:paddingStart="@dimen/dp_15"
-                android:paddingEnd="@dimen/dp_15"
-                app:layout_constraintTop_toBottomOf="@id/rv_follow_room"
-                />
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_follow_room"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="@dimen/dp_15"
+                    android:paddingEnd="@dimen/dp_15" />
 
-            <androidx.viewpager.widget.ViewPager
-                android:id="@+id/view_pager"
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                />
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:paddingTop="8dp"
+                android:paddingBottom="3dp">
+
+                <com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
+                    android:id="@+id/magic_indicator"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    android:paddingStart="@dimen/dp_15"
+                    android:paddingEnd="@dimen/dp_15"
+                    app:layout_constraintTop_toBottomOf="@id/rv_follow_room" />
+            </FrameLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/view_pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/color_F9F9F9"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_pk_result.xml b/app/src/main/res/layout/dialog_pk_result.xml
index 6a9febb71..68fd3e734 100644
--- a/app/src/main/res/layout/dialog_pk_result.xml
+++ b/app/src/main/res/layout/dialog_pk_result.xml
@@ -187,7 +187,7 @@
 
             <TextView
                 android:id="@+id/tv_see_other_team"
-                android:layout_width="231dp"
+                android:layout_width="wrap_content"
                 android:layout_height="30dp"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="12dp"
diff --git a/app/src/main/res/layout/fragment_home_tab_map.xml b/app/src/main/res/layout/fragment_home_tab_map.xml
index e61fe4bfa..6acf2d430 100644
--- a/app/src/main/res/layout/fragment_home_tab_map.xml
+++ b/app/src/main/res/layout/fragment_home_tab_map.xml
@@ -7,17 +7,16 @@
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+        android:layout_height="match_parent">
 
         <androidx.recyclerview.widget.RecyclerView
-            android:paddingStart="12.5dp"
-            android:paddingEnd="12.5dp"
-            android:paddingTop="2dp"
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            />
+            android:clipToPadding="false"
+            android:paddingStart="12.5dp"
+            android:paddingTop="2dp"
+            android:paddingEnd="12.5dp" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>