diff --git a/PartPreviewWindow/View3D/View3DCreateSelecitonData.cs b/PartPreviewWindow/View3D/View3DCreateSelecitonData.cs
index 1cc692e55..aff369a3d 100644
--- a/PartPreviewWindow/View3D/View3DCreateSelecitonData.cs
+++ b/PartPreviewWindow/View3D/View3DCreateSelecitonData.cs
@@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
         void createSelectionDataBackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
         {
-            string makingCopyLabel = LocalizedString.Get("Creating Edit Data");
+            string makingCopyLabel = LocalizedString.Get("Preparing Meshes");
             string makingCopyLabelFull = string.Format("{0}:", makingCopyLabel);
             processingProgressControl.textWidget.Text = makingCopyLabelFull;
 
@@ -110,6 +110,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
             // remove the original mesh and replace it with these new meshes
             PullMeshGroupDataFromAsynchLists();
 
+			buttonRightPanel.Visible = true;
             UnlockEditControls();
             viewControls3D.partSelectButton.ClickButton(null);
 
diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs
index 08f9a44dc..340dae31f 100644
--- a/PartPreviewWindow/View3D/View3DWidget.cs
+++ b/PartPreviewWindow/View3D/View3DWidget.cs
@@ -307,6 +307,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
             buttonBottomPanel.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
 
             buttonRightPanel = CreateRightButtonPanel(viewerVolume.y);
+			buttonRightPanel.Visible = false;
 
             CreateOptionsContent();
 
diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs
index ecf2aea4a..3bbf0f62b 100644
--- a/PartPreviewWindow/ViewGcodeBasic.cs
+++ b/PartPreviewWindow/ViewGcodeBasic.cs
@@ -232,6 +232,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
             centerPartPreviewAndControls.AddChild(gcodeDisplayWidget);
 
             buttonRightPanel = CreateRightButtonPanel();
+			buttonRightPanel.Visible = false;
             centerPartPreviewAndControls.AddChild(buttonRightPanel);
 
             // add in a spacer
@@ -342,8 +343,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
             FlowLayoutWidget buttonRightPanel = new FlowLayoutWidget(FlowDirection.TopToBottom);
             buttonRightPanel.Width = 200;
             {
-                BorderDouble buttonMargin = new BorderDouble(top: 3);
-
                 string label = "Model".Localize().ToUpper();
 				expandModelOptions = expandMenuOptionFactory.GenerateCheckBoxButton(label, "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png");
                 expandModelOptions.Margin = new BorderDouble(bottom: 2);
@@ -807,6 +806,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
                 && gcodeViewWidget.LoadedGCode.Count > 0)
             {
                 CreateOptionsContent();
+				buttonRightPanel.Visible = true;
 
                 CloseIfNotNull(setLayerWidget);
                 setLayerWidget = new SetLayerWidget(gcodeViewWidget);