diff --git a/client/html/index.html b/client/html/index.html
index 4b626d348..2383147df 100644
--- a/client/html/index.html
+++ b/client/html/index.html
@@ -18,17 +18,22 @@
 
   <script type="text/javascript">
     function loadCanvas(){
-      window.SESSION_TOKEN = ''
-      window.EXECUTING_AT = 'Master App'
-      window.TOP_MARGIN = 25
-      window.URL_PREFIX = 'https://develop.advancedalgos.net/'
-      window.CANVAS_VISIBLE = true
+
+      window.canvasApp = {
+          sessionToken: '',
+          executingAt: 'Master App',
+          visible: true,
+          topMargin: 25,
+          urlPrefix: 'https://develop.advancedalgos.net/'   /* 'http://localhost:1337/'   */   /*  'https://develop.advancedalgos.net/'  */
+      };
+
       loadAdvancedAlgosPlatform();
     }
   </script>
 </head>
+
 <body id="body" onload="loadCanvas()">
-    <div id="root"></div>
-    <div id="canvasDiv"></div>
+    <div id="masterApp"></div>
+    <div id="canvasApp"></div>
 </body>
 </html>
diff --git a/client/src/index.js b/client/src/index.js
index 20b95ea99..76a0b0b0c 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -7,4 +7,4 @@ if (process.env.NODE_ENV !== 'production') {
   localStorage.setItem('debug', 'advanced-algos:*')
 }
 
-ReactDOM.render(<MasterApp />, document.getElementById('root'))
+ReactDOM.render(<MasterApp />, document.getElementById('masterApp'))
diff --git a/client/src/views/home/index.js b/client/src/views/home/index.js
index 178f3cf3b..15aa3a7d1 100644
--- a/client/src/views/home/index.js
+++ b/client/src/views/home/index.js
@@ -27,14 +27,14 @@ const styles = theme => ({
 class Home extends Component {
 
   componentDidMount () {
-    window.CANVAS_VISIBLE = true
+    window.canvasApp.visible = true
     let body = document.getElementById('body')
     body.style = 'margin: 0px; padding: 0px; border: 0px; overflow:hidden;'
     window.HIDE_FOOTER = true
   }
 
   componentWillUnmount () {
-    window.CANVAS_VISIBLE = false
+    window.canvasApp.visible = false
     let body = document.getElementById('body')
     body.style = ''
     window.HIDE_FOOTER = false