diff --git a/lib/model/image_collection.dart b/lib/model/image_collection.dart
index 3adca7b3b..793b8f9b3 100644
--- a/lib/model/image_collection.dart
+++ b/lib/model/image_collection.dart
@@ -93,7 +93,6 @@ class ImageCollection with ChangeNotifier {
   }
 
   loadCatalogMetadata() async {
-    debugPrint('$runtimeType loadCatalogMetadata start');
     final start = DateTime.now();
     final saved = await metadataDb.loadMetadataEntries();
     _rawEntries.forEach((entry) {
@@ -107,7 +106,6 @@ class ImageCollection with ChangeNotifier {
   }
 
   loadAddresses() async {
-    debugPrint('$runtimeType loadAddresses start');
     final start = DateTime.now();
     final saved = await metadataDb.loadAddresses();
     _rawEntries.forEach((entry) {
@@ -120,7 +118,6 @@ class ImageCollection with ChangeNotifier {
   }
 
   catalogEntries() async {
-    debugPrint('$runtimeType catalogEntries start');
     final start = DateTime.now();
     final uncataloguedEntries = _rawEntries.where((entry) => !entry.isCatalogued);
     final newMetadata = List<CatalogMetadata>();
@@ -134,7 +131,6 @@ class ImageCollection with ChangeNotifier {
   }
 
   locateEntries() async {
-    debugPrint('$runtimeType locateEntries start');
     final start = DateTime.now();
     final unlocatedEntries = _rawEntries.where((entry) => entry.hasGps && !entry.isLocated);
     final newAddresses = List<AddressDetails>();
diff --git a/lib/widgets/fullscreen/info/info_page.dart b/lib/widgets/fullscreen/info/info_page.dart
index 70c9e7f15..838d3f60c 100644
--- a/lib/widgets/fullscreen/info/info_page.dart
+++ b/lib/widgets/fullscreen/info/info_page.dart
@@ -47,21 +47,23 @@ class InfoPageState extends State<InfoPage> {
         ),
         title: Text('Info'),
       ),
-      body: NotificationListener(
-        onNotification: _handleTopScroll,
-        child: ListView(
-          padding: EdgeInsets.all(8.0) + EdgeInsets.only(bottom: bottomInsets),
-          children: [
-            InfoRow('Title', entry.title),
-            InfoRow('Date', dateText),
-            if (entry.isVideo) ..._buildVideoRows(),
-            InfoRow('Resolution', resolutionText),
-            InfoRow('Size', formatFilesize(entry.sizeBytes)),
-            InfoRow('Path', entry.path),
-            LocationSection(entry: entry),
-            XmpTagSection(collection: widget.collection, entry: entry),
-            MetadataSection(entry: entry),
-          ],
+      body: SafeArea(
+        child: NotificationListener(
+          onNotification: _handleTopScroll,
+          child: ListView(
+            padding: EdgeInsets.all(8.0) + EdgeInsets.only(bottom: bottomInsets),
+            children: [
+              InfoRow('Title', entry.title),
+              InfoRow('Date', dateText),
+              if (entry.isVideo) ..._buildVideoRows(),
+              InfoRow('Resolution', resolutionText),
+              InfoRow('Size', formatFilesize(entry.sizeBytes)),
+              InfoRow('Path', entry.path),
+              LocationSection(entry: entry),
+              XmpTagSection(collection: widget.collection, entry: entry),
+              MetadataSection(entry: entry),
+            ],
+          ),
         ),
       ),
       resizeToAvoidBottomInset: false,
diff --git a/lib/widgets/fullscreen/info/location_section.dart b/lib/widgets/fullscreen/info/location_section.dart
index fc2188713..e02106329 100644
--- a/lib/widgets/fullscreen/info/location_section.dart
+++ b/lib/widgets/fullscreen/info/location_section.dart
@@ -18,6 +18,7 @@ class LocationSection extends AnimatedWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               SectionRow('Location'),
+              SizedBox(height: 8),
               ImageMap(
                 markerId: entry.path,
                 latLng: LatLng(