diff --git a/src/components/Local/LastEvents.vue b/src/components/Local/LastEvents.vue
index d319a300c..cb068a82f 100644
--- a/src/components/Local/LastEvents.vue
+++ b/src/components/Local/LastEvents.vue
@@ -6,18 +6,7 @@
     v-on="attrs"
   >
     <template #title>
-      {{ t("Upcoming events") }}
-    </template>
-    <template #subtitle>
-      <i18n-t
-        class="text-slate-700 dark:text-slate-300"
-        tag="p"
-        keypath="On {instance} and other federated instances"
-      >
-        <template #instance>
-          <b>{{ instanceName }}</b>
-        </template>
-      </i18n-t>
+      {{ t("Agenda") }}
     </template>
     <template #content>
       <skeleton-event-result
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index e0646441c..1243c0e83 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -186,11 +186,21 @@
             v-model:location="location"
           />
 
-          <li class="m-auto">
+          <li class="m-auto" v-if="islongEvents">
+            <router-link
+              :to="{
+                name: RouteName.SEARCH,
+                query: { contentType: 'SHORTEVENTS' },
+              }"
+              class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
+              >{{ t("Events") }}</router-link
+            >
+          </li>
+          <li class="m-auto" v-else>
             <router-link
               :to="{ name: RouteName.SEARCH, query: { contentType: 'EVENTS' } }"
               class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
-              >{{ t("Agenda") }}</router-link
+              >{{ t("Events") }}</router-link
             >
           </li>
           <li class="m-auto" v-if="islongEvents">
@@ -224,21 +234,21 @@
               >{{ t("My events") }}</router-link
             >
           </li>
-          <li v-if="currentActor?.id">
+          <li class="m-auto" v-if="currentActor?.id">
             <router-link
               :to="{ name: RouteName.MY_GROUPS }"
               class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
               >{{ t("My groups") }}</router-link
             >
           </li>
-          <li v-if="!currentActor?.id">
+          <li class="m-auto" v-if="!currentActor?.id">
             <router-link
               :to="{ name: RouteName.LOGIN }"
               class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
               >{{ t("Login") }}</router-link
             >
           </li>
-          <li v-if="!currentActor?.id && canRegister">
+          <li class="m-auto" v-if="!currentActor?.id && canRegister">
             <router-link
               :to="{ name: RouteName.REGISTER }"
               class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index d1c36be63..2e12a387c 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -23,8 +23,6 @@
       />
     </div>
   </section>
-  <!-- Unlogged introduction -->
-  <unlogged-introduction :config="config" v-if="config && !isLoggedIn" />
   <!-- Search fields -->
   <search-fields v-model:search="search" v-model:location="location" />
   <!-- Categories preview -->
@@ -144,8 +142,6 @@
   <CloseGroups :userLocation="userLocation" @doGeoLoc="performGeoLocation()" />
   <OnlineEvents />
   <LastEvents v-if="instanceName" :instanceName="instanceName" />
-  <!-- Unlogged content section -->
-  <presentation v-if="!currentUser?.isLoggedIn" />
 </template>
 
 <script lang="ts" setup>
@@ -181,9 +177,7 @@ import {
   UPDATE_CURRENT_USER_LOCATION_CLIENT,
 } from "@/graphql/location";
 import { LocationType } from "@/types/user-location.model";
-import Presentation from "@/components/Home/MobilizonPresentation.vue";
 import CategoriesPreview from "@/components/Home/CategoriesPreview.vue";
-import UnloggedIntroduction from "@/components/Home/UnloggedIntroduction.vue";
 import SearchFields from "@/components/Home/SearchFields.vue";
 import { useHead } from "@unhead/vue";
 import { geoHashToCoords } from "@/utils/location";
@@ -366,7 +360,6 @@ watch(loggedUser, (loggedUserValue) => {
     });
   }
 });
-const isLoggedIn = computed(() => loggedUser.value?.id !== undefined);
 
 /**
  * Geolocation stuff