diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt
index 38e8d93f7fd09f191051317ce31ead47990d6b3c..b4acc8670a0414091e09021a6fa30e5fee105c81 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt
@@ -238,7 +238,10 @@ private fun TabbedItemGroups(
         }
     }
     HorizontalDivider()
-    HorizontalPager(model.pagerState) { index ->
+    HorizontalPager(
+        model.pagerState,
+        beyondViewportPageCount = 4
+    ) { index ->
         if (index == 0) CustomItems(
             state = model.customItemsState,
             cart = model.cart,
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/cards/Item.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/cards/Item.kt
index 746ad62f788708cb2cf5a2492754aae23f7a6702..29429ce1f8ed61d1dae169c7ceb2d99c25b72b4a 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/cards/Item.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/cards/Item.kt
@@ -63,6 +63,7 @@ import net.novagamestudios.kaffeekasse.model.kaffeekasse.Item
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.KnownItem
 import net.novagamestudios.kaffeekasse.model.kaffeekasse.Transaction
 import net.novagamestudios.kaffeekasse.model.session.Session
+import net.novagamestudios.kaffeekasse.ui.theme.ifAnimationsEnabled
 import net.novagamestudios.kaffeekasse.util.richdata.collectAsRichState
 
 @Composable
@@ -105,8 +106,8 @@ fun ItemCard(
     AnimatedVisibility(
         visible = count > 0,
         Modifier.align(Alignment.CenterHorizontally),
-        enter = fadeIn(buttonsAnimationSpec()) + expandVertically(buttonsAnimationSpec()),
-        exit = fadeOut(buttonsAnimationSpec()) + shrinkVertically(buttonsAnimationSpec())
+        enter = (fadeIn(buttonsAnimationSpec()) + expandVertically(buttonsAnimationSpec())).ifAnimationsEnabled(),
+        exit = (fadeOut(buttonsAnimationSpec()) + shrinkVertically(buttonsAnimationSpec())).ifAnimationsEnabled()
     ) {
         ItemAmountControls(
             count = count,
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 41c5bac1df596447a49483a98054120e4495d206..07c746185e738e583ad154fb628c2f0724ec1ef3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -92,7 +92,7 @@ dependencyResolutionManagement {
             library("acra-limiter", "ch.acra", "acra-limiter").versionRef("acra")
             library("acra-advancedscheduler", "ch.acra", "acra-advanced-scheduler").versionRef("acra")
 
-            library("commonutils", "com.gitlab.JojoIV", "common_utils").version("2d5e5c9a17")
+            library("commonutils", "com.gitlab.JojoIV", "common_utils").version("ee87e097c5")
         }
     }
 }