diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 245acae28b..a69b32788d 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -76,7 +76,7 @@ public class MainActivity extends AppCompatActivity
       Throwable cause = e.getCause();
       while (cause != null) {
         if (cause instanceof DynamiteModule.LoadingException) {
-          setContentView(R.layout.cast_context_error_message_layout);
+          setContentView(R.layout.cast_context_error);
           return;
         }
         cause = cause.getCause();
diff --git a/demos/cast/src/main/res/layout/cast_context_error_message_layout.xml b/demos/cast/src/main/res/layout/cast_context_error.xml
similarity index 77%
rename from demos/cast/src/main/res/layout/cast_context_error_message_layout.xml
rename to demos/cast/src/main/res/layout/cast_context_error.xml
index 6d3260de38..0b3fdb63d2 100644
--- a/demos/cast/src/main/res/layout/cast_context_error_message_layout.xml
+++ b/demos/cast/src/main/res/layout/cast_context_error.xml
@@ -13,17 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
-
-  <TextView
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/textView"
-    android:layout_width="0dp"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_weight="1"
-    android:textSize="20sp"
     android:gravity="center"
+    android:textSize="20sp"
     android:text="@string/cast_context_error"/>
-</LinearLayout>
diff --git a/demos/cast/src/main/res/layout/main_activity.xml b/demos/cast/src/main/res/layout/main_activity.xml
index 89b6b1868d..98efe2095e 100644
--- a/demos/cast/src/main/res/layout/main_activity.xml
+++ b/demos/cast/src/main/res/layout/main_activity.xml
@@ -19,20 +19,25 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:keepScreenOn="true">
+
   <com.google.android.exoplayer2.ui.PlayerView android:id="@+id/local_player_view"
       android:layout_width="match_parent"
       android:layout_height="0dp"
-      android:layout_weight="12"
+      android:layout_weight="1"
+      android:background="@android:color/black"
       app:repeat_toggle_modes="all|one"/>
+
   <RelativeLayout android:layout_width="match_parent"
       android:layout_height="0dp"
-      android:layout_weight="12">
+      android:layout_weight="1">
+
     <android.support.v7.widget.RecyclerView android:id="@+id/sample_list"
         android:choiceMode="singleChoice"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         android:fadeScrollbars="false"/>
+
     <ImageButton android:id="@+id/add_sample_button"
         android:background="@drawable/ic_add_circle_white_24dp"
         android:layout_width="wrap_content"
@@ -42,12 +47,14 @@
         android:layout_alignParentBottom="true"
         android:padding="30dp"
         android:contentDescription="@string/add_samples"/>
+
   </RelativeLayout>
+
   <com.google.android.exoplayer2.ui.PlayerControlView android:id="@+id/cast_control_view"
       android:layout_width="match_parent"
-      android:layout_height="0dp"
-      android:layout_weight="2"
+      android:layout_height="wrap_content"
       android:visibility="gone"
       app:repeat_toggle_modes="all|one"
       app:show_timeout="-1"/>
+
 </LinearLayout>
diff --git a/demos/cast/src/main/res/layout/sample_list.xml b/demos/cast/src/main/res/layout/sample_list.xml
index 910db9e058..183c74eb3a 100644
--- a/demos/cast/src/main/res/layout/sample_list.xml
+++ b/demos/cast/src/main/res/layout/sample_list.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
   <ListView android:id="@+id/sample_list"