diff --git a/components/calendar/Calendar.vue b/components/calendar/Calendar.vue
index 6cb9a1c..8e4e5f9 100644
--- a/components/calendar/Calendar.vue
+++ b/components/calendar/Calendar.vue
@@ -40,7 +40,7 @@ onMounted(() => {
 
       <component :is="currentViewComponent" />
 
-      <LazyCalendarSearch />
+      <CalendarSearch />
       <LazyCalendarDialogCategories v-if="!isReadOnly" />
       <LazyCalendarDialogUpdateEvent v-if="!isReadOnly" />
       <LazyCalendarDialogDeleteEvent v-if="!isReadOnly" />
diff --git a/components/calendar/event/Event.vue b/components/calendar/event/Event.vue
index 67f6d01..ac89de4 100644
--- a/components/calendar/event/Event.vue
+++ b/components/calendar/event/Event.vue
@@ -75,7 +75,7 @@ onMounted(() => {
       </button>
     </UiPopoverTrigger>
 
-    <LazyCalendarEventDetails
+    <CalendarEventDetails
       :event
       :spans-multiple-days
       :is-start-event
diff --git a/pages/calendars/[id].vue b/pages/calendars/[id].vue
index f459de0..9fb871d 100644
--- a/pages/calendars/[id].vue
+++ b/pages/calendars/[id].vue
@@ -64,21 +64,21 @@ watch(isLoading, (n) => {
     <div class="grid justify-items-center opacity-80">
       <PhCalendarX size="75" class="opacity-60" />
 
-      <LazyHeading level="h1">
+      <Heading level="h1">
         {{ $t("entity.calendar.notFound") }}
-      </LazyHeading>
+      </Heading>
 
       <p>
         {{ $t('entity.calendar.notFoundDescription') }}
       </p>
 
-      <LazyUiButton variant="default" class="mt-4 gap-2" as-child>
+      <UiButton variant="default" class="mt-4 gap-2" as-child>
         <RouterLink to="/explore">
           <PhArrowBendDoubleUpLeft size="24" />
 
           {{ $t('entity.calendar.backToList') }}
         </RouterLink>
-      </LazyUiButton>
+      </UiButton>
     </div>
   </div>
 </template>
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 3d65a3c..ac987c0 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -153,8 +153,8 @@ function hideEditModal() {
       </Spacing>
     </section>
 
-    <LazyWorldDialogCreate :modal-state="isCreateWorldModalOpen" @on-close="hideCreateDialog" />
-    <LazyWorldDialogEdit :world="markedWorld" :modal-state="isEditWorldModalOpen" @on-close="hideEditModal" />
-    <LazyWorldDialogDelete :world="markedWorld" :modal-state="isDeleteWorldModalOpen" @on-close="hideDeleteModal" />
+    <WorldDialogCreate :modal-state="isCreateWorldModalOpen" @on-close="hideCreateDialog" />
+    <WorldDialogEdit :world="markedWorld" :modal-state="isEditWorldModalOpen" @on-close="hideEditModal" />
+    <WorldDialogDelete :world="markedWorld" :modal-state="isDeleteWorldModalOpen" @on-close="hideDeleteModal" />
   </main>
 </template>
diff --git a/pages/my/worlds/[id].vue b/pages/my/worlds/[id].vue
index d03d190..662d6d7 100644
--- a/pages/my/worlds/[id].vue
+++ b/pages/my/worlds/[id].vue
@@ -251,10 +251,10 @@ function hideEditModal() {
         </Spacing>
       </section>
 
-      <LazyWorldDialogEdit :world="world.data" :modal-state="isEditWorldModalOpen" @on-close="hideEditModal" />
-      <LazyCalendarDialogCreate :world="world.data" :modal-state="isCreateCalendarModalOpen" @on-close="hideCreateDialog" />
-      <LazyCalendarDialogUpdate v-if="markedCalendar?.id" :world="world.data" :calendar="markedCalendar" :modal-state="isUpdateCalendarModalOpen" @on-close="hideUpdateDialog" />
-      <LazyCalendarDialogDelete :calendar="markedCalendar" :modal-state="isDeleteCalendarModalOpen" @on-close="hideDeleteCalendarModal"/>
+      <WorldDialogEdit :world="world.data" :modal-state="isEditWorldModalOpen" @on-close="hideEditModal" />
+      <CalendarDialogCreate :world="world.data" :modal-state="isCreateCalendarModalOpen" @on-close="hideCreateDialog" />
+      <CalendarDialogUpdate :world="world.data" :calendar="markedCalendar" :modal-state="isUpdateCalendarModalOpen" @on-close="hideUpdateDialog" />
+      <CalendarDialogDelete :calendar="markedCalendar" :modal-state="isDeleteCalendarModalOpen" @on-close="hideDeleteCalendarModal"/>
     </template>
     <template v-else>
       <div class="h-full w-full grid place-items-center">