diff --git a/lib/ui/home/memories_widget.dart b/lib/ui/home/memories_widget.dart
index db8017553..1fb2d1a7c 100644
--- a/lib/ui/home/memories_widget.dart
+++ b/lib/ui/home/memories_widget.dart
@@ -48,7 +48,10 @@ class MemoriesWidget extends StatelessWidget {
     }
     return SingleChildScrollView(
       scrollDirection: Axis.horizontal,
-      child: Row(children: memoryWidgets),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: memoryWidgets,
+      ),
     );
   }
 
@@ -106,27 +109,32 @@ class _MemoryWidgetState extends State<MemoryWidget> {
         );
         setState(() {});
       },
-      child: Expanded(
-        child: Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: Column(
-            children: [
-              _buildMemoryItem(context, index),
-              const Padding(padding: EdgeInsets.all(4)),
-              Hero(
-                tag: title,
-                child: Material(
-                  type: MaterialType.transparency,
-                  child: Text(
-                    title,
-                    style: getEnteTextTheme(context).mini,
-                    textAlign: TextAlign.center,
+      child: Row(
+        children: [
+          Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Column(
+              children: [
+                _buildMemoryItem(context, index),
+                const Padding(padding: EdgeInsets.all(4)),
+                Hero(
+                  tag: title,
+                  child: Material(
+                    type: MaterialType.transparency,
+                    child: ConstrainedBox(
+                      constraints: const BoxConstraints(maxWidth: 84),
+                      child: Text(
+                        title,
+                        style: getEnteTextTheme(context).mini,
+                        textAlign: TextAlign.center,
+                      ),
+                    ),
                   ),
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
-        ),
+        ],
       ),
     );
   }
diff --git a/lib/ui/home/status_bar_widget.dart b/lib/ui/home/status_bar_widget.dart
index 9b1b3a10a..93cbde102 100644
--- a/lib/ui/home/status_bar_widget.dart
+++ b/lib/ui/home/status_bar_widget.dart
@@ -91,13 +91,11 @@ class _StatusBarWidgetState extends State<StatusBarWidget> {
                   : const SyncStatusWidget()
               : const Text("ente", style: brandStyleMedium),
         ),
-        AnimatedOpacity(
-          opacity: _showErrorBanner ? 1 : 0,
-          duration: const Duration(milliseconds: 200),
-          child: const Divider(
-            height: 8,
-          ),
-        ),
+        _showErrorBanner
+            ? const Divider(
+                height: 8,
+              )
+            : const SizedBox.shrink(),
         _showErrorBanner
             ? HeaderErrorWidget(error: _syncError)
             : const SizedBox.shrink(),
diff --git a/lib/ui/viewer/file/zoomable_image.dart b/lib/ui/viewer/file/zoomable_image.dart
index 9087e0250..7ec646be7 100644
--- a/lib/ui/viewer/file/zoomable_image.dart
+++ b/lib/ui/viewer/file/zoomable_image.dart
@@ -279,7 +279,9 @@ class _ZoomableImageState extends State<ZoomableImage>
           (h != widget.photo.height || w != widget.photo.width)) {
         _logger.info('Updating aspect ratio for ${widget.photo} to $h:$w');
         await FileMagicService.instance.updatePublicMagicMetadata(
-            [widget.photo], {publicMagicKeyHeight: h, publicMagicKeyWidth: w});
+          [widget.photo],
+          {publicMagicKeyHeight: h, publicMagicKeyWidth: w},
+        );
       }
     }
   }
diff --git a/lib/utils/crypto_util.dart b/lib/utils/crypto_util.dart
index 8c1522453..44bce7c36 100644
--- a/lib/utils/crypto_util.dart
+++ b/lib/utils/crypto_util.dart
@@ -325,8 +325,11 @@ class CryptoUtil {
     args["destinationFilePath"] = destinationFilePath;
     args["header"] = header;
     args["key"] = key;
-    return _computer.compute(chachaDecryptFile,
-        param: args, taskName: "decryptFile");
+    return _computer.compute(
+      chachaDecryptFile,
+      param: args,
+      taskName: "decryptFile",
+    );
   }
 
   // Generates and returns a 256-bit key.