diff --git a/lib/ui/sharing/album_participants_page.dart b/lib/ui/sharing/album_participants_page.dart
index bf7b7990855238756d38ed1439b6675ffce1ff26..ec9b9b410d6ee1c7695c3b48fbd0e8475ae15a80 100644
--- a/lib/ui/sharing/album_participants_page.dart
+++ b/lib/ui/sharing/album_participants_page.dart
@@ -139,6 +139,8 @@ class _AlbumParticipantsPageState extends State<AlbumParticipantsPage> {
                     final currentUser = collaborators[listIndex];
                     final isSameAsLoggedInUser =
                         currentUserID == currentUser.id;
+                    final isLastItem =
+                        !isOwner && index == collaborators.length;
                     return Column(
                       children: [
                         MenuItemWidget(
@@ -165,13 +167,15 @@ class _AlbumParticipantsPageState extends State<AlbumParticipantsPage> {
                                 }
                               : null,
                           isTopBorderRadiusRemoved: listIndex > 0,
-                          isBottomBorderRadiusRemoved: true,
+                          isBottomBorderRadiusRemoved: !isLastItem,
                           singleBorderRadius: 8,
                         ),
-                        DividerWidget(
-                          dividerType: DividerType.menu,
-                          bgColor: getEnteColorScheme(context).blurStrokeFaint,
-                        ),
+                        isLastItem
+                            ? const SizedBox.shrink()
+                            : DividerWidget(
+                                dividerType: DividerType.menu,
+                                bgColor: getEnteColorScheme(context).fillFaint,
+                              ),
                       ],
                     );
                   } else if (index == (1 + collaborators.length) && isOwner) {
@@ -234,7 +238,7 @@ class _AlbumParticipantsPageState extends State<AlbumParticipantsPage> {
                           onTap: isOwner
                               ? () async {
                                   if (isOwner) {
-                                    await _navigateToManageUser(currentUser);
+                                    _navigateToManageUser(currentUser);
                                   }
                                 }
                               : null,
diff --git a/lib/ui/viewer/file/file_info_widget.dart b/lib/ui/viewer/file/file_info_widget.dart
index e40c1c1652895f2febb81fb8c32c04b4c7ef1279..4435a37c60c97e6d4d1eebb700e8148d0faa3365 100644
--- a/lib/ui/viewer/file/file_info_widget.dart
+++ b/lib/ui/viewer/file/file_info_widget.dart
@@ -160,7 +160,7 @@ class _FileInfoWidgetState extends State<FileInfoWidget> {
           path.basenameWithoutExtension(file.displayName) +
               path.extension(file.displayName).toUpperCase(),
         ),
-        subtitle: Row(
+        subtitle: Wrap(
           children: [
             showDimension
                 ? Text(
@@ -193,7 +193,7 @@ class _FileInfoWidgetState extends State<FileInfoWidget> {
               horizontalTitleGap: 2,
               leading: const Icon(Icons.camera_rounded),
               title: Text(_exifData["takenOnDevice"] ?? "--"),
-              subtitle: Row(
+              subtitle: Wrap(
                 children: [
                   _exifData["fNumber"] != null
                       ? Padding(