diff --git a/app/src/main/res/layout/list_playlists.xml b/app/src/main/res/layout/list_playlists.xml
index e94852e7..039bd5d5 100644
--- a/app/src/main/res/layout/list_playlists.xml
+++ b/app/src/main/res/layout/list_playlists.xml
@@ -35,7 +35,7 @@
         android:maxLines="2"
         app:layout_constraintLeft_toRightOf="@id/image_video_thumbnail"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/button_trash"
         app:layout_constraintBottom_toTopOf="@id/text_metadata"
         android:layout_marginStart="10dp" />
 
@@ -51,7 +51,7 @@
         android:maxLines="1"
         app:layout_constraintTop_toBottomOf="@id/text_name"
         app:layout_constraintLeft_toRightOf="@id/image_video_thumbnail"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/button_trash"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginStart="10dp" />
 
diff --git a/app/src/main/res/layout/view_up_next.xml b/app/src/main/res/layout/view_up_next.xml
index 1a818827..f50fb01b 100644
--- a/app/src/main/res/layout/view_up_next.xml
+++ b/app/src/main/res/layout/view_up_next.xml
@@ -12,6 +12,7 @@
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <TextView
             android:id="@+id/videodetail_up_next"
             android:layout_width="wrap_content"
@@ -23,18 +24,23 @@
             android:includeFontPadding="false"
             android:textSize="17dp"
             android:text="@string/up_next" />
+
         <TextView
             android:id="@+id/videodetail_queue_type"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:textColor="@color/gray_ac"
             android:fontFamily="@font/inter_extra_light"
             android:includeFontPadding="false"
             app:layout_constraintLeft_toRightOf="@id/videodetail_up_next"
             app:layout_constraintBottom_toBottomOf="@id/videodetail_up_next"
+            app:layout_constraintRight_toLeftOf="@id/videodetail_queue_position"
             android:layout_marginLeft="6dp"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:textSize="14dp"
             android:text="@string/queue" />
+
         <TextView
             android:id="@+id/videodetail_queue_position"
             android:layout_width="wrap_content"
@@ -47,6 +53,7 @@
             android:layout_marginLeft="10dp"
             android:textSize="12dp"
             tools:text="1/4" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout