diff --git a/layouts/Default.vue b/layouts/Default.vue
index 733e87f7f..27a178153 100644
--- a/layouts/Default.vue
+++ b/layouts/Default.vue
@@ -5,12 +5,24 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -21,16 +33,12 @@ import { mapActions } from 'vuex';
import OHeader from 'theme/components/organisms/o-header';
import OMicrocart from 'theme/components/organisms/o-microcart';
import OFooter from 'theme/components/organisms/o-footer';
-import OModal from 'theme/components/organisms/o-modal';
-import OBottomNavigation from 'theme/components/organisms/o-bottom-navigation';
import MLoader from 'theme/components/molecules/m-loader';
-import ONotification from 'theme/components/organisms/o-notification';
-import MCookieNotification from 'theme/components/molecules/m-cookie-notification';
-import MOfflineBadge from 'theme/components/molecules/m-offline-badge';
import { isServer } from '@vue-storefront/core/helpers';
import Head from 'theme/head';
import config from 'config';
import { ModalList } from 'theme/store/ui/modals'
+import LazyHydrate from 'vue-lazy-hydration'
export default {
components: {
@@ -38,11 +46,12 @@ export default {
OMicrocart,
OFooter,
MLoader,
- ONotification,
- MCookieNotification,
- MOfflineBadge,
- OBottomNavigation,
- OModal
+ ONotification: () => import('theme/components/organisms/o-notification'),
+ MCookieNotification: () => import('theme/components/molecules/m-cookie-notification'),
+ MOfflineBadge: () => import('theme/components/molecules/m-offline-badge'),
+ OBottomNavigation: () => import('theme/components/molecules/m-offline-badge'),
+ OModal: () => import('theme/components/organisms/o-modal'),
+ LazyHydrate
},
data () {
return {
diff --git a/layouts/Minimal.vue b/layouts/Minimal.vue
index db8c97a60..86b0fa9b1 100644
--- a/layouts/Minimal.vue
+++ b/layouts/Minimal.vue
@@ -3,19 +3,22 @@
-
+
+
+