diff --git a/CanvasApp/ChartingSpace/TimelineChart.js b/CanvasApp/ChartingSpace/TimelineChart.js
index ce39cf53d..ce9e7ede5 100644
--- a/CanvasApp/ChartingSpace/TimelineChart.js
+++ b/CanvasApp/ChartingSpace/TimelineChart.js
@@ -318,6 +318,8 @@ function newTimelineChart () {
   }
 
   function thisObjectPhysics () {
+    timelineChartCoordinateSystem.reportXValue(timeMachineCoordinateSystem.min.x)
+    timelineChartCoordinateSystem.reportXValue(timeMachineCoordinateSystem.max.x)
     timelineChartCoordinateSystem.physics()
   }
 
diff --git a/CanvasApp/DesignSpace/Workspace/Workspace.js b/CanvasApp/DesignSpace/Workspace/Workspace.js
index 0f3174d7e..a63c790d8 100644
--- a/CanvasApp/DesignSpace/Workspace/Workspace.js
+++ b/CanvasApp/DesignSpace/Workspace/Workspace.js
@@ -88,7 +88,7 @@ function newWorkspace () {
       functionLibraryUiObjectsFromNodes.recreateWorkspace(thisObject.workspaceNode)
       thisObject.enabled = true
 
-      setInterval(saveWorkspace, 5000)
+      setInterval(saveWorkspace, 30000)
     } catch (err) {
       if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> err = ' + err.stack) }
     }
diff --git a/CanvasApp/Globals.js b/CanvasApp/Globals.js
index 61b579d57..5b4aa5751 100644
--- a/CanvasApp/Globals.js
+++ b/CanvasApp/Globals.js
@@ -47,6 +47,7 @@ const ZOOM_OUT_THRESHOLD_FOR_CHANGING_TIME_FRAME = 5  // This help regulate when
 const ZOOM_OUT_THRESHOLD_FOR_PACKING_OBJECTS_AT_THE_BOTTOM_OR_TOP_OF_VIEWPORT = 2
 const ZOOM_OUT_THRESHOLD_FOR_PLOTTING_IN_LOW_RESOLUTION = 3  
 const ZOOM_OUT_THRESHOLD_FOR_DISPLAYING_TIME_MACHINES_ICONIZED = 5 
+const ZOOM_OUT_THRESHOLD_FOR_DISPLAYING_SCALES = 3 
 
 let FONT_ASPECT_RATIO = 0.32;
 
diff --git a/CanvasApp/Scales/RateScale.js b/CanvasApp/Scales/RateScale.js
index 07b2396a7..a532aea1f 100644
--- a/CanvasApp/Scales/RateScale.js
+++ b/CanvasApp/Scales/RateScale.js
@@ -370,6 +370,10 @@ function newRateScale () {
       thisObject.isVisible = false
       thisObject.payload.isVisible = false
     }
+
+    if (canvas.chartingSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_DISPLAYING_SCALES) {
+      thisObject.isVisible = false
+    }
   }
 
   function draw () {
diff --git a/CanvasApp/Scales/TimeFrameScale.js b/CanvasApp/Scales/TimeFrameScale.js
index 5015c1e31..05f6fbb38 100644
--- a/CanvasApp/Scales/TimeFrameScale.js
+++ b/CanvasApp/Scales/TimeFrameScale.js
@@ -212,6 +212,10 @@ function newTimeFrameScale () {
       thisObject.isVisible = false
       thisObject.payload.isVisible = false
     }
+
+    if (canvas.chartingSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_DISPLAYING_SCALES) {
+      thisObject.isVisible = false
+    }
   }
 
   function onViewportZoomChanged (event) {
diff --git a/CanvasApp/Scales/TimeScale.js b/CanvasApp/Scales/TimeScale.js
index f87354e66..62a1220b3 100644
--- a/CanvasApp/Scales/TimeScale.js
+++ b/CanvasApp/Scales/TimeScale.js
@@ -245,6 +245,10 @@ function newTimeScale () {
       thisObject.container.frame.position.x < upCorner.x) {
       thisObject.isVisible = false
     }
+
+    if (canvas.chartingSpace.viewport.zoomTargetLevel < ZOOM_OUT_THRESHOLD_FOR_DISPLAYING_SCALES) {
+      thisObject.isVisible = false
+    }
   }
 
   function draw () {
diff --git a/CanvasApp/Spaces/ChartingSpace.js b/CanvasApp/Spaces/ChartingSpace.js
index d1727cac8..cabaab4f6 100644
--- a/CanvasApp/Spaces/ChartingSpace.js
+++ b/CanvasApp/Spaces/ChartingSpace.js
@@ -138,10 +138,14 @@ function newChartingSpace () {
       container = thisObject.timeMachines[i].getContainer(point, purpose)
       if (container !== undefined) {
         if (purpose !== undefined) {
-          containerFound = container
+          if (containerFound === undefined) {
+            containerFound = container
+          }
         } else {
           if (thisObject.container.frame.isThisPointHere(point, true) === true) {
-            containerFound = container
+            if (containerFound === undefined) {
+              containerFound = container
+            }
           }
         }
       }