diff --git a/ControlElements/TextImageButtonFactory.cs b/ControlElements/TextImageButtonFactory.cs
index fde0909d9..c653b41ca 100644
--- a/ControlElements/TextImageButtonFactory.cs
+++ b/ControlElements/TextImageButtonFactory.cs
@@ -686,7 +686,7 @@ namespace MatterHackers.MatterControl
 			this.Normal = new ButtonOptionSection()
 			{
 				TextColor = ActiveTheme.Instance.PrimaryTextColor,
-				FillColor = new RGBA_Bytes(0, 0, 0, 0),
+				FillColor = new RGBA_Bytes(0, 0, 0, 20),
 				BorderColor = new RGBA_Bytes(255, 255, 255, 0)
 			};
 
diff --git a/PartPreviewWindow/View3D/GeneralObject3DEditor.cs b/PartPreviewWindow/View3D/GeneralObject3DEditor.cs
index 3ee66ac7c..73cf1002a 100644
--- a/PartPreviewWindow/View3D/GeneralObject3DEditor.cs
+++ b/PartPreviewWindow/View3D/GeneralObject3DEditor.cs
@@ -53,11 +53,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 		{
 			this.view3DWidget = view3DWidget;
 			this.item = item;
-			FlowLayoutWidget mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
+
+			FlowLayoutWidget mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom)
+			{
+				Padding = new BorderDouble(right: 3)
+			};
 
 			FlowLayoutWidget behavior3DTypeButtons = new FlowLayoutWidget();
 			mainContainer.AddChild(behavior3DTypeButtons);
 
+			var buttonMargin = new BorderDouble(2, 5);
+
 			// put in the button for making the behavior solid
 			Button solidButtonView = theme.ButtonFactory.Generate("Solid".Localize());
 			var solidBehaviorButton = new PopupButton(solidButtonView)
@@ -70,7 +76,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 					VAnchor = VAnchor.FitToChildren,
 					BackgroundColor = RGBA_Bytes.White
 				},
-				Margin = new BorderDouble(0, 5)
+				Margin = buttonMargin
 			};
 			solidButtonView.Click += (s, e) =>
 			{
@@ -81,7 +87,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			// put in the button for making the behavior a hole
 			Button holeBehaviorButton = theme.ButtonFactory.Generate("Hole".Localize());
-			holeBehaviorButton.Margin = new BorderDouble(0, 5);
+			holeBehaviorButton.Margin = buttonMargin;
 			holeBehaviorButton.Click += (s, e) =>
 			{
 				item.OutputType = PrintOutputTypes.Hole;
@@ -92,7 +98,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			// put in the button for making the behavior support
 			Button supportBehaviorButton = theme.ButtonFactory.Generate("Support".Localize());
-			supportBehaviorButton.Margin = new BorderDouble(0, 5);
+			supportBehaviorButton.Margin = buttonMargin;
 			supportBehaviorButton.Click += (s, e) =>
 			{
 				item.OutputType = PrintOutputTypes.Support;
diff --git a/PartPreviewWindow/View3D/PrinterActionsBar.cs b/PartPreviewWindow/View3D/PrinterActionsBar.cs
index 544414646..810e84d8f 100644
--- a/PartPreviewWindow/View3D/PrinterActionsBar.cs
+++ b/PartPreviewWindow/View3D/PrinterActionsBar.cs
@@ -96,8 +96,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			this.AddChild(new PrintActionRow(buttonFactory, this, defaultMargin));
 
-			this.AddChild(new HorizontalSpacer());
-
 			var initialMargin = buttonFactory.Margin;
 
 			var sliceButton = buttonFactory.Generate("Slice".Localize());
@@ -120,7 +118,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 							// Save any pending changes before starting the print
 							await ApplicationController.Instance.ActiveView3DWidget.PersistPlateIfNeeded();
-							
+
 							await SlicingQueue.SliceFileAsync(printItem, sliceProgressReporter);
 
 							gcodeLoadCancellationTokenSource = new CancellationTokenSource();
@@ -152,6 +150,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			this.AddChild(sliceButton);
 
+			this.AddChild(new HorizontalSpacer());
+
 			this.AddChild(new TemperatureWidgetExtruder(ApplicationController.Instance.Theme.MenuButtonFactory)
 			{
 				Margin = new BorderDouble(right: 10)