diff --git a/android/app/build.gradle b/android/app/build.gradle
index 0a09bd6b..602b94cb 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -126,6 +126,15 @@ android {
     androidResources {
         ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~'
     }
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            universalApk true
+        }
+    }
 }
 
 // Apply static values from `gradle.properties` to the `android.packagingOptions`
diff --git a/src/screens/CalendarScreen.tsx b/src/screens/CalendarScreen.tsx
index 3ca02627..162f69bf 100644
--- a/src/screens/CalendarScreen.tsx
+++ b/src/screens/CalendarScreen.tsx
@@ -236,43 +236,6 @@ const CalendarScreen = () => {
     setFilteredEpisodes([]);
   }, []);
   
-  if (libraryItems.length === 0 && !libraryLoading) {
-    return (
-      <SafeAreaView style={[styles.container, { backgroundColor: currentTheme.colors.darkBackground }]}>
-        <StatusBar barStyle="light-content" />
-        
-        <View style={[styles.header, { borderBottomColor: currentTheme.colors.border }]}>
-          <TouchableOpacity 
-            style={styles.backButton}
-            onPress={() => navigation.goBack()}
-          >
-            <MaterialIcons name="arrow-back" size={24} color={currentTheme.colors.text} />
-          </TouchableOpacity>
-          <Text style={[styles.headerTitle, { color: currentTheme.colors.text }]}>Calendar</Text>
-          <View style={{ width: 40 }} />
-        </View>
-        
-        <View style={styles.emptyLibraryContainer}>
-          <MaterialIcons name="video-library" size={64} color={currentTheme.colors.lightGray} />
-          <Text style={styles.emptyText}>
-            Your library is empty
-          </Text>
-          <Text style={styles.emptySubtext}>
-            Add series to your library to see their upcoming episodes in the calendar
-          </Text>
-          <TouchableOpacity 
-            style={styles.discoverButton}
-            onPress={() => navigation.navigate('MainTabs')}
-          >
-            <Text style={styles.discoverButtonText}>
-              Return to Home
-            </Text>
-          </TouchableOpacity>
-        </View>
-      </SafeAreaView>
-    );
-  }
-  
   if (loading && !refreshing) {
     return (
       <SafeAreaView style={[styles.container, { backgroundColor: currentTheme.colors.darkBackground }]}>
@@ -353,6 +316,7 @@ const CalendarScreen = () => {
           renderItem={renderEpisodeItem}
           renderSectionHeader={renderSectionHeader}
           contentContainerStyle={styles.listContent}
+          removeClippedSubviews={false}
           refreshControl={
             <RefreshControl
               refreshing={refreshing}