diff --git a/app/src/leanback/res/layout/activity_cast.xml b/app/src/leanback/res/layout/activity_cast.xml
index fc81e4a6b..bf02029d8 100644
--- a/app/src/leanback/res/layout/activity_cast.xml
+++ b/app/src/leanback/res/layout/activity_cast.xml
@@ -14,12 +14,6 @@
         android:layout_height="match_parent"
         app:surface_type="none" />
 
-    <include
-        android:id="@+id/widget"
-        layout="@layout/view_widget_cast"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
     <include
         android:id="@+id/control"
         layout="@layout/view_control_cast"
@@ -28,4 +22,10 @@
         android:layout_gravity="bottom"
         android:visibility="gone" />
 
+    <include
+        android:id="@+id/widget"
+        layout="@layout/view_widget_cast"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/leanback/res/layout/activity_live.xml b/app/src/leanback/res/layout/activity_live.xml
index 508145c7f..5468bbf70 100644
--- a/app/src/leanback/res/layout/activity_live.xml
+++ b/app/src/leanback/res/layout/activity_live.xml
@@ -23,12 +23,6 @@
 
     </FrameLayout>
 
-    <include
-        android:id="@+id/widget"
-        layout="@layout/view_widget_live"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
     <include
         android:id="@+id/control"
         layout="@layout/view_control_live"
@@ -37,6 +31,12 @@
         android:layout_gravity="bottom"
         android:visibility="gone" />
 
+    <include
+        android:id="@+id/widget"
+        layout="@layout/view_widget_live"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/recycler"
         android:layout_width="wrap_content"
diff --git a/app/src/leanback/res/layout/activity_video.xml b/app/src/leanback/res/layout/activity_video.xml
index a2041b7bc..bb79b691a 100644
--- a/app/src/leanback/res/layout/activity_video.xml
+++ b/app/src/leanback/res/layout/activity_video.xml
@@ -32,12 +32,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <include
-            android:id="@+id/widget"
-            layout="@layout/view_widget_vod"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
         <include
             android:id="@+id/control"
             layout="@layout/view_control_vod"
@@ -46,6 +40,12 @@
             android:layout_gravity="bottom"
             android:visibility="gone" />
 
+        <include
+            android:id="@+id/widget"
+            layout="@layout/view_widget_vod"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
     </FrameLayout>
 
     <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/mobile/res/layout-sw600dp/activity_video.xml b/app/src/mobile/res/layout-sw600dp/activity_video.xml
index a059ab23a..4bef8f606 100644
--- a/app/src/mobile/res/layout-sw600dp/activity_video.xml
+++ b/app/src/mobile/res/layout-sw600dp/activity_video.xml
@@ -40,12 +40,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
 
-            <include
-                android:id="@+id/widget"
-                layout="@layout/view_widget_vod"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
             <include
                 android:id="@+id/control"
                 layout="@layout/view_control_vod"
@@ -53,6 +47,12 @@
                 android:layout_height="match_parent"
                 android:visibility="gone" />
 
+            <include
+                android:id="@+id/widget"
+                layout="@layout/view_widget_vod"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
         </FrameLayout>
 
         <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/mobile/res/layout/activity_live.xml b/app/src/mobile/res/layout/activity_live.xml
index a24cf9f7f..2f23b7347 100644
--- a/app/src/mobile/res/layout/activity_live.xml
+++ b/app/src/mobile/res/layout/activity_live.xml
@@ -23,12 +23,6 @@
 
     </FrameLayout>
 
-    <include
-        android:id="@+id/widget"
-        layout="@layout/view_widget_live"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
     <include
         android:id="@+id/control"
         layout="@layout/view_control_live"
@@ -36,6 +30,12 @@
         android:layout_height="match_parent"
         android:visibility="gone" />
 
+    <include
+        android:id="@+id/widget"
+        layout="@layout/view_widget_live"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/recycler"
         android:layout_width="wrap_content"
diff --git a/app/src/mobile/res/layout/activity_video.xml b/app/src/mobile/res/layout/activity_video.xml
index 665308b9f..23c332b16 100644
--- a/app/src/mobile/res/layout/activity_video.xml
+++ b/app/src/mobile/res/layout/activity_video.xml
@@ -33,12 +33,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <include
-            android:id="@+id/widget"
-            layout="@layout/view_widget_vod"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
         <include
             android:id="@+id/control"
             layout="@layout/view_control_vod"
@@ -46,6 +40,12 @@
             android:layout_height="match_parent"
             android:visibility="gone" />
 
+        <include
+            android:id="@+id/widget"
+            layout="@layout/view_widget_vod"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
     </FrameLayout>
 
     <View