diff --git a/app/src/leanback/res/layout/activity_detail.xml b/app/src/leanback/res/layout/activity_detail.xml
index 2bc22556f..d0b0fe869 100644
--- a/app/src/leanback/res/layout/activity_detail.xml
+++ b/app/src/leanback/res/layout/activity_detail.xml
@@ -1,235 +1,237 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.fongmi.android.tv.ui.custom.ProgressLayout 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/progressLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true"
     android:keepScreenOn="true">
 
-    <com.fongmi.android.tv.ui.custom.ProgressLayout
-        android:id="@+id/progressLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <FrameLayout
-            android:id="@+id/video"
-            android:layout_width="360dp"
-            android:layout_height="200dp"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="24dp"
-            android:background="@color/black"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:foreground="@drawable/selector_video">
-
-            <com.google.android.exoplayer2.ui.StyledPlayerView
-                android:id="@+id/surface"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"
-                app:animation_enabled="false"
-                app:auto_show="false"
-                app:controller_layout_id="@layout/view_controller_bottom"
-                app:resize_mode="fit"
-                app:surface_type="surface_view"
-                app:use_controller="false" />
-
-            <com.google.android.exoplayer2.ui.StyledPlayerView
-                android:id="@+id/texture"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"
-                app:animation_enabled="false"
-                app:auto_show="false"
-                app:controller_layout_id="@layout/view_controller_bottom"
-                app:resize_mode="fit"
-                app:surface_type="texture_view"
-                app:use_controller="false" />
-
-            <include
-                android:id="@+id/progress"
-                layout="@layout/view_progress"
-                android:visibility="gone" />
-
-            <include
-                android:id="@+id/error"
-                layout="@layout/view_error"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:visibility="gone" />
-
-            <include
-                android:id="@+id/center"
-                layout="@layout/view_controller_center"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:visibility="gone" />
+    <FrameLayout
+        android:id="@+id/video"
+        android:layout_width="360dp"
+        android:layout_height="200dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="24dp"
+        android:background="@color/black"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:foreground="@drawable/selector_video">
+
+        <com.google.android.exoplayer2.ui.StyledPlayerView
+            android:id="@+id/surface"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            app:animation_enabled="false"
+            app:auto_show="false"
+            app:controller_layout_id="@layout/view_controller_bottom"
+            app:resize_mode="fit"
+            app:surface_type="surface_view"
+            app:use_controller="false" />
+
+        <com.google.android.exoplayer2.ui.StyledPlayerView
+            android:id="@+id/texture"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            app:animation_enabled="false"
+            app:auto_show="false"
+            app:controller_layout_id="@layout/view_controller_bottom"
+            app:resize_mode="fit"
+            app:surface_type="texture_view"
+            app:use_controller="false" />
+
+        <include
+            android:id="@+id/progress"
+            layout="@layout/view_progress"
+            android:visibility="gone" />
+
+        <include
+            android:id="@+id/error"
+            layout="@layout/view_error"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone" />
 
-        </FrameLayout>
+        <include
+            android:id="@+id/center"
+            layout="@layout/view_controller_center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone" />
+
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_toEndOf="@+id/video"
+        android:singleLine="true"
+        android:textColor="@color/white"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        tools:text="慶餘年第二季" />
+
+    <LinearLayout
+        android:id="@+id/row"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/name"
+        android:layout_alignStart="@+id/name"
+        android:layout_marginEnd="24dp"
+        android:orientation="horizontal">
 
         <TextView
-            android:id="@+id/name"
+            android:id="@+id/site"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="24dp"
-            android:layout_marginEnd="24dp"
-            android:layout_toEndOf="@+id/video"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="12dp"
             android:singleLine="true"
             android:textColor="@color/white"
-            android:textSize="24sp"
-            android:textStyle="bold"
-            tools:text="慶餘年第二季" />
-
-        <LinearLayout
-            android:id="@+id/row"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/name"
-            android:layout_alignStart="@+id/name"
-            android:layout_marginEnd="24dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/site"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="12dp"
-                android:singleLine="true"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                tools:text="站源：泥巴" />
-
-            <TextView
-                android:id="@+id/year"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="12dp"
-                android:singleLine="true"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                tools:text="年份：2022" />
-
-            <TextView
-                android:id="@+id/area"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="12dp"
-                android:singleLine="true"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                tools:text="地區：台灣" />
-
-            <TextView
-                android:id="@+id/type"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:singleLine="true"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                tools:text="類型：科幻" />
-
-        </LinearLayout>
+            android:textSize="16sp"
+            tools:text="站源：泥巴" />
 
         <TextView
-            android:id="@+id/director"
+            android:id="@+id/year"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/row"
-            android:layout_alignStart="@+id/name"
             android:layout_marginTop="8dp"
-            android:layout_marginEnd="24dp"
+            android:layout_marginEnd="12dp"
             android:singleLine="true"
             android:textColor="@color/white"
             android:textSize="16sp"
-            tools:text="導演：FongMi" />
+            tools:text="年份：2022" />
 
         <TextView
-            android:id="@+id/actor"
+            android:id="@+id/area"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/director"
-            android:layout_alignStart="@+id/name"
             android:layout_marginTop="8dp"
-            android:layout_marginEnd="24dp"
+            android:layout_marginEnd="12dp"
             android:singleLine="true"
             android:textColor="@color/white"
             android:textSize="16sp"
-            tools:text="演員：FongMi" />
+            tools:text="地區：台灣" />
 
         <TextView
-            android:id="@+id/content"
-            android:layout_width="match_parent"
+            android:id="@+id/type"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/actor"
-            android:layout_alignStart="@+id/name"
             android:layout_marginTop="8dp"
-            android:layout_marginEnd="24dp"
-            android:ellipsize="end"
-            android:lineSpacingExtra="4dp"
-            android:maxLines="3"
+            android:singleLine="true"
             android:textColor="@color/white"
             android:textSize="16sp"
-            tools:text="簡介：" />
+            tools:text="類型：科幻" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/director"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/row"
+        android:layout_alignStart="@+id/name"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="24dp"
+        android:singleLine="true"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        tools:text="導演：FongMi" />
+
+    <TextView
+        android:id="@+id/actor"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/director"
+        android:layout_alignStart="@+id/name"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="24dp"
+        android:singleLine="true"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        tools:text="演員：FongMi" />
+
+    <TextView
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/actor"
+        android:layout_alignStart="@+id/name"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="24dp"
+        android:ellipsize="end"
+        android:lineSpacingExtra="4dp"
+        android:maxLines="3"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        tools:text="簡介：" />
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/video"
+        android:layout_marginTop="12dp">
 
-        <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
-            android:id="@+id/flag"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/video"
-            android:layout_marginTop="12dp"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:paddingStart="24dp"
-            android:paddingTop="12dp"
-            android:paddingEnd="24dp"
-            android:paddingBottom="8dp" />
-
-        <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
-            android:id="@+id/episode"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/flag"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:paddingStart="24dp"
-            android:paddingTop="8dp"
-            android:paddingEnd="24dp"
-            android:paddingBottom="8dp" />
-
-        <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
-            android:id="@+id/group"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/episode"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:paddingStart="24dp"
-            android:paddingTop="8dp"
-            android:paddingEnd="24dp"
-            android:paddingBottom="8dp"
-            android:visibility="gone"
-            tools:visibility="visible" />
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-        <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
-            android:id="@+id/part"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/group"
-            android:layout_marginBottom="8dp"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:paddingStart="24dp"
-            android:paddingTop="8dp"
-            android:paddingEnd="24dp"
-            android:paddingBottom="8dp" />
-
-    </com.fongmi.android.tv.ui.custom.ProgressLayout>
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+            <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
+                android:id="@+id/flag"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipChildren="false"
+                android:clipToPadding="false"
+                android:paddingStart="24dp"
+                android:paddingTop="12dp"
+                android:paddingEnd="24dp"
+                android:paddingBottom="8dp" />
+
+            <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
+                android:id="@+id/episode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipChildren="false"
+                android:clipToPadding="false"
+                android:paddingStart="24dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="24dp"
+                android:paddingBottom="8dp" />
+
+            <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
+                android:id="@+id/group"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipChildren="false"
+                android:clipToPadding="false"
+                android:paddingStart="24dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="24dp"
+                android:paddingBottom="8dp"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <com.fongmi.android.tv.ui.custom.CustomHorizontalGridView
+                android:id="@+id/part"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:clipChildren="false"
+                android:clipToPadding="false"
+                android:paddingStart="24dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="24dp"
+                android:paddingBottom="8dp" />
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</com.fongmi.android.tv.ui.custom.ProgressLayout>
\ No newline at end of file
diff --git a/app/src/leanback/res/layout/activity_search.xml b/app/src/leanback/res/layout/activity_search.xml
index 0bc5cfc98..66269d6a0 100644
--- a/app/src/leanback/res/layout/activity_search.xml
+++ b/app/src/leanback/res/layout/activity_search.xml
@@ -68,6 +68,7 @@
             android:inputType="textCapCharacters|textAutoCorrect|textAutoComplete"
             android:letterSpacing="0.02"
             android:maxLength="20"
+            android:nextFocusRight="@id/word"
             android:singleLine="true"
             android:textColor="@color/white"
             android:textColorHint="@color/white"