diff --git a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/loading.tsx b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/loading.tsx
new file mode 100644
index 000000000..aed94918c
--- /dev/null
+++ b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/loading.tsx
@@ -0,0 +1,5 @@
+import BreadcrumbsSkeleton from "@/components/Breadcrumbs/BreadcrumbsSkeleton"
+
+export default function Loading() {
+  return <BreadcrumbsSkeleton />
+}
diff --git a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx
index 6775fd188..a5b818f77 100644
--- a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx
@@ -1,7 +1,4 @@
-import { Suspense } from "react"
-
 import Breadcrumbs from "@/components/Breadcrumbs"
-import BreadcrumbsSkeleton from "@/components/Breadcrumbs/BreadcrumbsSkeleton"
 import { setLang } from "@/i18n/serverContext"
 
 import { LangParams, PageArgs } from "@/types/params"
@@ -9,9 +6,5 @@ import { LangParams, PageArgs } from "@/types/params"
 export default function AllBreadcrumbs({ params }: PageArgs<LangParams>) {
   setLang(params.lang)
 
-  return (
-    <Suspense fallback={<BreadcrumbsSkeleton />}>
-      <Breadcrumbs />
-    </Suspense>
-  )
+  return <Breadcrumbs />
 }
diff --git a/app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/loading.tsx b/app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/loading.tsx
new file mode 100644
index 000000000..aed94918c
--- /dev/null
+++ b/app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/loading.tsx
@@ -0,0 +1,5 @@
+import BreadcrumbsSkeleton from "@/components/Breadcrumbs/BreadcrumbsSkeleton"
+
+export default function Loading() {
+  return <BreadcrumbsSkeleton />
+}
diff --git a/app/[lang]/(live)/(public)/[contentType]/[uid]/@preview/loading.tsx b/app/[lang]/(live)/(public)/[contentType]/[uid]/@preview/loading.tsx
new file mode 100644
index 000000000..029d8ce71
--- /dev/null
+++ b/app/[lang]/(live)/(public)/[contentType]/[uid]/@preview/loading.tsx
@@ -0,0 +1,11 @@
+import { env } from "@/env/server"
+
+import CurrentLoadingSpinner from "@/components/Current/LoadingSpinner"
+import LoadingSpinner from "@/components/LoadingSpinner"
+
+export default function LoadingFooter() {
+  if (env.HIDE_FOR_NEXT_RELEASE) {
+    return <CurrentLoadingSpinner />
+  }
+  return <LoadingSpinner />
+}
diff --git a/app/[lang]/(live)/@bookingwidget/[...path]/loading.tsx b/app/[lang]/(live)/@bookingwidget/[...path]/loading.tsx
new file mode 100644
index 000000000..1c031d2a1
--- /dev/null
+++ b/app/[lang]/(live)/@bookingwidget/[...path]/loading.tsx
@@ -0,0 +1 @@
+export { default } from "../loading"
diff --git a/app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/[...paths]/page.tsx b/app/[lang]/(live)/@bookingwidget/[...path]/page.tsx
similarity index 100%
rename from app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/[...paths]/page.tsx
rename to app/[lang]/(live)/@bookingwidget/[...path]/page.tsx
diff --git a/app/[lang]/(live)/@bookingwidget/[contentType]/[uid]/page.tsx b/app/[lang]/(live)/@bookingwidget/[contentType]/[uid]/page.tsx
deleted file mode 100644
index 2ebaca014..000000000
--- a/app/[lang]/(live)/@bookingwidget/[contentType]/[uid]/page.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../../page"
diff --git a/app/[lang]/(live)/@bookingwidget/default.tsx b/app/[lang]/(live)/@bookingwidget/default.tsx
index 83ec2818e..6f2a78256 100644
--- a/app/[lang]/(live)/@bookingwidget/default.tsx
+++ b/app/[lang]/(live)/@bookingwidget/default.tsx
@@ -1 +1,14 @@
-export { default } from "./page"
+import { Suspense } from "react"
+
+import Loading from "./loading"
+import Page from "./page"
+
+import { PageArgs } from "@/types/params"
+
+export default function Default(props: PageArgs<{}, URLSearchParams>) {
+  return (
+    <Suspense fallback={<Loading />}>
+      <Page {...props} />
+    </Suspense>
+  )
+}
diff --git a/app/[lang]/(live)/@bookingwidget/hotelreservation/[...paths]/page.tsx b/app/[lang]/(live)/@bookingwidget/hotelreservation/[...paths]/page.tsx
deleted file mode 100644
index 2ebaca014..000000000
--- a/app/[lang]/(live)/@bookingwidget/hotelreservation/[...paths]/page.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../../page"
diff --git a/app/[lang]/(live)/@bookingwidget/my-pages/[...path]/page.tsx b/app/[lang]/(live)/@bookingwidget/my-pages/[...path]/page.tsx
deleted file mode 100644
index 2ebaca014..000000000
--- a/app/[lang]/(live)/@bookingwidget/my-pages/[...path]/page.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../../page"
diff --git a/app/[lang]/(live)/@footer/[...path]/loading.tsx b/app/[lang]/(live)/@footer/[...path]/loading.tsx
new file mode 100644
index 000000000..1c031d2a1
--- /dev/null
+++ b/app/[lang]/(live)/@footer/[...path]/loading.tsx
@@ -0,0 +1 @@
+export { default } from "../loading"
diff --git a/app/[lang]/(live)/@bookingwidget/[...paths]/page.tsx b/app/[lang]/(live)/@footer/[...path]/page.tsx
similarity index 100%
rename from app/[lang]/(live)/@bookingwidget/[...paths]/page.tsx
rename to app/[lang]/(live)/@footer/[...path]/page.tsx
diff --git a/app/[lang]/(live)/@footer/[contentType]/[uid]/page.tsx b/app/[lang]/(live)/@footer/[contentType]/[uid]/page.tsx
deleted file mode 100644
index 2ebaca014..000000000
--- a/app/[lang]/(live)/@footer/[contentType]/[uid]/page.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../../page"
diff --git a/app/[lang]/(live)/@footer/default.tsx b/app/[lang]/(live)/@footer/default.tsx
deleted file mode 100644
index 83ec2818e..000000000
--- a/app/[lang]/(live)/@footer/default.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./page"
diff --git a/app/[lang]/(live)/@footer/my-pages/[...path]/page.tsx b/app/[lang]/(live)/@footer/my-pages/[...path]/page.tsx
deleted file mode 100644
index 2ebaca014..000000000
--- a/app/[lang]/(live)/@footer/my-pages/[...path]/page.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../../page"
diff --git a/app/[lang]/(live)/@header/[...path]/loading.tsx b/app/[lang]/(live)/@header/[...path]/loading.tsx
new file mode 100644
index 000000000..1c031d2a1
--- /dev/null
+++ b/app/[lang]/(live)/@header/[...path]/loading.tsx
@@ -0,0 +1 @@
+export { default } from "../loading"
diff --git a/app/[lang]/(live)/@bookingwidget/hotelreservation/page.tsx b/app/[lang]/(live)/@header/[...path]/page.tsx
similarity index 100%
rename from app/[lang]/(live)/@bookingwidget/hotelreservation/page.tsx
rename to app/[lang]/(live)/@header/[...path]/page.tsx
diff --git a/app/[lang]/(live)/@header/[...paths]/page.tsx b/app/[lang]/(live)/@header/[...paths]/page.tsx
deleted file mode 100644
index 03a82e5f5..000000000
--- a/app/[lang]/(live)/@header/[...paths]/page.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../page"
diff --git a/app/[lang]/(live)/@header/[contentType]/[uid]/page.tsx b/app/[lang]/(live)/@header/[contentType]/[uid]/page.tsx
deleted file mode 100644
index 2ebaca014..000000000
--- a/app/[lang]/(live)/@header/[contentType]/[uid]/page.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../../page"
diff --git a/app/[lang]/(live)/@header/default.tsx b/app/[lang]/(live)/@header/default.tsx
deleted file mode 100644
index 83ec2818e..000000000
--- a/app/[lang]/(live)/@header/default.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./page"
diff --git a/app/[lang]/(live)/@header/loading.tsx b/app/[lang]/(live)/@header/loading.tsx
new file mode 100644
index 000000000..a54009331
--- /dev/null
+++ b/app/[lang]/(live)/@header/loading.tsx
@@ -0,0 +1,5 @@
+import HeaderFallback from "@/components/Current/Header/HeaderFallback"
+
+export default function LoadingFooter() {
+  return <HeaderFallback />
+}
diff --git a/app/[lang]/(live)/@header/my-pages/[...path]/page.tsx b/app/[lang]/(live)/@header/my-pages/[...path]/page.tsx
deleted file mode 100644
index 2ebaca014..000000000
--- a/app/[lang]/(live)/@header/my-pages/[...path]/page.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../../page"
diff --git a/app/[lang]/(live)/@header/page.tsx b/app/[lang]/(live)/@header/page.tsx
index 51e91035d..9d777ffef 100644
--- a/app/[lang]/(live)/@header/page.tsx
+++ b/app/[lang]/(live)/@header/page.tsx
@@ -1,9 +1,6 @@
-import { Suspense } from "react"
-
 import { env } from "@/env/server"
 
 import CurrentHeader from "@/components/Current/Header"
-import HeaderFallback from "@/components/Current/Header/HeaderFallback"
 import Header from "@/components/Header"
 import { setLang } from "@/i18n/serverContext"
 
@@ -13,11 +10,7 @@ export default function HeaderPage({ params }: PageArgs<LangParams>) {
   setLang(params.lang)
 
   if (env.HIDE_FOR_NEXT_RELEASE) {
-    return (
-      <Suspense fallback={<HeaderFallback />}>
-        <CurrentHeader />
-      </Suspense>
-    )
+    return <CurrentHeader />
   }
 
   return <Header />
diff --git a/app/[lang]/(live)/@sitewidealert/[...path]/loading.tsx b/app/[lang]/(live)/@sitewidealert/[...path]/loading.tsx
new file mode 100644
index 000000000..1c031d2a1
--- /dev/null
+++ b/app/[lang]/(live)/@sitewidealert/[...path]/loading.tsx
@@ -0,0 +1 @@
+export { default } from "../loading"
diff --git a/app/[lang]/(live)/@footer/[...paths]/page.tsx b/app/[lang]/(live)/@sitewidealert/[...path]/page.tsx
similarity index 100%
rename from app/[lang]/(live)/@footer/[...paths]/page.tsx
rename to app/[lang]/(live)/@sitewidealert/[...path]/page.tsx
diff --git a/app/[lang]/(live)/@sitewidealert/[...paths]/page.tsx b/app/[lang]/(live)/@sitewidealert/[...paths]/page.tsx
deleted file mode 100644
index 03a82e5f5..000000000
--- a/app/[lang]/(live)/@sitewidealert/[...paths]/page.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../page"
diff --git a/app/[lang]/(live)/@sitewidealert/[contentType]/[uid]/page.tsx b/app/[lang]/(live)/@sitewidealert/[contentType]/[uid]/page.tsx
deleted file mode 100644
index 2ebaca014..000000000
--- a/app/[lang]/(live)/@sitewidealert/[contentType]/[uid]/page.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../../page"
diff --git a/app/[lang]/(live)/@sitewidealert/default.tsx b/app/[lang]/(live)/@sitewidealert/default.tsx
deleted file mode 100644
index 83ec2818e..000000000
--- a/app/[lang]/(live)/@sitewidealert/default.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "./page"
diff --git a/app/[lang]/(live)/@sitewidealert/loading.tsx b/app/[lang]/(live)/@sitewidealert/loading.tsx
new file mode 100644
index 000000000..f15322a81
--- /dev/null
+++ b/app/[lang]/(live)/@sitewidealert/loading.tsx
@@ -0,0 +1,3 @@
+export default function Loading() {
+  return null
+}
diff --git a/app/[lang]/(live)/@sitewidealert/my-pages/[...path]/page.tsx b/app/[lang]/(live)/@sitewidealert/my-pages/[...path]/page.tsx
deleted file mode 100644
index 2ebaca014..000000000
--- a/app/[lang]/(live)/@sitewidealert/my-pages/[...path]/page.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../../page"
diff --git a/app/[lang]/(live)/@sitewidealert/page.tsx b/app/[lang]/(live)/@sitewidealert/page.tsx
index be7ae2256..7c208ea69 100644
--- a/app/[lang]/(live)/@sitewidealert/page.tsx
+++ b/app/[lang]/(live)/@sitewidealert/page.tsx
@@ -1,5 +1,3 @@
-import { Suspense } from "react"
-
 import { env } from "@/env/server"
 
 import SitewideAlert, { preload } from "@/components/SitewideAlert"
@@ -15,9 +13,5 @@ export default function SitewideAlertPage({ params }: PageArgs<LangParams>) {
   setLang(params.lang)
   preload()
 
-  return (
-    <Suspense>
-      <SitewideAlert />
-    </Suspense>
-  )
+  return <SitewideAlert />
 }