diff --git a/src/components/flights/FlightBasicInfo.vue b/src/components/flights/FlightBasicInfo.vue
index ff91960..2cb9a7d 100644
--- a/src/components/flights/FlightBasicInfo.vue
+++ b/src/components/flights/FlightBasicInfo.vue
@@ -134,7 +134,7 @@ const props = defineProps({
       </q-item-section>
     </q-item>
 
-    <q-item v-if="flight.event && flight.event.isPublic">
+    <q-item v-if="flight.event && (loggedUser || flight.event.isPublic)">
       <q-item-section avatar>
         <q-icon name="event"/>
       </q-item-section>
diff --git a/src/components/flights/FlightTrackMap.vue b/src/components/flights/FlightTrackMap.vue
index 46a1d1f..120c8ef 100644
--- a/src/components/flights/FlightTrackMap.vue
+++ b/src/components/flights/FlightTrackMap.vue
@@ -102,16 +102,18 @@ const chartOptions = {
 
 <template>
   <q-no-ssr>
-    <MapWithMarkers
-      v-if="displayMap"
-      style="width: 100%; height: 500px;"
-      :gpx-track="flight.gpxTrack?.coordinates || []"
-      :markers="pointsOfInterests"
-      :highlight-position="currentPositionMarker"
-      :photos="mapPhotos"
-    />
+    <q-intersection>
+      <MapWithMarkers
+        v-if="displayMap"
+        style="width: 100%; height: 500px;"
+        :gpx-track="flight.gpxTrack?.coordinates || []"
+        :markers="pointsOfInterests"
+        :highlight-position="currentPositionMarker"
+        :photos="mapPhotos"
+      />
 
-    <Line v-if="gpxTrack" :data="chartSpeedData" :options="chartOptions"/>
-    <Line v-if="gpxTrack" :data="chartAltitudeData" :options="chartOptions"/>
+      <Line v-if="gpxTrack" :data="chartSpeedData" :options="chartOptions"/>
+      <Line v-if="gpxTrack" :data="chartAltitudeData" :options="chartOptions"/>
+    </q-intersection>
   </q-no-ssr>
 </template>
diff --git a/src/components/photos/PhotoGallery.vue b/src/components/photos/PhotoGallery.vue
index 85eaab3..527801b 100644
--- a/src/components/photos/PhotoGallery.vue
+++ b/src/components/photos/PhotoGallery.vue
@@ -81,26 +81,27 @@ watch(() => [openedPhoto.value, $lightbox.value], () => {
 
 <template>
   <div :id="galleryId" class="row">
-    <div class="col-6 col-sm-4 col-md-4 col-lg-3 q-pa-sm" v-for="photo in photos" :key="photo.id">
-      <a
-        :href="photo.url"
-        :data-pswp-width="photo.width"
-        :data-pswp-height="photo.height"
-        target="_blank"
-        rel="noreferrer"
-      >
-        <q-img
-          spinner-color="primary"
-          class="rounded-borders"
-          :src="photo.thumbnailUrl"
-          alt=""
+    <q-intersection v-for="photo in photos" :key="photo.id" class="col-6 col-sm-4 col-md-4 col-lg-3 q-pa-sm">
+        <a
+          :href="photo.url"
+          :data-pswp-width="photo.width"
+          :data-pswp-height="photo.height"
+          target="_blank"
+          rel="noreferrer"
         >
-          <div class="absolute-bottom" v-if="photo.name !== ''">
-            {{ photo.name }}
-          </div>
-        </q-img>
-        <PhotoCaption :photo="photo"/>
-      </a>
-    </div>
+          <q-img
+            spinner-color="primary"
+            class="rounded-borders"
+            :src="photo.thumbnailUrl"
+            alt=""
+          >
+            <div class="absolute-bottom" v-if="photo.name !== ''">
+              {{ photo.name }}
+            </div>
+          </q-img>
+          <PhotoCaption :photo="photo"/>
+        </a>
+    </q-intersection>
+
   </div>
 </template>