diff --git a/docs/.vuepress/components/DemoBasicBlocks.vue b/docs/.vuepress/components/DemoBasicBlocks.vue
index 3610a7f95..95a620ab7 100644
--- a/docs/.vuepress/components/DemoBasicBlocks.vue
+++ b/docs/.vuepress/components/DemoBasicBlocks.vue
@@ -20,6 +20,7 @@ export default {
 <style>
   .gjs {
     border: 3px solid #444;
+    box-sizing: border-box;
   }
   .gjs-block {
     width: auto;
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index e643142aa..113fc8208 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -1,6 +1,7 @@
 const version = require('./../../package.json').version;
 const isDev = process.argv[2] === 'dev';
-const devPath = 'http://localhost:8080/dist';
+const devPath = 'http://localhost:8080';
+const baseUrl = 'https://grapesjs.com';
 const subDivider = " ‍  ‍  ‍ ";
 
 module.exports = {
@@ -10,8 +11,8 @@ module.exports = {
   serviceWorker: false, // Enable Service Worker for offline usage
   head: [
     ['link', { rel: 'icon', href: '/logo-icon.png' }],
-    ['link', { rel: 'stylesheet', href: isDev ? `${devPath}/css/grapes.min.css` : `../stylesheets/grapes.min.css?v${version}` }],
-    ['script', { src: isDev ? `${devPath}/grapes.min.js` : `../js/grapes.min.js?v${version}` }],
+    ['link', { rel: 'stylesheet', href: isDev ? `${devPath}/dist/css/grapes.min.css` : `${baseUrl}/stylesheets/grapes.min.css?v${version}` }],
+    ['script', { src: isDev ? `${devPath}/grapes.min.js` : `${baseUrl}/js/grapes.min.js?v${version}` }],
   ],
   localesSKIP: {
     '/': {
diff --git a/src/navigator/index.ts b/src/navigator/index.ts
index 34502a05f..73857de06 100644
--- a/src/navigator/index.ts
+++ b/src/navigator/index.ts
@@ -56,14 +56,13 @@ export default class LayerManager extends Module<typeof defaults> {
     onLoad() {
       const { em, config, model } = this;
       model.listenTo(em, 'component:selected', this.componentChanged);
-      model.listenToOnce(em, 'load', () => this.setRoot(config.root));
       model.on('change:root', this.__onRootChange);
       model.listenTo(em, propsToListen, this.__onComponent);
       this.componentChanged();
-    }
-
-    postRender() {
-      this.__appendTo();
+      model.listenToOnce(em, 'load', () => {
+        this.setRoot(config.root);
+        this.__appendTo();
+      });
     }
 
     /**
@@ -89,7 +88,7 @@ export default class LayerManager extends Module<typeof defaults> {
      * @return {Component}
      */
     getRoot(): Component {
-      return this.model.get('root');
+      return this.model.get('root');// || this.em.getWrapper();
     }
 
     getLayerData(component: any): LayerData {