diff --git a/client/src/App.vue b/client/src/App.vue
index cbb6e90a..ed5cb4d8 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -16,34 +16,35 @@
 </template>
 
 <script>
-  import DefaultLayout from '@/layouts/DefaultLayout';
-  import SimpleLayout from '@/layouts/SimpleLayout';
-  import FullScreenLayout from '@/layouts/FullScreenLayout';
-  import PublicLayout from '@/layouts/PublicLayout';
-  import BlankLayout from '@/layouts/BlankLayout';
-  import SplitLayout from '@/layouts/SplitLayout';
-  import Modal from '@/components/Modal';
-  import NewContentBlockWizard from '@/components/content-block-form/NewContentBlockWizard';
-  import EditContentBlockWizard from '@/components/content-block-form/EditContentBlockWizard';
-  import NewRoomEntryWizard from '@/components/rooms/room-entries/NewRoomEntryWizard';
-  import EditRoomEntryWizard from '@/components/rooms/room-entries/EditRoomEntryWizard';
-  import NewProjectEntryWizard from '@/components/portfolio/NewProjectEntryWizard';
-  import EditProjectEntryWizard from '@/components/portfolio/EditProjectEntryWizard';
-  import NewObjectiveWizard from '@/components/objective-groups/NewObjectiveWizard';
-  import NewNoteWizard from '@/components/notes/NewNoteWizard';
-  import EditNoteWizard from '@/components/notes/EditNoteWizard';
-  import EditClassNameWizard from '@/components/school-class/EditClassNameWizard';
-  import EditTeamNameWizard from '@/components/profile/EditTeamNameWizard';
-  import FullscreenImage from '@/components/FullscreenImage';
-  import FullscreenInfographic from '@/components/FullscreenInfographic';
-  import FullscreenVideo from '@/components/FullscreenVideo';
-  import DeactivatePerson from '@/components/profile/DeactivatePerson';
-  import SnapshotCreated from '@/components/modules/SnapshotCreated';
-  import ChangeVisibility from '@/components/rooms/ChangeVisibility';
   import {mapGetters} from 'vuex';
   import ScrollUp from '@/components/ScrollUp';
   import ReadOnlyBanner from '@/components/ReadOnlyBanner';
 
+  const Modal = () => import(/* webpackChunkName: "modals" */'@/components/Modal');
+  const FullscreenImage = () => import(/* webpackChunkName: "modals" */'@/components/FullscreenImage');
+  const FullscreenInfographic = () => import(/* webpackChunkName: "modals" */'@/components/FullscreenInfographic');
+  const FullscreenVideo = () => import(/* webpackChunkName: "modals" */'@/components/FullscreenVideo');
+  const DeactivatePerson = () => import(/* webpackChunkName: "modals" */'@/components/profile/DeactivatePerson');
+  const SnapshotCreated = () => import(/* webpackChunkName: "modals" */'@/components/modules/SnapshotCreated');
+  const ChangeVisibility = () => import(/* webpackChunkName: "modals" */'@/components/rooms/ChangeVisibility');
+  const NewContentBlockWizard = () => import(/* webpackChunkName: "content-forms" */'@/components/content-block-form/NewContentBlockWizard');
+  const EditContentBlockWizard = () => import(/* webpackChunkName: "content-forms" */'@/components/content-block-form/EditContentBlockWizard');
+  const NewRoomEntryWizard = () => import(/* webpackChunkName: "content-forms" */'@/components/rooms/room-entries/NewRoomEntryWizard');
+  const EditRoomEntryWizard = () => import(/* webpackChunkName: "content-forms" */'@/components/rooms/room-entries/EditRoomEntryWizard');
+  const NewProjectEntryWizard = () => import(/* webpackChunkName: "content-forms" */'@/components/portfolio/NewProjectEntryWizard');
+  const EditProjectEntryWizard = () => import(/* webpackChunkName: "content-forms" */'@/components/portfolio/EditProjectEntryWizard');
+  const NewObjectiveWizard = () => import(/* webpackChunkName: "content-forms" */'@/components/objective-groups/NewObjectiveWizard');
+  const NewNoteWizard = () => import(/* webpackChunkName: "content-forms" */'@/components/notes/NewNoteWizard');
+  const EditNoteWizard = () => import(/* webpackChunkName: "content-forms" */'@/components/notes/EditNoteWizard');
+  const EditClassNameWizard = () => import(/* webpackChunkName: "content-forms" */'@/components/school-class/EditClassNameWizard');
+  const EditTeamNameWizard = () => import(/* webpackChunkName: "content-forms" */'@/components/profile/EditTeamNameWizard');
+  const DefaultLayout = () => import(/* webpackChunkName: "layouts" */'@/layouts/DefaultLayout');
+  const SimpleLayout = () => import(/* webpackChunkName: "layouts" */'@/layouts/SimpleLayout');
+  const FullScreenLayout = () => import(/* webpackChunkName: "layouts" */'@/layouts/FullScreenLayout');
+  const PublicLayout = () => import(/* webpackChunkName: "layouts" */'@/layouts/PublicLayout');
+  const BlankLayout = () => import(/* webpackChunkName: "layouts" */'@/layouts/BlankLayout');
+  const SplitLayout = () => import(/* webpackChunkName: "layouts" */'@/layouts/SplitLayout');
+
   export default {
     name: 'App',
 
diff --git a/client/src/components/book-navigation/NavigationSidebar.vue b/client/src/components/book-navigation/NavigationSidebar.vue
index e8be5307..c790137e 100644
--- a/client/src/components/book-navigation/NavigationSidebar.vue
+++ b/client/src/components/book-navigation/NavigationSidebar.vue
@@ -22,8 +22,6 @@
 
   import sidebarMixin from '@/mixins/sidebar';
 
-  import {meQuery} from '@/graphql/queries';
-
   const Cross = () => import(/* webpackChunkName: "icons" */'@/components/icons/Cross');
 
   export default {
@@ -34,21 +32,12 @@
       Cross
     },
 
-    data() {
-      return {
-        me: {}
-      };
-    },
-
     methods: {
       close() {
         this.closeSidebar('navigation');
       }
     },
 
-    apollo: {
-      me: meQuery
-    },
   };
 </script>