diff --git a/AppSchema.json b/AppSchema.json
index 4c20c27ab..f7feffd6d 100644
--- a/AppSchema.json
+++ b/AppSchema.json
@@ -14676,13 +14676,15 @@
             {
                 "action": "Play Tutorial Topic",
                 "label": "Play",
-                "relatedUiObject": "Tutorial Topic",
+                "iconPathOn": "play",
+                "iconPathOff": "play",
                 "actionFunction": "payload.onMenuItemClick"
             },
             {
                 "action": "Resume Tutorial Topic",
                 "label": "Resume",
-                "relatedUiObject": "Tutorial Topic",
+                "iconPathOn": "resume",
+                "iconPathOff": "resume",
                 "actionFunction": "payload.onMenuItemClick"
             },
             {
@@ -14751,13 +14753,15 @@
             {
                 "action": "Play Tutorial Step",
                 "label": "Play",
-                "relatedUiObject": "Tutorial",
+                "iconPathOn": "play",
+                "iconPathOff": "play",
                 "actionFunction": "payload.onMenuItemClick"
             },
             {
                 "action": "Resume Tutorial Step",
                 "label": "Resume",
-                "relatedUiObject": "Tutorial",
+                "iconPathOn": "resume",
+                "iconPathOff": "resume",
                 "actionFunction": "payload.onMenuItemClick"
             },
             {
diff --git a/CanvasApp/ChartingSpace/CoordinateSystem.js b/CanvasApp/ChartingSpace/CoordinateSystem.js
index 3a9d3fcf4..de7f0eacf 100644
--- a/CanvasApp/ChartingSpace/CoordinateSystem.js
+++ b/CanvasApp/ChartingSpace/CoordinateSystem.js
@@ -23,10 +23,10 @@ function newCoordinateSystem() {
         autoMaxXScale: true,
         autoMinYScale: true,
         autoMaxYScale: true,
-        HORIZONTAL_MARGIN_FACTOR: 0.80,
-        VERTICAL_MARGIN_FACTOR: 0.90,
-        HORIZONTAL_MARGIN_INVERSE_FACTOR: 0.20,
-        VERTICAL_MARGIN_INVERSE_FACTOR: 0.10,
+        HORIZONTAL_MARGIN_FACTOR: 1,
+        VERTICAL_MARGIN_FACTOR: 1,
+        HORIZONTAL_MARGIN_INVERSE_FACTOR: 0,
+        VERTICAL_MARGIN_INVERSE_FACTOR: 0,
         physics: physics,
         reportParentXValue: reportParentXValue,
         reportParentYValue: reportParentYValue,