diff --git a/ActionBar/PrintActionRow.cs b/ActionBar/PrintActionRow.cs
index f2424d14d..2caaffad0 100644
--- a/ActionBar/PrintActionRow.cs
+++ b/ActionBar/PrintActionRow.cs
@@ -107,6 +107,7 @@ namespace MatterHackers.MatterControl.ActionBar
 			configureButton = textImageButtonFactory.GenerateTooltipButton("Finish Setup...".Localize());
 			configureButton.ToolTipText = "Run setup configuration for printer.".Localize();
 			configureButton.Margin = new BorderDouble(6, 6, 6, 3);
+			configureButton.Click += onStartButton_Click;
 
 			string connectButtonText = "Connect".Localize();
 			string connectButtonMessage = "Connect to the printer".Localize();
@@ -129,6 +130,7 @@ namespace MatterHackers.MatterControl.ActionBar
 			string removeButtonText = "Remove".Localize();
 			string removeButtonMessage = "Remove current item from queue".Localize();
 			removeButton = makeButton(removeButtonText, removeButtonMessage);
+			removeButton.Click += onRemoveButton_Click;
 
 			string pauseButtonText = "Pause".Localize();
 			string pauseButtonMessage = "Pause the current print".Localize();
@@ -216,9 +218,7 @@ namespace MatterHackers.MatterControl.ActionBar
 			PrinterConnectionAndCommunication.Instance.ActivePrintItemChanged.RegisterEvent(onStateChanged, ref unregisterEvents);
 			PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent(onStateChanged, ref unregisterEvents);
 			addButton.Click += onAddButton_Click;
-			configureButton.Click += onStartButton_Click;
             skipButton.Click += onSkipButton_Click;
-			removeButton.Click += onRemoveButton_Click;
 			resetConnectionButton.Click += (sender, e) => { UiThread.RunOnIdle(PrinterConnectionAndCommunication.Instance.RebootBoard); };
 
 			cancelButton.Click += (sender, e) => { UiThread.RunOnIdle(CancelButton_Click); };
diff --git a/ActionBar/PrinterActionRow.cs b/ActionBar/PrinterActionRow.cs
index ab1c0c2e4..66931c26e 100644
--- a/ActionBar/PrinterActionRow.cs
+++ b/ActionBar/PrinterActionRow.cs
@@ -145,7 +145,7 @@ namespace MatterHackers.MatterControl.ActionBar
 
 				Button editButton = TextImageButtonFactory.GetThemedEditButton();
 				editButton.VAnchor = VAnchor.ParentCenter;
-				editButton.Click += UiNavigation.GoToEditPrinter_Click;
+				editButton.Click += UiNavigation.OpenEditPrinterWizard_Click;
 				printerSelectorAndEditButton.AddChild(editButton);
 				this.AddChild(printerSelectorAndEditButton);
 			}
diff --git a/ActionBar/PrinterSelector.cs b/ActionBar/PrinterSelector.cs
index 61fde6846..b0a868b4b 100644
--- a/ActionBar/PrinterSelector.cs
+++ b/ActionBar/PrinterSelector.cs
@@ -90,7 +90,7 @@ namespace MatterHackers.MatterControl
 			this.MenuItems.Clear();
 
 			//Add the menu items to the menu itself
-			foreach (var printer in ProfileManager.Instance.ActiveProfiles)
+			foreach (var printer in ProfileManager.Instance.ActiveProfiles.OrderBy(p => p.Name))
 			{
 				this.AddItem(printer.Name, printer.ID.ToString());
 			}
diff --git a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs
index 83737ee90..f5b5a0660 100644
--- a/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs
+++ b/ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs
@@ -150,7 +150,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
 
 		private void SetVisibleControls()
 		{
-			if (ActiveSliceSettings.Instance.PrinterSelected
+			if (!ActiveSliceSettings.Instance.PrinterSelected
 				|| PrinterConnectionAndCommunication.Instance.CommunicationState == PrinterConnectionAndCommunication.CommunicationStates.Printing
 				|| PrinterConnectionAndCommunication.Instance.PrinterIsPaused)
 			{
diff --git a/ControlElements/AttentionGetter.cs b/ControlElements/AttentionGetter.cs
index cab019d75..3121dc4ad 100644
--- a/ControlElements/AttentionGetter.cs
+++ b/ControlElements/AttentionGetter.cs
@@ -42,7 +42,7 @@ namespace MatterHackers.MatterControl
 {
 	public static class UiNavigation
 	{
-		public static void GoToEditPrinter_Click(object sender, EventArgs e)
+		public static void OpenEditPrinterWizard_Click(object sender, EventArgs e)
 		{
 			Button editButton = sender as Button;
 			editButton.ToolTipText = "Edit Current Printer Settings".Localize();
@@ -50,14 +50,14 @@ namespace MatterHackers.MatterControl
 			{
 				editButton.Closed += (s, e2) =>
 				{
-					editButton.Click -= GoToEditPrinter_Click;
+					editButton.Click -= OpenEditPrinterWizard_Click;
 				};
 
-				UiNavigation.GoToPrinterSettings("baud_rate Edit Field,auto_connect Edit Field,com_port Edit Field");
+				UiNavigation.OpenEditPrinterWizard("baud_rate Edit Field,auto_connect Edit Field,com_port Edit Field");
 			}
 		}
 
-		public static void GoToPrinterSettings(string widgetNameToHighlight)
+		public static void OpenEditPrinterWizard(string widgetNameToHighlight)
 		{
 			if (PrinterConnectionAndCommunication.Instance?.ActivePrinter?.ID != null
 				&& ActiveSliceSettings.Instance.PrinterSelected
diff --git a/SetupWizard/AndroidSetupOptionsPage.cs b/SetupWizard/AndroidSetupOptionsPage.cs
index 5f2596bda..91925b7a0 100644
--- a/SetupWizard/AndroidSetupOptionsPage.cs
+++ b/SetupWizard/AndroidSetupOptionsPage.cs
@@ -134,7 +134,7 @@ namespace MatterHackers.MatterControl
 			var editButton = TextImageButtonFactory.GetThemedEditButton();
 			editButton.ToolTipText = "Edit Selected Setting".Localize();
 			editButton.VAnchor = VAnchor.ParentCenter;
-			editButton.Click += UiNavigation.GoToEditPrinter_Click;
+			editButton.Click += UiNavigation.OpenEditPrinterWizard_Click;
 			printerSelectorAndEditButton.AddChild(editButton);
 
 			disconnectButton = textImageButtonFactory.Generate("Disconnect");