diff --git a/ActionBar/PrintStatusRow.cs b/ActionBar/PrintStatusRow.cs
index 43d7a4460..f51d37ef1 100644
--- a/ActionBar/PrintStatusRow.cs
+++ b/ActionBar/PrintStatusRow.cs
@@ -125,6 +125,12 @@ namespace MatterHackers.MatterControl.ActionBar
             notifyButton.MouseLeaveBounds += (sender, mouseEvent) => { HelpTextWidget.Instance.HideHoverText(); };
             notifyButton.Visible = ActivePrinterProfile.Instance.DoPrintLeveling;
 
+            ActivePrinterProfile.Instance.ActivePrinterChanged.RegisterEvent((sender, e) =>
+            {
+                notifyButton.Visible = ActivePrinterProfile.Instance.DoPrintLeveling;
+
+            }, ref unregisterEvents);
+
             ActivePrinterProfile.Instance.DoPrintLevelingChanged.RegisterEvent((sender, e) =>
             {
                 notifyButton.Visible = ActivePrinterProfile.Instance.DoPrintLeveling;
diff --git a/PrinterControls/EditMacrosWindow.cs b/PrinterControls/EditMacrosWindow.cs
index 5fc89c939..2470b7af1 100644
--- a/PrinterControls/EditMacrosWindow.cs
+++ b/PrinterControls/EditMacrosWindow.cs
@@ -335,7 +335,12 @@ namespace MatterHackers.MatterControl
             addMacroButton.Click += new ButtonBase.ButtonEventHandler(addMacro_Click);
 
 			Button cancelPresetsButton = textImageButtonFactory.Generate(new LocalizedString("Close").Translated);
-            cancelPresetsButton.Click += (sender, e) => { this.windowController.Close(); };
+            cancelPresetsButton.Click += (sender, e) => {
+                UiThread.RunOnIdle((state) =>
+                {
+                    this.windowController.Close(); 
+                }); 
+            };
 
             FlowLayoutWidget buttonRow = new FlowLayoutWidget();
             buttonRow.HAnchor = HAnchor.ParentLeftRight;
diff --git a/PrinterControls/EditManualMovementSpeedsWindow.cs b/PrinterControls/EditManualMovementSpeedsWindow.cs
index 6beadeae6..43b764fae 100644
--- a/PrinterControls/EditManualMovementSpeedsWindow.cs
+++ b/PrinterControls/EditManualMovementSpeedsWindow.cs
@@ -173,7 +173,12 @@ namespace MatterHackers.MatterControl
             savePresetsButton.Click += new ButtonBase.ButtonEventHandler(save_Click);
 
 			Button cancelPresetsButton = textImageButtonFactory.Generate(new LocalizedString("Cancel").Translated);
-            cancelPresetsButton.Click += (sender, e) => { Close(); };
+            cancelPresetsButton.Click += (sender, e) => {
+                UiThread.RunOnIdle((state) =>
+                {
+                    Close();
+                }); 
+            };
 
             FlowLayoutWidget buttonRow = new FlowLayoutWidget();
             buttonRow.HAnchor = HAnchor.ParentLeftRight;
diff --git a/PrinterControls/XYZJogControls.cs b/PrinterControls/XYZJogControls.cs
index 7aeba47a9..386790244 100644
--- a/PrinterControls/XYZJogControls.cs
+++ b/PrinterControls/XYZJogControls.cs
@@ -97,7 +97,8 @@ namespace MatterHackers.MatterControl
                     {
                         TextImageButtonFactory buttonFactory = new TextImageButtonFactory();
                         buttonFactory.FixedHeight = 20;
-                        buttonFactory.FixedWidth = 35;
+                        buttonFactory.FixedWidth = 30;
+                        buttonFactory.fontSize = 10;
                         buttonFactory.Margin = new BorderDouble(0);
 
                         FlowLayoutWidget moveRadioButtons = new FlowLayoutWidget();
@@ -123,11 +124,11 @@ namespace MatterHackers.MatterControl
                         moveRadioButtons.AddChild(oneHundredButton);
 
                         tenButton.Checked = true;
-                        moveRadioButtons.Margin = new BorderDouble(3);
+                        moveRadioButtons.Margin = new BorderDouble(0,3);
                         setMoveDistanceControl.AddChild(moveRadioButtons);
                     }
 
-                    TextWidget mmLabel = new TextWidget("mm", textColor: RGBA_Bytes.White);
+                    TextWidget mmLabel = new TextWidget("mm", textColor: RGBA_Bytes.White, pointSize:10);
                     mmLabel.VAnchor = Agg.UI.VAnchor.ParentCenter;
                     setMoveDistanceControl.AddChild(mmLabel);
                     setMoveDistanceControl.HAnchor = Agg.UI.HAnchor.ParentLeft;
@@ -227,7 +228,8 @@ namespace MatterHackers.MatterControl
             {
                 TextImageButtonFactory buttonFactory = new TextImageButtonFactory();
                 buttonFactory.FixedHeight = 20;
-                buttonFactory.FixedWidth = 35;
+                buttonFactory.FixedWidth = 30;
+                buttonFactory.fontSize = 10;
                 buttonFactory.Margin = new BorderDouble(0);
 
                 FlowLayoutWidget moveRadioButtons = new FlowLayoutWidget();
@@ -244,11 +246,11 @@ namespace MatterHackers.MatterControl
                 oneHundredButton.CheckedStateChanged += (sender, e) => { if (((RadioButton)sender).Checked) SetEMoveAmount(100); };
                 moveRadioButtons.AddChild(oneHundredButton);
                 tenButton.Checked = true;
-                moveRadioButtons.Margin = new BorderDouble(3);
+                moveRadioButtons.Margin = new BorderDouble(0,3);
                 setMoveDistanceControl.AddChild(moveRadioButtons);
             }
 
-            TextWidget mmLabel = new TextWidget("mm", textColor: RGBA_Bytes.White);
+            TextWidget mmLabel = new TextWidget("mm", textColor: RGBA_Bytes.White, pointSize:10);
             mmLabel.VAnchor = Agg.UI.VAnchor.ParentCenter;
             setMoveDistanceControl.AddChild(mmLabel);
             setMoveDistanceControl.HAnchor = Agg.UI.HAnchor.ParentLeft;