diff --git a/app/phone/src/main/java/com/nomadics9/ananas/fragments/LibraryFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/LibraryFragment.kt
index 862b0d12..102874eb 100644
--- a/app/phone/src/main/java/com/nomadics9/ananas/fragments/LibraryFragment.kt
+++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/LibraryFragment.kt
@@ -37,6 +37,7 @@ import org.jellyfin.sdk.model.api.SortOrder
 import java.lang.IllegalArgumentException
 import javax.inject.Inject
 import com.nomadics9.ananas.core.R as CoreR
+import androidx.recyclerview.widget.GridLayoutManager
 
 @AndroidEntryPoint
 class LibraryFragment : Fragment() {
@@ -62,6 +63,11 @@ class LibraryFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        binding.itemsRecyclerView.layoutManager =
+            GridLayoutManager(context, preferences.spanCount)
+
+
+
         val menuHost: MenuHost = requireActivity()
         menuHost.addMenuProvider(
             object : MenuProvider {
diff --git a/app/tv/libre/debug/output-metadata.json b/app/tv/libre/debug/output-metadata.json
index d993923e..2b9168dc 100644
--- a/app/tv/libre/debug/output-metadata.json
+++ b/app/tv/libre/debug/output-metadata.json
@@ -16,7 +16,7 @@
         }
       ],
       "attributes": [],
-      "versionCode": 1,
+      "versionCode": 6,
       "versionName": "0.14.2",
       "outputFile": "tv-libre-armeabi-v7a-debug.apk"
     },
@@ -29,23 +29,10 @@
         }
       ],
       "attributes": [],
-      "versionCode": 1,
+      "versionCode": 6,
       "versionName": "0.14.2",
       "outputFile": "tv-libre-x86_64-debug.apk"
     },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "x86"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 1,
-      "versionName": "0.14.2",
-      "outputFile": "tv-libre-x86-debug.apk"
-    },
     {
       "type": "ONE_OF_MANY",
       "filters": [
@@ -55,9 +42,22 @@
         }
       ],
       "attributes": [],
-      "versionCode": 1,
+      "versionCode": 6,
       "versionName": "0.14.2",
       "outputFile": "tv-libre-arm64-v8a-debug.apk"
+    },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 6,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-x86-debug.apk"
     }
   ],
   "elementType": "File",
diff --git a/app/tv/libre/release/baselineProfiles/0/tv-libre-arm64-v8a-release.dm b/app/tv/libre/release/baselineProfiles/0/tv-libre-arm64-v8a-release.dm
index bb3313ba..1b7277cd 100644
Binary files a/app/tv/libre/release/baselineProfiles/0/tv-libre-arm64-v8a-release.dm and b/app/tv/libre/release/baselineProfiles/0/tv-libre-arm64-v8a-release.dm differ
diff --git a/app/tv/libre/release/baselineProfiles/0/tv-libre-armeabi-v7a-release.dm b/app/tv/libre/release/baselineProfiles/0/tv-libre-armeabi-v7a-release.dm
index bb3313ba..1b7277cd 100644
Binary files a/app/tv/libre/release/baselineProfiles/0/tv-libre-armeabi-v7a-release.dm and b/app/tv/libre/release/baselineProfiles/0/tv-libre-armeabi-v7a-release.dm differ
diff --git a/app/tv/libre/release/baselineProfiles/0/tv-libre-x86-release.dm b/app/tv/libre/release/baselineProfiles/0/tv-libre-x86-release.dm
index bb3313ba..1b7277cd 100644
Binary files a/app/tv/libre/release/baselineProfiles/0/tv-libre-x86-release.dm and b/app/tv/libre/release/baselineProfiles/0/tv-libre-x86-release.dm differ
diff --git a/app/tv/libre/release/baselineProfiles/0/tv-libre-x86_64-release.dm b/app/tv/libre/release/baselineProfiles/0/tv-libre-x86_64-release.dm
index bb3313ba..1b7277cd 100644
Binary files a/app/tv/libre/release/baselineProfiles/0/tv-libre-x86_64-release.dm and b/app/tv/libre/release/baselineProfiles/0/tv-libre-x86_64-release.dm differ
diff --git a/app/tv/libre/release/baselineProfiles/1/tv-libre-arm64-v8a-release.dm b/app/tv/libre/release/baselineProfiles/1/tv-libre-arm64-v8a-release.dm
index 75305af3..1c7c9cba 100644
Binary files a/app/tv/libre/release/baselineProfiles/1/tv-libre-arm64-v8a-release.dm and b/app/tv/libre/release/baselineProfiles/1/tv-libre-arm64-v8a-release.dm differ
diff --git a/app/tv/libre/release/baselineProfiles/1/tv-libre-armeabi-v7a-release.dm b/app/tv/libre/release/baselineProfiles/1/tv-libre-armeabi-v7a-release.dm
index 75305af3..1c7c9cba 100644
Binary files a/app/tv/libre/release/baselineProfiles/1/tv-libre-armeabi-v7a-release.dm and b/app/tv/libre/release/baselineProfiles/1/tv-libre-armeabi-v7a-release.dm differ
diff --git a/app/tv/libre/release/baselineProfiles/1/tv-libre-x86-release.dm b/app/tv/libre/release/baselineProfiles/1/tv-libre-x86-release.dm
index 75305af3..1c7c9cba 100644
Binary files a/app/tv/libre/release/baselineProfiles/1/tv-libre-x86-release.dm and b/app/tv/libre/release/baselineProfiles/1/tv-libre-x86-release.dm differ
diff --git a/app/tv/libre/release/baselineProfiles/1/tv-libre-x86_64-release.dm b/app/tv/libre/release/baselineProfiles/1/tv-libre-x86_64-release.dm
index 75305af3..1c7c9cba 100644
Binary files a/app/tv/libre/release/baselineProfiles/1/tv-libre-x86_64-release.dm and b/app/tv/libre/release/baselineProfiles/1/tv-libre-x86_64-release.dm differ
diff --git a/app/tv/libre/release/output-metadata.json b/app/tv/libre/release/output-metadata.json
index cee3fefc..bf7c0aca 100644
--- a/app/tv/libre/release/output-metadata.json
+++ b/app/tv/libre/release/output-metadata.json
@@ -16,10 +16,23 @@
         }
       ],
       "attributes": [],
-      "versionCode": 1,
+      "versionCode": 6,
       "versionName": "0.14.2",
       "outputFile": "tv-libre-armeabi-v7a-release.apk"
     },
+    {
+      "type": "ONE_OF_MANY",
+      "filters": [
+        {
+          "filterType": "ABI",
+          "value": "x86"
+        }
+      ],
+      "attributes": [],
+      "versionCode": 6,
+      "versionName": "0.14.2",
+      "outputFile": "tv-libre-x86-release.apk"
+    },
     {
       "type": "ONE_OF_MANY",
       "filters": [
@@ -29,7 +42,7 @@
         }
       ],
       "attributes": [],
-      "versionCode": 1,
+      "versionCode": 6,
       "versionName": "0.14.2",
       "outputFile": "tv-libre-arm64-v8a-release.apk"
     },
@@ -42,22 +55,9 @@
         }
       ],
       "attributes": [],
-      "versionCode": 1,
+      "versionCode": 6,
       "versionName": "0.14.2",
       "outputFile": "tv-libre-x86_64-release.apk"
-    },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "x86"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 1,
-      "versionName": "0.14.2",
-      "outputFile": "tv-libre-x86-release.apk"
     }
   ],
   "elementType": "File",
@@ -67,9 +67,9 @@
       "maxApi": 30,
       "baselineProfiles": [
         "baselineProfiles/1/tv-libre-armeabi-v7a-release.dm",
+        "baselineProfiles/1/tv-libre-x86-release.dm",
         "baselineProfiles/1/tv-libre-arm64-v8a-release.dm",
-        "baselineProfiles/1/tv-libre-x86_64-release.dm",
-        "baselineProfiles/1/tv-libre-x86-release.dm"
+        "baselineProfiles/1/tv-libre-x86_64-release.dm"
       ]
     },
     {
@@ -77,9 +77,9 @@
       "maxApi": 2147483647,
       "baselineProfiles": [
         "baselineProfiles/0/tv-libre-armeabi-v7a-release.dm",
+        "baselineProfiles/0/tv-libre-x86-release.dm",
         "baselineProfiles/0/tv-libre-arm64-v8a-release.dm",
-        "baselineProfiles/0/tv-libre-x86_64-release.dm",
-        "baselineProfiles/0/tv-libre-x86-release.dm"
+        "baselineProfiles/0/tv-libre-x86_64-release.dm"
       ]
     }
   ],
diff --git a/core/src/main/res/xml/fragment_settings_appearance.xml b/core/src/main/res/xml/fragment_settings_appearance.xml
index 1a4c97b8..5933b242 100644
--- a/core/src/main/res/xml/fragment_settings_appearance.xml
+++ b/core/src/main/res/xml/fragment_settings_appearance.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:android="http://schemas.android.com/apk/res/android">
     <ListPreference
         app:defaultValue="system"
         app:entries="@array/themes"
@@ -22,4 +23,12 @@
         app:key="pref_display_extra_info"
         app:summary="@string/extra_info_summary"
         app:title="@string/extra_info" />
+    <SeekBarPreference
+        app:defaultValue="2"
+        app:key="pref_span_count"
+        android:max="5"
+        app:seekBarIncrement="1"
+        app:min="1"
+        app:showSeekBarValue="true"
+        app:title="Number of rows in libraries view" />
 </PreferenceScreen>
\ No newline at end of file
diff --git a/core/src/main/res/xml/fragment_settings_player.xml b/core/src/main/res/xml/fragment_settings_player.xml
index 6bde7e62..e9f5f0bb 100644
--- a/core/src/main/res/xml/fragment_settings_player.xml
+++ b/core/src/main/res/xml/fragment_settings_player.xml
@@ -9,7 +9,8 @@
         <SwitchPreferenceCompat
             app:key="pref_player_mpv"
             app:summary="@string/mpv_player_summary"
-            app:title="@string/mpv_player" />
+            app:title="@string/mpv_player"
+            app:defaultValue="true"/>
         <ListPreference
             app:defaultValue="mediacodec"
             app:dependency="pref_player_mpv"
diff --git a/preferences/src/main/java/com/nomadics9/ananas/AppPreferences.kt b/preferences/src/main/java/com/nomadics9/ananas/AppPreferences.kt
index fefdbaa2..bc1d381c 100644
--- a/preferences/src/main/java/com/nomadics9/ananas/AppPreferences.kt
+++ b/preferences/src/main/java/com/nomadics9/ananas/AppPreferences.kt
@@ -34,6 +34,7 @@ constructor(
     val theme get() = sharedPreferences.getString(Constants.PREF_THEME, null)
     val dynamicColors get() = sharedPreferences.getBoolean(Constants.PREF_DYNAMIC_COLORS, true)
     val amoledTheme get() = sharedPreferences.getBoolean(Constants.PREF_AMOLED_THEME, true)
+    val spanCount get() = sharedPreferences.getInt(Constants.PREF_SPAN_NO, 3)
     var displayExtraInfo: Boolean
         get() = sharedPreferences.getBoolean(Constants.PREF_DISPLAY_EXTRA_INFO, false)
         set(value) {
diff --git a/preferences/src/main/java/com/nomadics9/ananas/Constants.kt b/preferences/src/main/java/com/nomadics9/ananas/Constants.kt
index fe311862..a01f49db 100644
--- a/preferences/src/main/java/com/nomadics9/ananas/Constants.kt
+++ b/preferences/src/main/java/com/nomadics9/ananas/Constants.kt
@@ -38,6 +38,7 @@ object Constants {
     const val PREF_THEME = "theme"
     const val PREF_DYNAMIC_COLORS = "dynamic_colors"
     const val PREF_AMOLED_THEME = "pref_amoled_theme"
+    const val PREF_SPAN_NO = "pref_span_count"
     const val PREF_NETWORK_REQUEST_TIMEOUT = "pref_network_request_timeout"
     const val PREF_NETWORK_CONNECT_TIMEOUT = "pref_network_connect_timeout"
     const val PREF_NETWORK_SOCKET_TIMEOUT = "pref_network_socket_timeout"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b9ba4419..043f7485 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,7 +3,7 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 rootProject.name = "ananas"
 
 include(":app:phone")
-// include(":app:tv")
+include(":app:tv")
 include(":core")
 include(":data")
 include(":preferences")