diff --git a/wax-prosemirror-core/src/services/LayoutService/Layout.js b/wax-prosemirror-core/src/services/LayoutService/Layout.js
index 28024d06371eb23e4183a15c608002cbc5532ae7..59bf0f1f46db61f976c3a002913fbf32aa216f30 100644
--- a/wax-prosemirror-core/src/services/LayoutService/Layout.js
+++ b/wax-prosemirror-core/src/services/LayoutService/Layout.js
@@ -1,5 +1,5 @@
 import { injectable } from "inversify";
-import DefaultLayout from "wax-prosemirror-layouts/src/layouts/DefaultLayout";
+import { DefaultLayout } from "wax-prosemirror-layouts";
 import LayoutFactory from "./components/LayoutFactory";
 
 @injectable()
diff --git a/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js b/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
index 972f6437d9765127a78305150e0569cc013e5770..30f08b67e4b9b3be2dffb08358938e4306815b06 100644
--- a/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
+++ b/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
@@ -183,13 +183,6 @@ const CommentsContainer = styled.div`
   height: 100%;
 `;
 
-const LeftSideBar = componentPlugin("leftSideBar");
-const RightSideBar = componentPlugin("rightSideBar");
-const TopBar = componentPlugin("topBar");
-const NotesArea = componentPlugin("notesArea");
-const CommentsArea = componentPlugin("commentsArea");
-const WaxOverlays = componentPlugin("waxOverlays");
-
 let surfaceHeight = 700;
 let notesHeight = 50;
 
@@ -221,6 +214,13 @@ const withNotes = () => {
 };
 
 const EditoriaLayout = ({ editor }) => {
+  const LeftSideBar = componentPlugin("leftSideBar");
+  const RightSideBar = componentPlugin("rightSideBar");
+  const TopBar = componentPlugin("topBar");
+  const NotesArea = componentPlugin("notesArea");
+  const CommentsArea = componentPlugin("commentsArea");
+  const WaxOverlays = componentPlugin("waxOverlays");
+
   const { view: { main } } = useContext(WaxContext);
   let AreasWithNotes = null;