diff --git a/Conditions.js b/Conditions.js
index 520bcfb95..13e948b87 100644
--- a/Conditions.js
+++ b/Conditions.js
@@ -69,8 +69,8 @@
 
             /* Stop listening to the necesary events. */
 
-            viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId);
-            viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId);
+            canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId);
+            canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
             canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId);
             thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId)
             marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId);
@@ -120,8 +120,8 @@
 
             /* Listen to the necesary events. */
 
-            zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
-            offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
+            zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
+            offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
             dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished);
             marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated);
             dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated);
@@ -312,8 +312,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -394,8 +394,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
diff --git a/SimulationExecution.js b/SimulationExecution.js
index 72b543402..a25259876 100644
--- a/SimulationExecution.js
+++ b/SimulationExecution.js
@@ -51,7 +51,7 @@
 
             /* Stop listening to the necesary events. */
 
-            viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId);
+            canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
             fileSequence.eventHandler.stopListening(filesUpdatedEventSubscriptionId);
             thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId)
 
@@ -83,7 +83,7 @@
             recalculateScale();
 
             filesUpdatedEventSubscriptionId = fileSequence.eventHandler.listenToEvent("Files Updated", onFilesUpdated); // Only the first sequence is supported right now.
-            offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
+            offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
 
             /* Ready for when dimmension changes. */
 
@@ -371,9 +371,9 @@
                     point = coordinateSystem.transformThisPoint(point);
                     point = transformThisPoint(point, thisObject.container);
 
-                    if (point.x < viewPort.visibleArea.bottomLeft.x || point.x > viewPort.visibleArea.bottomRight.x) { continue; }
+                    if (point.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || point.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) { continue; }
 
-                    point = viewPort.fitIntoVisibleArea(point);
+                    point = canvas.chartSpace.viewport.fitIntoVisibleArea(point);
                     point = thisObject.fitFunction(point);
 
                     let isCurrentRecord = false;
@@ -411,17 +411,17 @@
 
                         point1 = coordinateSystem.transformThisPoint(point1);
                         point1 = transformThisPoint(point1, thisObject.container);
-                        point1 = viewPort.fitIntoVisibleArea(point1);
+                        point1 = canvas.chartSpace.viewport.fitIntoVisibleArea(point1);
                         point1 = thisObject.fitFunction(point1);
 
                         point2 = coordinateSystem.transformThisPoint(point2);
                         point2 = transformThisPoint(point2, thisObject.container);
-                        point2 = viewPort.fitIntoVisibleArea(point2);
+                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
                         point2 = thisObject.fitFunction(point2);
 
                         point3 = coordinateSystem.transformThisPoint(point3);
                         point3 = transformThisPoint(point3, thisObject.container);
-                        point3 = viewPort.fitIntoVisibleArea(point3);
+                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
                         point3 = thisObject.fitFunction(point3);
 
                         let diff = point2.x - point3.x;
@@ -430,8 +430,8 @@
 
                         currentRecord.timeFrame = diff
 
-                        point2 = viewPort.fitIntoVisibleArea(point2);
-                        point3 = viewPort.fitIntoVisibleArea(point3);
+                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
+                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
                         point2 = thisObject.fitFunction(point2);
                         point3 = thisObject.fitFunction(point3);
 
@@ -486,17 +486,17 @@
 
                         point1 = coordinateSystem.transformThisPoint(point1);
                         point1 = transformThisPoint(point1, thisObject.container);
-                        point1 = viewPort.fitIntoVisibleArea(point1);
+                        point1 = canvas.chartSpace.viewport.fitIntoVisibleArea(point1);
                         point1 = thisObject.fitFunction(point1);
 
                         point2 = coordinateSystem.transformThisPoint(point2);
                         point2 = transformThisPoint(point2, thisObject.container);
-                        point2 = viewPort.fitIntoVisibleArea(point2);
+                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
                         point2 = thisObject.fitFunction(point2);
 
                         point3 = coordinateSystem.transformThisPoint(point3);
                         point3 = transformThisPoint(point3, thisObject.container);
-                        point3 = viewPort.fitIntoVisibleArea(point3);
+                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
                         point3 = thisObject.fitFunction(point3);
 
                         let diff = point2.x - point3.x;
@@ -505,8 +505,8 @@
 
                         currentRecord.timeFrame = diff
 
-                        point2 = viewPort.fitIntoVisibleArea(point2);
-                        point3 = viewPort.fitIntoVisibleArea(point3);
+                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
+                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
                         point2 = thisObject.fitFunction(point2);
                         point3 = thisObject.fitFunction(point3);
 
@@ -559,17 +559,17 @@
 
                         point1 = coordinateSystem.transformThisPoint(point1);
                         point1 = transformThisPoint(point1, thisObject.container);
-                        point1 = viewPort.fitIntoVisibleArea(point1);
+                        point1 = canvas.chartSpace.viewport.fitIntoVisibleArea(point1);
                         point1 = thisObject.fitFunction(point1);
 
                         point2 = coordinateSystem.transformThisPoint(point2);
                         point2 = transformThisPoint(point2, thisObject.container);
-                        point2 = viewPort.fitIntoVisibleArea(point2);
+                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
                         point2 = thisObject.fitFunction(point2);
 
                         point3 = coordinateSystem.transformThisPoint(point3);
                         point3 = transformThisPoint(point3, thisObject.container);
-                        point3 = viewPort.fitIntoVisibleArea(point3);
+                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
                         point3 = thisObject.fitFunction(point3);
 
                         let diff = point2.x - point3.x;
@@ -578,8 +578,8 @@
 
                         currentRecord.timeFrame = diff
 
-                        point2 = viewPort.fitIntoVisibleArea(point2);
-                        point3 = viewPort.fitIntoVisibleArea(point3);
+                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
+                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
                         point2 = thisObject.fitFunction(point2);
                         point3 = thisObject.fitFunction(point3);
 
@@ -633,17 +633,17 @@
 
                         point1 = coordinateSystem.transformThisPoint(point1);
                         point1 = transformThisPoint(point1, thisObject.container);
-                        point1 = viewPort.fitIntoVisibleArea(point1);
+                        point1 = canvas.chartSpace.viewport.fitIntoVisibleArea(point1);
                         point1 = thisObject.fitFunction(point1);
 
                         point2 = coordinateSystem.transformThisPoint(point2);
                         point2 = transformThisPoint(point2, thisObject.container);
-                        point2 = viewPort.fitIntoVisibleArea(point2);
+                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
                         point2 = thisObject.fitFunction(point2);
 
                         point3 = coordinateSystem.transformThisPoint(point3);
                         point3 = transformThisPoint(point3, thisObject.container);
-                        point3 = viewPort.fitIntoVisibleArea(point3);
+                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
                         point3 = thisObject.fitFunction(point3);
 
                         let diff = point2.x - point3.x;
@@ -652,8 +652,8 @@
 
                         currentRecord.timeFrame = diff
 
-                        point2 = viewPort.fitIntoVisibleArea(point2);
-                        point3 = viewPort.fitIntoVisibleArea(point3);
+                        point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
+                        point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
                         point2 = thisObject.fitFunction(point2);
                         point3 = thisObject.fitFunction(point3);
 
@@ -705,7 +705,7 @@
                         browserCanvasContext.arc(point.x, point.y, currentRadius, 0, Math.PI * 2, true);
                         browserCanvasContext.closePath();
 
-                        if (point.x < viewPort.visibleArea.topLeft.x + 50 || point.x > viewPort.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
+                        if (point.x < canvas.chartSpace.viewport.visibleArea.topLeft.x + 50 || point.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
                             browserCanvasContext.fill();
                         }
 
@@ -725,7 +725,7 @@
                     browserCanvasContext.arc(point.x, point.y, radius, 0, Math.PI * 2, true);
                     browserCanvasContext.closePath();
 
-                    if (point.x < viewPort.visibleArea.topLeft.x + 50 || point.x > viewPort.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
+                    if (point.x < canvas.chartSpace.viewport.visibleArea.topLeft.x + 50 || point.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
                         browserCanvasContext.fill();
                     }
 
@@ -756,12 +756,12 @@
 
                     point1 = coordinateSystem.transformThisPoint(point1);
                     point1 = transformThisPoint(point1, thisObject.container);
-                    point1 = viewPort.fitIntoVisibleArea(point1);
+                    point1 = canvas.chartSpace.viewport.fitIntoVisibleArea(point1);
                     point1 = thisObject.fitFunction(point1);
 
                     point2 = coordinateSystem.transformThisPoint(point2);
                     point2 = transformThisPoint(point2, thisObject.container);
-                    point2 = viewPort.fitIntoVisibleArea(point2);
+                    point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
                     point2 = thisObject.fitFunction(point2);
 
                     browserCanvasContext.beginPath();
diff --git a/SimulationExecutionPanel.js b/SimulationExecutionPanel.js
index f9b57b3b8..85d929006 100644
--- a/SimulationExecutionPanel.js
+++ b/SimulationExecutionPanel.js
@@ -27,8 +27,8 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
         thisObject.container.frame.width = UI_PANEL.WIDTH.NORMAL;
         thisObject.container.frame.height = UI_PANEL.HEIGHT.NORMAL * 2.5;
 
-        thisObject.container.frame.position.x = viewPort.visibleArea.topLeft.x + thisObject.container.frame.width * 4;
-        thisObject.container.frame.position.y = viewPort.visibleArea.topRight.y;
+        thisObject.container.frame.position.x = canvas.chartSpace.viewport.visibleArea.topLeft.x + thisObject.container.frame.width * 4;
+        thisObject.container.frame.position.y = canvas.chartSpace.viewport.visibleArea.topRight.y;
 
         panelTabButton = newPanelTabButton()
         panelTabButton.parentContainer = thisObject.container
@@ -137,8 +137,8 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
             point2.y = point2.y - diff;
             point3.y = point3.y - diff;
 
-            point2 = viewPort.fitIntoVisibleArea(point2);
-            point3 = viewPort.fitIntoVisibleArea(point3);
+            point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
+            point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
 
             browserCanvasContext.beginPath();
 
@@ -197,8 +197,8 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
             point2.y = point2.y + diff;
             point3.y = point3.y + diff;
 
-            point2 = viewPort.fitIntoVisibleArea(point2);
-            point3 = viewPort.fitIntoVisibleArea(point3);
+            point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
+            point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
 
             browserCanvasContext.beginPath();
 
@@ -255,8 +255,8 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
             point2.y = point2.y - diff;
             point3.y = point3.y - diff;
 
-            point2 = viewPort.fitIntoVisibleArea(point2);
-            point3 = viewPort.fitIntoVisibleArea(point3);
+            point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
+            point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
 
             browserCanvasContext.beginPath();
 
@@ -313,8 +313,8 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
             point2.y = point2.y + diff;
             point3.y = point3.y + diff;
 
-            point2 = viewPort.fitIntoVisibleArea(point2);
-            point3 = viewPort.fitIntoVisibleArea(point3);
+            point2 = canvas.chartSpace.viewport.fitIntoVisibleArea(point2);
+            point3 = canvas.chartSpace.viewport.fitIntoVisibleArea(point3);
 
             browserCanvasContext.beginPath();
 
@@ -353,7 +353,7 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
             browserCanvasContext.arc(point.x, point.y, currentRadius, 0, Math.PI * 2, true);
             browserCanvasContext.closePath();
 
-            if (point.x < viewPort.visibleArea.topLeft.x + 50 || point.x > viewPort.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
+            if (point.x < canvas.chartSpace.viewport.visibleArea.topLeft.x + 50 || point.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
                 browserCanvasContext.fill();
             }
             browserCanvasContext.setLineDash([0, 0])
@@ -371,7 +371,7 @@ function newAAMastersPlottersTradingSimulationSimulationExecutionSimulationExecu
         browserCanvasContext.arc(point.x, point.y, radius, 0, Math.PI * 2, true);
         browserCanvasContext.closePath();
 
-        if (point.x < viewPort.visibleArea.topLeft.x + 50 || point.x > viewPort.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
+        if (point.x < canvas.chartSpace.viewport.visibleArea.topLeft.x + 50 || point.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x - 50) {/*we leave this history without fill. */ } else {
             browserCanvasContext.fill();
         }
         browserCanvasContext.setLineDash([0, 0])
diff --git a/Strategies.js b/Strategies.js
index 4883cb092..45d5e69bb 100644
--- a/Strategies.js
+++ b/Strategies.js
@@ -68,8 +68,8 @@
 
             /* Stop listening to the necesary events. */
 
-            viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId);
-            viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId);
+            canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId);
+            canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
             canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId);
             thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId)
             marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId);
@@ -122,8 +122,8 @@
 
             /* Listen to the necesary events. */
 
-            zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
-            offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
+            zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
+            offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
             dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished);
             marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated);
             dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated);
@@ -319,8 +319,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -399,8 +399,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -523,17 +523,17 @@
                 recordPoint3 = transformThisPoint(recordPoint3, thisObject.container);
                 recordPoint4 = transformThisPoint(recordPoint4, thisObject.container);
 
-                if (recordPoint2.x < viewPort.visibleArea.bottomLeft.x || recordPoint1.x > viewPort.visibleArea.bottomRight.x) {
+                if (recordPoint2.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || recordPoint1.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) {
                     continue;
                 }
 
                 recordPoint3.y = recordPoint1.y + 2000;
                 recordPoint4.y = recordPoint1.y + 2000;
 
-                recordPoint1 = viewPort.fitIntoVisibleArea(recordPoint1);
-                recordPoint2 = viewPort.fitIntoVisibleArea(recordPoint2);
-                recordPoint3 = viewPort.fitIntoVisibleArea(recordPoint3);
-                recordPoint4 = viewPort.fitIntoVisibleArea(recordPoint4);
+                recordPoint1 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint1);
+                recordPoint2 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint2);
+                recordPoint3 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint3);
+                recordPoint4 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint4);
 
                 recordPoint1 = thisObject.fitFunction(recordPoint1, undefined, 30);
                 recordPoint2 = thisObject.fitFunction(recordPoint2, undefined, 30);
diff --git a/Trades.js b/Trades.js
index 121407b1e..bf16c8a18 100644
--- a/Trades.js
+++ b/Trades.js
@@ -68,8 +68,8 @@
 
             /* Stop listening to the necesary events. */
 
-            viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId);
-            viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId);
+            canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId);
+            canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
             canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId);
             thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId)
             marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId);
@@ -120,8 +120,8 @@
 
             /* Listen to the necesary events. */
 
-            zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
-            offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
+            zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
+            offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
             dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished);
             marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated);
             dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated);
@@ -312,8 +312,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -386,8 +386,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -506,13 +506,13 @@
                 recordPoint2 = transformThisPoint(recordPoint2, thisObject.container);
                 recordPoint3 = transformThisPoint(recordPoint3, thisObject.container);
 
-                if (recordPoint2.x < viewPort.visibleArea.bottomLeft.x || recordPoint1.x > viewPort.visibleArea.bottomRight.x) {
+                if (recordPoint2.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || recordPoint1.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) {
                     continue;
                 }
 
-                recordPoint1 = viewPort.fitIntoVisibleArea(recordPoint1);
-                recordPoint2 = viewPort.fitIntoVisibleArea(recordPoint2);
-                recordPoint3 = viewPort.fitIntoVisibleArea(recordPoint3);
+                recordPoint1 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint1);
+                recordPoint2 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint2);
+                recordPoint3 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint3);
 
                 recordPoint1 = thisObject.fitFunction(recordPoint1);
                 recordPoint2 = thisObject.fitFunction(recordPoint2);
@@ -582,17 +582,17 @@
                     point.y = recordPoint3.y - 100
                 }
 
-                point = viewPort.fitIntoVisibleArea(point);
+                point = canvas.chartSpace.viewport.fitIntoVisibleArea(point);
                 point = thisObject.fitFunction(point, undefined, 50);
 
                 if (
-                    recordPoint3.x < viewPort.visibleArea.topLeft.x + 250
+                    recordPoint3.x < canvas.chartSpace.viewport.visibleArea.topLeft.x + 250
                     ||
-                    recordPoint3.x > viewPort.visibleArea.bottomRight.x - 250
+                    recordPoint3.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x - 250
                     ||
-                    recordPoint3.y > viewPort.visibleArea.bottomRight.y - 150
+                    recordPoint3.y > canvas.chartSpace.viewport.visibleArea.bottomRight.y - 150
                     ||
-                    recordPoint3.y < viewPort.visibleArea.topLeft.y + 150
+                    recordPoint3.y < canvas.chartSpace.viewport.visibleArea.topLeft.y + 150
                 ) {
                     // we do not write any text
                 } else {
diff --git a/TradingSimulation.js b/TradingSimulation.js
index ae25640fe..3ecf81ffa 100644
--- a/TradingSimulation.js
+++ b/TradingSimulation.js
@@ -68,8 +68,8 @@
 
             /* Stop listening to the necesary events. */
 
-            viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId);
-            viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId);
+            canvas.chartSpace.viewport.eventHandler.stopListening(zoomChangedEventSubscriptionId);
+            canvas.chartSpace.viewport.eventHandler.stopListening(offsetChangedEventSubscriptionId);
             canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId);
             thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId)
             marketFiles.eventHandler.stopListening(marketFilesUpdatedEventSubscriptionId);
@@ -124,8 +124,8 @@
 
             /* Listen to the necesary events. */
 
-            zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
-            offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
+            zoomChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Zoom Changed", onViewportZoomChanged);
+            offsetChangedEventSubscriptionId = canvas.chartSpace.viewport.eventHandler.listenToEvent("Position Changed", onViewportPositionChanged);
             dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished);
             marketFilesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onMarketFilesUpdated);
             dailyFilesUpdatedEventSubscriptionId = dailyFiles.eventHandler.listenToEvent("Files Updated", onDailyFilesUpdated);
@@ -300,8 +300,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -398,8 +398,8 @@
 
             let daysOnSides = getSideDays(timeFrame);
 
-            let leftDate = getDateFromPoint(viewPort.visibleArea.topLeft, thisObject.container, coordinateSystem);
-            let rightDate = getDateFromPoint(viewPort.visibleArea.topRight, thisObject.container, coordinateSystem);
+            let leftDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topLeft, thisObject.container, coordinateSystem);
+            let rightDate = getDateFromPoint(canvas.chartSpace.viewport.visibleArea.topRight, thisObject.container, coordinateSystem);
 
             let dateDiff = rightDate.valueOf() - leftDate.valueOf();
 
@@ -626,16 +626,16 @@
                 recordPoint9 = transformThisPoint(recordPoint9, thisObject.container);
                 recordPoint10 = transformThisPoint(recordPoint10, thisObject.container);
 
-                recordPoint1 = viewPort.fitIntoVisibleArea(recordPoint1);
-                recordPoint2 = viewPort.fitIntoVisibleArea(recordPoint2);
-                recordPoint3 = viewPort.fitIntoVisibleArea(recordPoint3);
-                recordPoint4 = viewPort.fitIntoVisibleArea(recordPoint4);
-                recordPoint5 = viewPort.fitIntoVisibleArea(recordPoint5);
-                recordPoint6 = viewPort.fitIntoVisibleArea(recordPoint6);
-                recordPoint7 = viewPort.fitIntoVisibleArea(recordPoint7);
-                recordPoint8 = viewPort.fitIntoVisibleArea(recordPoint8);
-                recordPoint9 = viewPort.fitIntoVisibleArea(recordPoint9);
-                recordPoint10 = viewPort.fitIntoVisibleArea(recordPoint10);
+                recordPoint1 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint1);
+                recordPoint2 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint2);
+                recordPoint3 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint3);
+                recordPoint4 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint4);
+                recordPoint5 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint5);
+                recordPoint6 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint6);
+                recordPoint7 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint7);
+                recordPoint8 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint8);
+                recordPoint9 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint9);
+                recordPoint10 = canvas.chartSpace.viewport.fitIntoVisibleArea(recordPoint10);
 
                 recordPoint1 = thisObject.fitFunction(recordPoint1);
                 recordPoint2 = thisObject.fitFunction(recordPoint2);
@@ -670,7 +670,7 @@
                     y: recordPoint4.y + imageOffset.y
                 }
 
-                imagePosition = viewPort.fitIntoVisibleArea(imagePosition)
+                imagePosition = canvas.chartSpace.viewport.fitIntoVisibleArea(imagePosition)
                 imagePosition = thisObject.fitFunction(imagePosition, undefined, 0, 0, imageSize)
 
                 if (imageRecord.canDrawIcon === true) {
@@ -682,7 +682,7 @@
                     browserCanvasContext.restore();
                 }
 
-                if (recordPoint5.x < viewPort.visibleArea.bottomLeft.x || recordPoint5.x > viewPort.visibleArea.bottomRight.x) {
+                if (recordPoint5.x < canvas.chartSpace.viewport.visibleArea.bottomLeft.x || recordPoint5.x > canvas.chartSpace.viewport.visibleArea.bottomRight.x) {
                     continue;
                 }
 
@@ -747,14 +747,14 @@
                     y: recordPoint6.y - imageSize * 1.25 + yOffset
                 }
 
-                imagePosition = viewPort.fitIntoVisibleArea(imagePosition)
+                imagePosition = canvas.chartSpace.viewport.fitIntoVisibleArea(imagePosition)
                 imagePosition = thisObject.fitFunction(imagePosition, undefined, 0, 0, imageSize)
 
                 let labelPosition = {
                     x: recordPoint6.x - imageSize / 2 - 3,
                     y: recordPoint6.y - imageSize * 1.5 + yOffset * 2
                 }
-                labelPosition = viewPort.fitIntoVisibleArea(labelPosition)
+                labelPosition = canvas.chartSpace.viewport.fitIntoVisibleArea(labelPosition)
                 labelPosition = thisObject.fitFunction(labelPosition, undefined, 30)
 
                 if (imageStopLossPhase.canDrawIcon === true && stopLossPhase > -1) {
@@ -788,14 +788,14 @@
                     x: recordPoint10.x - imageSize * 2 / 3,
                     y: recordPoint10.y + imageSize / 4 - yOffset
                 }
-                imagePosition = viewPort.fitIntoVisibleArea(imagePosition)
+                imagePosition = canvas.chartSpace.viewport.fitIntoVisibleArea(imagePosition)
                 imagePosition = thisObject.fitFunction(imagePosition, undefined, 0, 0, imageSize)
 
                 labelPosition = {
                     x: recordPoint10.x - imageSize * 1 / 3,
                     y: recordPoint10.y + imageSize * 1.9 - yOffset * 2
                 }
-                labelPosition = viewPort.fitIntoVisibleArea(labelPosition)
+                labelPosition = canvas.chartSpace.viewport.fitIntoVisibleArea(labelPosition)
                 labelPosition = thisObject.fitFunction(labelPosition, undefined, 30)
 
                 if (imageTakeProfitPhase.canDrawIcon === true && takeProfitPhase > -1) {
diff --git a/TradingSimulationPanel.js b/TradingSimulationPanel.js
index 181b315e5..36e65a70d 100644
--- a/TradingSimulationPanel.js
+++ b/TradingSimulationPanel.js
@@ -30,8 +30,8 @@ function newAAMastersPlottersTradingSimulationTradingSimulationTradingSimulation
         thisObject.container.frame.width = UI_PANEL.WIDTH.NORMAL * 1;
         thisObject.container.frame.height = UI_PANEL.HEIGHT.NORMAL * 2.5;
 
-        thisObject.container.frame.position.x = viewPort.visibleArea.topLeft.x + thisObject.container.frame.width * 3;
-        thisObject.container.frame.position.y = viewPort.visibleArea.topRight.y;
+        thisObject.container.frame.position.x = canvas.chartSpace.viewport.visibleArea.topLeft.x + thisObject.container.frame.width * 3;
+        thisObject.container.frame.position.y = canvas.chartSpace.viewport.visibleArea.topRight.y;
 
         panelTabButton = newPanelTabButton()
         panelTabButton.parentContainer = thisObject.container