diff --git a/js/src/components/Map.vue b/js/src/components/Map.vue
index 9adea662..0a8bedda 100644
--- a/js/src/components/Map.vue
+++ b/js/src/components/Map.vue
@@ -6,7 +6,12 @@
                 class="leaflet-map"
                 :center="[lat, lon]"
         >
-            <l-tile-layer url="http://{s}.tile.osm.org/{z}/{x}/{y}.png"></l-tile-layer>
+            <l-tile-layer
+                    url="https://{s}.tile.osm.org/{z}/{x}/{y}.png"
+                    attribution="© OpenStreetMap contributors"
+            >
+
+            </l-tile-layer>
             <l-marker :lat-lng="[lat, lon]" >
                 <l-popup v-if="popup">{{ popup }}</l-popup>
             </l-marker>
diff --git a/js/src/views/Event/Event.vue b/js/src/views/Event/Event.vue
index 0596bf6a..b0a8eb69 100644
--- a/js/src/views/Event/Event.vue
+++ b/js/src/views/Event/Event.vue
@@ -75,17 +75,11 @@
                     <span>{{ event.physicalAddress.postal_code }} {{ event.physicalAddress.locality }}</span>
   <!--                  <span>{{ event.physicalAddress.region }} {{ event.physicalAddress.country }}</span>-->
                   </address>
-                  <span class="map-show-button" @click="showMap = !showMap">
+                  <span class="map-show-button" @click="showMap = !showMap" v-if="event.physicalAddress && event.physicalAddress.geom">
                     <translate>Show map</translate>
                   </span>
                 </div>
-<!--                <div class="map" v-if="showMap">-->
-<!--                  <map-leaflet-->
-<!--                          :coords="event.physicalAddress.geom"-->
-<!--                          :popup="event.physicalAddress.description"-->
-<!--                  />-->
-<!--                </div>-->
-                <b-modal v-if="event.physicalAddress" :active.sync="showMap" :width="800" scroll="keep">
+                <b-modal v-if="event.physicalAddress && event.physicalAddress.geom" :active.sync="showMap" :width="800" scroll="keep">
                   <div class="map">
                     <map-leaflet
                             :coords="event.physicalAddress.geom"
@@ -222,10 +216,10 @@
           </div>
         </div>
       </section>
-      <section class="more-events container">
+      <section class="more-events container" v-if="event.relatedEvents.length > 0">
         <h3 class="title has-text-centered"><translate>These events may interest you</translate></h3>
         <div class="columns">
-          <div class="column" v-for="relatedEvent in event.relatedEvents" :key="relatedEvent.uuid">
+          <div class="column is-one-third-desktop" v-for="relatedEvent in event.relatedEvents" :key="relatedEvent.uuid">
             <EventCard :event="relatedEvent" />
           </div>
         </div>