diff --git a/app/phone/build.gradle.kts b/app/phone/build.gradle.kts
index e87ea7c2..85606195 100644
--- a/app/phone/build.gradle.kts
+++ b/app/phone/build.gradle.kts
@@ -70,7 +70,6 @@ android {
     }
 
     buildFeatures {
-        dataBinding = true
         viewBinding = true
     }
 }
diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt
index 70654131..16d4f463 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt
@@ -3,7 +3,6 @@ package dev.jdtech.jellyfin
 import android.view.View
 import android.widget.ImageView
 import androidx.annotation.DrawableRes
-import androidx.databinding.BindingAdapter
 import coil.load
 import dev.jdtech.jellyfin.api.JellyfinApi
 import dev.jdtech.jellyfin.models.FindroidEpisode
@@ -17,7 +16,6 @@ import org.jellyfin.sdk.model.api.ImageType
 import java.util.UUID
 import dev.jdtech.jellyfin.core.R as CoreR
 
-@BindingAdapter("itemImage")
 fun bindItemImage(imageView: ImageView, item: BaseItemDto) {
     val itemId =
         if (item.type == BaseItemKind.EPISODE || item.type == BaseItemKind.SEASON && item.imageTags.isNullOrEmpty()) item.seriesId else item.id
@@ -27,7 +25,6 @@ fun bindItemImage(imageView: ImageView, item: BaseItemDto) {
         .posterDescription(item.name)
 }
 
-@BindingAdapter("itemImage")
 fun bindItemImage(imageView: ImageView, item: FindroidItem) {
     val itemId = when (item) {
         is FindroidEpisode -> item.seriesId
@@ -39,7 +36,6 @@ fun bindItemImage(imageView: ImageView, item: FindroidItem) {
         .posterDescription(item.name)
 }
 
-@BindingAdapter("itemBackdropImage")
 fun bindItemBackdropImage(imageView: ImageView, item: FindroidItem?) {
     if (item == null) return
 
@@ -48,19 +44,16 @@ fun bindItemBackdropImage(imageView: ImageView, item: FindroidItem?) {
         .backdropDescription(item.name)
 }
 
-@BindingAdapter("itemBackdropById")
 fun bindItemBackdropById(imageView: ImageView, itemId: UUID) {
     imageView.loadImage("/items/$itemId/Images/${ImageType.BACKDROP}")
 }
 
-@BindingAdapter("personImage")
 fun bindPersonImage(imageView: ImageView, person: BaseItemPerson) {
     imageView
         .loadImage("/items/${person.id}/Images/${ImageType.PRIMARY}", placeholderId = CoreR.drawable.person_placeholder)
         .posterDescription(person.name)
 }
 
-@BindingAdapter("cardItemImage")
 fun bindCardItemImage(imageView: ImageView, item: FindroidItem) {
     val imageType = when (item) {
         is FindroidMovie -> ImageType.BACKDROP
@@ -72,12 +65,10 @@ fun bindCardItemImage(imageView: ImageView, item: FindroidItem) {
         .posterDescription(item.name)
 }
 
-@BindingAdapter("seasonPoster")
 fun bindSeasonPoster(imageView: ImageView, seasonId: UUID) {
     imageView.loadImage("/items/$seasonId/Images/${ImageType.PRIMARY}")
 }
 
-@BindingAdapter("userImage")
 fun bindUserImage(imageView: ImageView, user: User) {
     imageView
         .loadImage("/users/${user.id}/Images/${ImageType.PRIMARY}", placeholderId = CoreR.drawable.user_placeholder)
diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/CollectionListAdapter.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/CollectionListAdapter.kt
index 71b30d82..871cf232 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/CollectionListAdapter.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/CollectionListAdapter.kt
@@ -5,6 +5,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import dev.jdtech.jellyfin.bindCardItemImage
 import dev.jdtech.jellyfin.databinding.CollectionItemBinding
 import dev.jdtech.jellyfin.models.FindroidCollection
 
@@ -14,8 +15,8 @@ class CollectionListAdapter(
     class CollectionViewHolder(private var binding: CollectionItemBinding) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(collection: FindroidCollection) {
-            binding.collection = collection
-            binding.executePendingBindings()
+            binding.collectionName.text = collection.name
+            bindCardItemImage(binding.collectionImage, collection)
         }
     }
 
diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/EpisodeListAdapter.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/EpisodeListAdapter.kt
index b7d37e60..923a47c6 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/EpisodeListAdapter.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/EpisodeListAdapter.kt
@@ -8,6 +8,9 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import dev.jdtech.jellyfin.bindCardItemImage
+import dev.jdtech.jellyfin.bindItemBackdropById
+import dev.jdtech.jellyfin.bindSeasonPoster
 import dev.jdtech.jellyfin.databinding.EpisodeItemBinding
 import dev.jdtech.jellyfin.databinding.SeasonHeaderBinding
 import dev.jdtech.jellyfin.models.EpisodeItem
@@ -26,25 +29,24 @@ class EpisodeListAdapter(
     class HeaderViewHolder(private var binding: SeasonHeaderBinding) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(header: EpisodeItem.Header) {
-            binding.seriesId = header.seriesId
-            binding.seasonId = header.seasonId
             binding.seasonName.text = header.seasonName
             binding.seriesName.text = header.seriesName
-            binding.executePendingBindings()
+            bindItemBackdropById(binding.itemBanner, header.seriesId)
+            bindSeasonPoster(binding.seasonPoster, header.seasonId)
         }
     }
 
     class EpisodeViewHolder(private var binding: EpisodeItemBinding) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(episode: FindroidEpisode) {
-            binding.episode = episode
-
             binding.episodeTitle.text = if (episode.indexNumberEnd == null) {
                 binding.root.context.getString(CoreR.string.episode_name, episode.indexNumber, episode.name)
             } else {
                 binding.root.context.getString(CoreR.string.episode_name_with_end, episode.indexNumber, episode.indexNumberEnd, episode.name)
             }
 
+            binding.episodeOverview.text = episode.overview
+
             if (episode.playbackPositionTicks > 0) {
                 binding.progressBar.layoutParams.width = TypedValue.applyDimension(
                     TypedValue.COMPLEX_UNIT_DIP,
@@ -56,9 +58,11 @@ class EpisodeListAdapter(
                 binding.progressBar.visibility = View.GONE
             }
 
+            binding.playedIcon.isVisible = episode.played
+            binding.missingIcon.isVisible = episode.missing
             binding.downloadedIcon.isVisible = episode.isDownloaded()
 
-            binding.executePendingBindings()
+            bindCardItemImage(binding.episodeImage, episode)
         }
     }
 
diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/HomeEpisodeListAdapter.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/HomeEpisodeListAdapter.kt
index 19945ea0..1676637b 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/HomeEpisodeListAdapter.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/HomeEpisodeListAdapter.kt
@@ -8,6 +8,7 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import dev.jdtech.jellyfin.bindCardItemImage
 import dev.jdtech.jellyfin.databinding.HomeEpisodeItemBinding
 import dev.jdtech.jellyfin.models.FindroidEpisode
 import dev.jdtech.jellyfin.models.FindroidItem
@@ -22,7 +23,6 @@ class HomeEpisodeListAdapter(private val onClickListener: OnClickListener) : Lis
     ) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(item: FindroidItem) {
-            binding.item = item
             if (item.playbackPositionTicks > 0) {
                 binding.progressBar.layoutParams.width = TypedValue.applyDimension(
                     TypedValue.COMPLEX_UNIT_DIP,
@@ -49,7 +49,7 @@ class HomeEpisodeListAdapter(private val onClickListener: OnClickListener) : Lis
                 }
             }
 
-            binding.executePendingBindings()
+            bindCardItemImage(binding.episodeImage, item)
         }
     }
 
diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/PersonListAdapter.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/PersonListAdapter.kt
index 76339602..8cbc5571 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/PersonListAdapter.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/PersonListAdapter.kt
@@ -5,6 +5,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import dev.jdtech.jellyfin.bindPersonImage
 import dev.jdtech.jellyfin.databinding.PersonItemBinding
 import org.jellyfin.sdk.model.api.BaseItemPerson
 
@@ -13,8 +14,9 @@ class PersonListAdapter(private val clickListener: (item: BaseItemPerson) -> Uni
     class PersonViewHolder(private var binding: PersonItemBinding) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(person: BaseItemPerson) {
-            binding.person = person
-            binding.executePendingBindings()
+            binding.personName.text = person.name
+            binding.personRole.text = person.role
+            bindPersonImage(binding.personImage, person)
         }
     }
 
diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserListAdapter.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserListAdapter.kt
index d9f0f24d..5b69d055 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserListAdapter.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserListAdapter.kt
@@ -5,6 +5,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import dev.jdtech.jellyfin.bindUserImage
 import dev.jdtech.jellyfin.databinding.UserListItemBinding
 import dev.jdtech.jellyfin.models.User
 
@@ -15,8 +16,8 @@ class UserListAdapter(
     class UserViewHolder(private var binding: UserListItemBinding) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(user: User) {
-            binding.user = user
-            binding.executePendingBindings()
+            binding.userName.text = user.name
+            bindUserImage(binding.userImage, user)
         }
     }
 
diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserLoginListAdapter.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserLoginListAdapter.kt
index 5c0280e3..957dc113 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserLoginListAdapter.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/UserLoginListAdapter.kt
@@ -5,6 +5,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import dev.jdtech.jellyfin.bindUserImage
 import dev.jdtech.jellyfin.databinding.UserItemBinding
 import dev.jdtech.jellyfin.models.User
 
@@ -14,8 +15,8 @@ class UserLoginListAdapter(
     class UserLoginViewHolder(private var binding: UserItemBinding) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(user: User) {
-            binding.user = user
-            binding.executePendingBindings()
+            binding.userName.text = user.name
+            bindUserImage(binding.userImage, user)
         }
     }
 
diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemListAdapter.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemListAdapter.kt
index b8707ba9..5ef80297 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemListAdapter.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemListAdapter.kt
@@ -7,6 +7,7 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import dev.jdtech.jellyfin.bindItemImage
 import dev.jdtech.jellyfin.databinding.BaseItemBinding
 import dev.jdtech.jellyfin.models.FindroidEpisode
 import dev.jdtech.jellyfin.models.FindroidItem
@@ -21,7 +22,6 @@ class ViewItemListAdapter(
     class ItemViewHolder(private var binding: BaseItemBinding, private val parent: ViewGroup) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(item: FindroidItem, fixedWidth: Boolean) {
-            binding.item = item
             binding.itemName.text = if (item is FindroidEpisode) item.seriesName else item.name
             binding.itemCount.visibility =
                 if (item.unplayedItemCount != null && item.unplayedItemCount!! > 0) View.VISIBLE else View.GONE
@@ -31,9 +31,11 @@ class ViewItemListAdapter(
                 (binding.itemLayout.layoutParams as ViewGroup.MarginLayoutParams).bottomMargin = 0
             }
 
+            binding.itemCount.text = item.unplayedItemCount.toString()
+            binding.playedIcon.isVisible = item.played
             binding.downloadedIcon.isVisible = item.isDownloaded()
 
-            binding.executePendingBindings()
+            bindItemImage(binding.itemImage, item)
         }
     }
 
diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemPagingAdapter.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemPagingAdapter.kt
index 90dc05bd..43c6224d 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemPagingAdapter.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemPagingAdapter.kt
@@ -7,6 +7,7 @@ import androidx.core.view.isVisible
 import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
+import dev.jdtech.jellyfin.bindItemImage
 import dev.jdtech.jellyfin.databinding.BaseItemBinding
 import dev.jdtech.jellyfin.models.FindroidEpisode
 import dev.jdtech.jellyfin.models.FindroidItem
@@ -21,7 +22,6 @@ class ViewItemPagingAdapter(
     class ItemViewHolder(private var binding: BaseItemBinding, private val parent: ViewGroup) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(item: FindroidItem, fixedWidth: Boolean) {
-            binding.item = item
             binding.itemName.text =
                 if (item is FindroidEpisode) item.seriesName else item.name
             binding.itemCount.visibility =
@@ -32,9 +32,11 @@ class ViewItemPagingAdapter(
                 (binding.itemLayout.layoutParams as ViewGroup.MarginLayoutParams).bottomMargin = 0
             }
 
+            binding.itemCount.text = item.unplayedItemCount.toString()
+            binding.playedIcon.isVisible = item.played
             binding.downloadedIcon.isVisible = item.isDownloaded()
 
-            binding.executePendingBindings()
+            bindItemImage(binding.itemImage, item)
         }
     }
 
diff --git a/app/phone/src/main/res/layout/base_item.xml b/app/phone/src/main/res/layout/base_item.xml
index f6bf4e49..cbd5dcf5 100644
--- a/app/phone/src/main/res/layout/base_item.xml
+++ b/app/phone/src/main/res/layout/base_item.xml
@@ -1,103 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/item_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="12dp"
+    android:layout_marginBottom="24dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="@drawable/ripple_background"
+    android:orientation="vertical">
 
-    <data>
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/item_image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:scaleType="centerCrop"
+        app:layout_constraintDimensionRatio="H,2:3"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
-        <import type="android.view.View" />
-
-        <variable
-            name="item"
-            type="dev.jdtech.jellyfin.models.FindroidItem" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/item_layout"
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/item_name"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="12dp"
-        android:layout_marginBottom="24dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:foreground="@drawable/ripple_background"
-        android:orientation="vertical">
+        android:layout_marginTop="4dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/item_image"
+        tools:text="Movie title" />
 
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/item_image"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="centerCrop"
-            app:itemImage="@{item}"
-            app:layout_constraintDimensionRatio="H,2:3"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="@id/item_image"
+        app:layout_constraintTop_toTopOf="@id/item_image">
+
+        <ImageView
+            android:id="@+id/downloaded_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="8dp"
+            android:background="@drawable/circle_background"
+            android:contentDescription="@string/downloaded_indicator"
+            android:padding="4dp"
+            android:src="@drawable/ic_download"
+            android:visibility="gone"
+            app:tint="?attr/colorOnPrimary"
+            tools:visibility="visible" />
 
         <TextView
-            android:id="@+id/item_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:ellipsize="end"
-            android:maxLines="2"
-            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/item_image"
-            tools:text="Movie title" />
+            android:id="@+id/item_count"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="8dp"
+            android:background="@drawable/circle_background"
+            android:gravity="center"
+            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+            android:textColor="?attr/colorOnPrimary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="9" />
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
+        <ImageView
+            android:id="@+id/played_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="8dp"
+            android:background="@drawable/circle_background"
+            android:contentDescription="@string/episode_watched_indicator"
+            android:padding="4dp"
+            android:src="@drawable/ic_check"
             app:layout_constraintEnd_toEndOf="@id/item_image"
-            app:layout_constraintTop_toTopOf="@id/item_image">
+            app:layout_constraintTop_toTopOf="@id/item_image"
+            app:tint="?attr/colorOnPrimary" />
 
-            <ImageView
-                android:id="@+id/downloaded_icon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="8dp"
-                android:background="@drawable/circle_background"
-                android:contentDescription="@string/downloaded_indicator"
-                android:padding="4dp"
-                android:src="@drawable/ic_download"
-                android:visibility="gone"
-                app:tint="?attr/colorOnPrimary"
-                tools:visibility="visible"/>
+    </LinearLayout>
 
-            <TextView
-                android:id="@+id/item_count"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="8dp"
-                android:background="@drawable/circle_background"
-                android:gravity="center"
-                android:text="@{item.unplayedItemCount.toString()}"
-                android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-                android:textColor="?attr/colorOnPrimary"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="9" />
-
-            <ImageView
-                android:id="@+id/played_icon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="8dp"
-                android:background="@drawable/circle_background"
-                android:contentDescription="@string/episode_watched_indicator"
-                android:padding="4dp"
-                android:src="@drawable/ic_check"
-                android:visibility="@{item.played == true ? View.VISIBLE : View.GONE}"
-                app:layout_constraintEnd_toEndOf="@id/item_image"
-                app:layout_constraintTop_toTopOf="@id/item_image"
-                app:tint="?attr/colorOnPrimary" />
-
-        </LinearLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/phone/src/main/res/layout/collection_item.xml b/app/phone/src/main/res/layout/collection_item.xml
index 36ecfbac..e13b04b8 100644
--- a/app/phone/src/main/res/layout/collection_item.xml
+++ b/app/phone/src/main/res/layout/collection_item.xml
@@ -1,47 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="12dp"
+    android:layout_marginBottom="24dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="@drawable/ripple_background"
+    android:orientation="vertical">
 
-    <data>
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/collection_image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:adjustViewBounds="true"
+        android:scaleType="centerCrop"
+        app:layout_constraintDimensionRatio="H,16:9"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
-        <variable
-            name="collection"
-            type="dev.jdtech.jellyfin.models.FindroidCollection" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/collection_name"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="12dp"
-        android:layout_marginBottom="24dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:foreground="@drawable/ripple_background"
-        android:orientation="vertical">
-
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/collection_image"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            app:cardItemImage="@{collection}"
-            app:layout_constraintDimensionRatio="H,16:9"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
-
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:text="@{collection.name}"
-            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/collection_image"
-            tools:text="Movies" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+        android:layout_marginTop="4dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/collection_image"
+        tools:text="Movies" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/phone/src/main/res/layout/episode_item.xml b/app/phone/src/main/res/layout/episode_item.xml
index 34c20ea0..8a46dab5 100644
--- a/app/phone/src/main/res/layout/episode_item.xml
+++ b/app/phone/src/main/res/layout/episode_item.xml
@@ -1,143 +1,127 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="100dp"
+    android:layout_marginHorizontal="24dp"
+    android:layout_marginBottom="24dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="@drawable/ripple_background">
 
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="episode"
-            type="dev.jdtech.jellyfin.models.FindroidEpisode" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/episode_image"
+        android:layout_width="100dp"
         android:layout_height="100dp"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginBottom="24dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:foreground="@drawable/ripple_background">
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/episode_image"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:scaleType="centerCrop"
-            app:cardItemImage="@{episode}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="@id/episode_image"
+        app:layout_constraintTop_toTopOf="@id/episode_image">
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="@id/episode_image"
-            app:layout_constraintTop_toTopOf="@id/episode_image">
-
-            <ImageView
-                android:id="@+id/downloaded_icon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="8dp"
-                android:background="@drawable/circle_background"
-                android:contentDescription="@string/downloaded_indicator"
-                android:padding="4dp"
-                android:src="@drawable/ic_download"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="@id/episode_image"
-                app:layout_constraintTop_toTopOf="@id/episode_image"
-                app:tint="?attr/colorOnPrimary"
-                tools:visibility="visible" />
-
-            <FrameLayout
-                android:id="@+id/missing_icon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="8dp"
-                android:background="@drawable/circle_background"
-                android:backgroundTint="?attr/colorError"
-                android:visibility="@{episode.missing ? View.VISIBLE : View.GONE}"
-                app:layout_constraintEnd_toStartOf="@id/played_icon"
-                app:layout_constraintTop_toTopOf="@id/episode_image"
-                tools:visibility="visible">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:text="M"
-                    android:textColor="@android:color/white"
-                    tools:ignore="HardcodedText" />
-
-            </FrameLayout>
-
-            <ImageView
-                android:id="@+id/played_icon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="8dp"
-                android:background="@drawable/circle_background"
-                android:contentDescription="@string/episode_watched_indicator"
-                android:padding="4dp"
-                android:src="@drawable/ic_check"
-                android:visibility="@{episode.played ? View.VISIBLE : View.GONE}"
-                app:layout_constraintEnd_toEndOf="@id/episode_image"
-                app:layout_constraintTop_toTopOf="@id/episode_image"
-                app:tint="?attr/colorOnPrimary" />
-
-        </LinearLayout>
-
-        <FrameLayout
-            android:id="@+id/progress_bar"
-            android:layout_width="wrap_content"
-            android:layout_height="4dp"
-            android:layout_marginHorizontal="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="@drawable/button_setup_background"
+        <ImageView
+            android:id="@+id/downloaded_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="8dp"
+            android:background="@drawable/circle_background"
+            android:contentDescription="@string/downloaded_indicator"
+            android:padding="4dp"
+            android:src="@drawable/ic_download"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/episode_image"
-            app:layout_constraintStart_toStartOf="@id/episode_image"
-            tools:layout_width="50dp"
+            app:layout_constraintEnd_toEndOf="@id/episode_image"
+            app:layout_constraintTop_toTopOf="@id/episode_image"
+            app:tint="?attr/colorOnPrimary"
             tools:visibility="visible" />
 
-        <TextView
-            android:id="@+id/episode_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-            app:layout_constraintBottom_toTopOf="@id/episode_desc"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/episode_image"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="1. To You, in 2000 Years: The Fall of Shiganshina, Part 1" />
-
-        <TextView
-            android:id="@+id/episode_desc"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scrollbars="none"
-            android:text="@{episode.overview}"
-            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/episode_title"
-            app:layout_constraintTop_toBottomOf="@id/episode_title"
-            tools:text="After one hundred years of peace, humanity is suddenly reminded of the terror of being at the Titans' mercy. After one hundred years of peace, humanity is suddenly reminded of the terror of being at the Titans' mercy." />
-
         <FrameLayout
-            android:layout_width="0dp"
+            android:id="@+id/missing_icon"
+            android:layout_width="24dp"
             android:layout_height="24dp"
-            android:background="@drawable/header_gradient"
-            app:layout_constraintBottom_toBottomOf="@id/episode_desc"
-            app:layout_constraintEnd_toEndOf="@id/episode_desc"
-            app:layout_constraintStart_toStartOf="@id/episode_desc" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+            android:layout_marginStart="8dp"
+            android:background="@drawable/circle_background"
+            android:backgroundTint="?attr/colorError"
+            app:layout_constraintEnd_toStartOf="@id/played_icon"
+            app:layout_constraintTop_toTopOf="@id/episode_image"
+            tools:visibility="visible">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="M"
+                android:textColor="@android:color/white"
+                tools:ignore="HardcodedText" />
+
+        </FrameLayout>
+
+        <ImageView
+            android:id="@+id/played_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="8dp"
+            android:background="@drawable/circle_background"
+            android:contentDescription="@string/episode_watched_indicator"
+            android:padding="4dp"
+            android:src="@drawable/ic_check"
+            app:layout_constraintEnd_toEndOf="@id/episode_image"
+            app:layout_constraintTop_toTopOf="@id/episode_image"
+            app:tint="?attr/colorOnPrimary" />
+
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="4dp"
+        android:layout_marginHorizontal="8dp"
+        android:layout_marginBottom="8dp"
+        android:background="@drawable/button_setup_background"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/episode_image"
+        app:layout_constraintStart_toStartOf="@id/episode_image"
+        tools:layout_width="50dp"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/episode_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        app:layout_constraintBottom_toTopOf="@id/episode_overview"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/episode_image"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="1. To You, in 2000 Years: The Fall of Shiganshina, Part 1" />
+
+    <TextView
+        android:id="@+id/episode_overview"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:scrollbars="none"
+        android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/episode_title"
+        app:layout_constraintTop_toBottomOf="@id/episode_title"
+        tools:text="After one hundred years of peace, humanity is suddenly reminded of the terror of being at the Titans' mercy. After one hundred years of peace, humanity is suddenly reminded of the terror of being at the Titans' mercy." />
+
+    <FrameLayout
+        android:layout_width="0dp"
+        android:layout_height="24dp"
+        android:background="@drawable/header_gradient"
+        app:layout_constraintBottom_toBottomOf="@id/episode_overview"
+        app:layout_constraintEnd_toEndOf="@id/episode_overview"
+        app:layout_constraintStart_toStartOf="@id/episode_overview" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/phone/src/main/res/layout/home_episode_item.xml b/app/phone/src/main/res/layout/home_episode_item.xml
index 40995caf..422c08ce 100644
--- a/app/phone/src/main/res/layout/home_episode_item.xml
+++ b/app/phone/src/main/res/layout/home_episode_item.xml
@@ -1,88 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="240dp"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="12dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="@drawable/ripple_background">
 
-    <data>
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/episode_image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:scaleType="centerCrop"
+        app:layout_constraintDimensionRatio="H,16:9"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
-        <variable
-            name="item"
-            type="dev.jdtech.jellyfin.models.FindroidItem" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="240dp"
+    <TextView
+        android:id="@+id/primary_name"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="12dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:foreground="@drawable/ripple_background">
+        android:layout_marginTop="4dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/episode_image"
+        tools:text="Wonder Egg Priority" />
 
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/episode_image"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="centerCrop"
-            app:cardItemImage="@{item}"
-            app:layout_constraintDimensionRatio="H,16:9"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
+    <TextView
+        android:id="@+id/secondary_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/primary_name"
+        tools:text="The Girl Flautist" />
 
-        <TextView
-            android:id="@+id/primary_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/episode_image"
-            tools:text="Wonder Egg Priority" />
+    <ImageView
+        android:id="@+id/downloaded_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:background="@drawable/circle_background"
+        android:contentDescription="@string/downloaded_indicator"
+        android:padding="4dp"
+        android:src="@drawable/ic_download"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="@id/episode_image"
+        app:layout_constraintTop_toTopOf="@id/episode_image"
+        app:tint="?attr/colorOnPrimary"
+        tools:visibility="visible" />
 
-        <TextView
-            android:id="@+id/secondary_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/primary_name"
-            tools:text="The Girl Flautist" />
+    <FrameLayout
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="4dp"
+        android:layout_marginHorizontal="8dp"
+        android:layout_marginBottom="8dp"
+        android:background="@drawable/button_setup_background"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/episode_image"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:layout_width="50dp"
+        tools:visibility="visible" />
 
-        <ImageView
-            android:id="@+id/downloaded_icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:background="@drawable/circle_background"
-            android:contentDescription="@string/downloaded_indicator"
-            android:padding="4dp"
-            android:src="@drawable/ic_download"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="@id/episode_image"
-            app:layout_constraintTop_toTopOf="@id/episode_image"
-            app:tint="?attr/colorOnPrimary"
-            tools:visibility="visible"/>
-
-        <FrameLayout
-            android:id="@+id/progress_bar"
-            android:layout_width="wrap_content"
-            android:layout_height="4dp"
-            android:layout_marginHorizontal="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="@drawable/button_setup_background"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/episode_image"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:layout_width="50dp"
-            tools:visibility="visible" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/phone/src/main/res/layout/person_item.xml b/app/phone/src/main/res/layout/person_item.xml
index e9fa0b2d..74ec8930 100644
--- a/app/phone/src/main/res/layout/person_item.xml
+++ b/app/phone/src/main/res/layout/person_item.xml
@@ -1,52 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/item_layout"
+    android:layout_width="110dp"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="8dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="@drawable/ripple_background"
+    android:orientation="vertical">
 
-    <data>
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/person_image"
+        android:layout_width="match_parent"
+        android:layout_height="160dp"
+        android:layout_marginBottom="4dp"
+        android:scaleType="centerCrop"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
-        <variable
-            name="person"
-            type="org.jellyfin.sdk.model.api.BaseItemPerson" />
-    </data>
-
-    <LinearLayout
-        android:id="@+id/item_layout"
-        android:layout_width="110dp"
+    <TextView
+        android:id="@+id/person_name"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="8dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:foreground="@drawable/ripple_background"
-        android:orientation="vertical">
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        tools:text="Rosa Salazar" />
 
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/person_image"
-            android:layout_width="match_parent"
-            android:layout_height="160dp"
-            android:layout_marginBottom="4dp"
-            android:scaleType="centerCrop"
-            app:personImage="@{person}"
-            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
-
-        <TextView
-            android:id="@+id/person_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{person.name}"
-            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-            tools:text="Rosa Salazar" />
-
-        <TextView
-            android:id="@+id/person_role"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{person.role}"
-            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-            tools:text="Alita" />
-    </LinearLayout>
-</layout>
\ No newline at end of file
+    <TextView
+        android:id="@+id/person_role"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+        tools:text="Alita" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/phone/src/main/res/layout/season_header.xml b/app/phone/src/main/res/layout/season_header.xml
index 3620c236..12901a25 100644
--- a/app/phone/src/main/res/layout/season_header.xml
+++ b/app/phone/src/main/res/layout/season_header.xml
@@ -1,86 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/header"
+    android:layout_width="match_parent"
+    android:layout_height="200dp"
+    android:layout_marginBottom="16dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
 
-    <data>
+    <ImageView
+        android:id="@+id/item_banner"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:contentDescription="@string/series_poster"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <variable
-            name="seriesId"
-            type="java.util.UUID" />
+    <FrameLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/header_gradient"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <variable
-            name="seasonId"
-            type="java.util.UUID" />
-    </data>
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/season_poster"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="24dp"
+        android:elevation="8dp"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="H,3:2"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/header"
-            android:layout_width="match_parent"
-            android:layout_height="200dp"
-            android:layout_marginBottom="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+    <TextView
+        android:id="@+id/series_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+        app:layout_constraintBottom_toTopOf="@id/season_name"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/season_poster"
+        tools:text="Attack on Titan" />
 
-            <ImageView
-                android:id="@+id/item_banner"
-                android:layout_width="match_parent"
-                android:layout_height="200dp"
-                android:contentDescription="@string/series_poster"
-                android:scaleType="centerCrop"
-                app:itemBackdropById="@{seriesId}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/season_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/season_poster"
+        tools:text="Season 1" />
 
-            <FrameLayout
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:background="@drawable/header_gradient"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <com.google.android.material.imageview.ShapeableImageView
-                android:id="@+id/season_poster"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="24dp"
-                android:elevation="8dp"
-                android:scaleType="centerCrop"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="H,3:2"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:seasonPoster="@{seasonId}"
-                app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
-
-            <TextView
-                android:id="@+id/series_name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
-                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
-                app:layout_constraintBottom_toTopOf="@id/season_name"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/season_poster"
-                tools:text="Attack on Titan" />
-
-            <TextView
-                android:id="@+id/season_name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
-                android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/season_poster"
-                tools:text="Season 1" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/phone/src/main/res/layout/user_item.xml b/app/phone/src/main/res/layout/user_item.xml
index 18b4e668..08357961 100644
--- a/app/phone/src/main/res/layout/user_item.xml
+++ b/app/phone/src/main/res/layout/user_item.xml
@@ -1,51 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="64dp"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="12dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="@drawable/ripple_background">
 
-    <data>
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/user_image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:importantForAccessibility="no"
+        android:scaleType="centerCrop"
+        app:layout_constraintDimensionRatio="w,1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
-        <variable
-            name="user"
-            type="dev.jdtech.jellyfin.models.User" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="64dp"
+    <TextView
+        android:id="@+id/user_name"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="12dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:foreground="@drawable/ripple_background">
-
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/user_image"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:importantForAccessibility="no"
-            android:scaleType="centerCrop"
-            app:layout_constraintDimensionRatio="w,1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image"
-            app:userImage="@{user}" />
-
-        <TextView
-            android:id="@+id/user_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{user.name}"
-            android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/user_image"
-            tools:text="username" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
+        android:layout_marginTop="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAlignment="center"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/user_image"
+        tools:text="username" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/phone/src/main/res/layout/user_list_item.xml b/app/phone/src/main/res/layout/user_list_item.xml
index 611fdd62..b672acdb 100644
--- a/app/phone/src/main/res/layout/user_list_item.xml
+++ b/app/phone/src/main/res/layout/user_list_item.xml
@@ -1,52 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="50dp"
+    android:layout_marginHorizontal="24dp"
+    android:layout_marginTop="12dp"
+    android:layout_marginBottom="12dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="@drawable/ripple_background">
 
-    <data>
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/user_image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:importantForAccessibility="no"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="w,1:1"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image" />
 
-        <variable
-            name="user"
-            type="dev.jdtech.jellyfin.models.User" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:foreground="@drawable/ripple_background">
-
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/user_image"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:importantForAccessibility="no"
-            android:scaleType="centerCrop"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="w,1:1"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Findroid.Image"
-            app:userImage="@{user}" />
-
-        <TextView
-            android:id="@+id/user_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{user.name}"
-            android:layout_marginStart="12dp"
-            android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/user_image"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="username" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
+    <TextView
+        android:id="@+id/user_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/user_image"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="username" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file