diff --git a/ApplicationView/CompactTabView.cs b/ApplicationView/CompactTabView.cs
index c6fdfa194..0010f02af 100644
--- a/ApplicationView/CompactTabView.cs
+++ b/ApplicationView/CompactTabView.cs
@@ -109,7 +109,6 @@ namespace MatterHackers.MatterControl
             this.AddTab(new SimpleTextTabWidget(HistoryTabPage, "History Tab", TabTextSize,
                     ActiveTheme.Instance.SecondaryAccentColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes()));
 
-            
 			GuiWidget manualPrinterControls = new ManualPrinterControls();
 
             part3DViewContainer = new GuiWidget();
@@ -175,8 +174,6 @@ namespace MatterHackers.MatterControl
 			UiThread.RunOnIdle(ReloadAdvancedControlsPanel);
 		}
 
-
-
 		void reloadSliceSettingsWidget()
 		{
 			//Store the UI state from the current display
@@ -226,8 +223,7 @@ namespace MatterHackers.MatterControl
             partGcodeView = new ViewGcodeBasic(PrinterConnectionAndCommunication.Instance.ActivePrintItem,
                 new Vector3(ActiveSliceSettings.Instance.BedSize, buildHeight),
                 ActiveSliceSettings.Instance.BedCenter,
-                ActiveSliceSettings.Instance.BedShape,
-                false);
+                ActiveSliceSettings.Instance.BedShape, ViewGcodeBasic.WindowMode.Embeded);
             partGcodeView.AnchorAll();
 
             partGcodeViewContainer.RemoveAllChildren();
diff --git a/ApplicationView/MainApplicationWidget.cs b/ApplicationView/MainApplicationWidget.cs
index 629122c95..32ff21012 100644
--- a/ApplicationView/MainApplicationWidget.cs
+++ b/ApplicationView/MainApplicationWidget.cs
@@ -62,7 +62,7 @@ namespace MatterHackers.MatterControl
 
     public class CompactApplicationView : ApplicationView
     {
-        CompactTabView widescreenPanel;
+        CompactTabView compactTabView;
         QueueDataView queueDataView;
 		GuiWidget menuSeparator;
 		PrintProgressBar progressBar; 
@@ -127,10 +127,10 @@ namespace MatterHackers.MatterControl
 
             container.AddChild(progressBar);
 			container.AddChild(menuSeparator);
-            widescreenPanel = new CompactTabView(queueDataView);
+            compactTabView = new CompactTabView(queueDataView);
 
 			BottomOverlay bottomOverlay = new BottomOverlay();
-			bottomOverlay.AddChild(widescreenPanel);
+			bottomOverlay.AddChild(compactTabView);
 
 			container.AddChild(bottomOverlay);
 
diff --git a/PartPreviewWindow/PartPreviewContent.cs b/PartPreviewWindow/PartPreviewContent.cs
index 5cabfd1dc..8f58c6ca0 100644
--- a/PartPreviewWindow/PartPreviewContent.cs
+++ b/PartPreviewWindow/PartPreviewContent.cs
@@ -89,16 +89,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 				selectedTabColor = ActiveTheme.Instance.SecondaryAccentColor;
 			}
 
-			bool showCloseButton;
-            if (windowMode == View3DWidget.WindowMode.StandAlone)
-			{
-				showCloseButton = false;
-			}
-			else
-			{
-				showCloseButton = true;
-			}
-
 			double buildHeight = ActiveSliceSettings.Instance.BuildHeight;
 
 			// put in the 3D view
@@ -125,10 +115,16 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 			// put in the gcode view
 			{
-				viewGcodeBasic = new ViewGcodeBasic(printItem,
-					new Vector3(ActiveSliceSettings.Instance.BedSize, buildHeight),
-					ActiveSliceSettings.Instance.BedCenter,
-					ActiveSliceSettings.Instance.BedShape,showCloseButton);
+                ViewGcodeBasic.WindowMode gcodeWindowMode = ViewGcodeBasic.WindowMode.Embeded;
+                if (windowMode == View3DWidget.WindowMode.StandAlone)
+                {
+                    gcodeWindowMode = ViewGcodeBasic.WindowMode.StandAlone;
+                }
+
+                viewGcodeBasic = new ViewGcodeBasic(printItem,
+                    new Vector3(ActiveSliceSettings.Instance.BedSize, buildHeight),
+                    ActiveSliceSettings.Instance.BedCenter,
+                    ActiveSliceSettings.Instance.BedShape, gcodeWindowMode);
 
                 viewGcodeBasic.Closed += (sender, e) =>
                 {
diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs
index 73210e1ee..290f9aa03 100644
--- a/PartPreviewWindow/ViewGcodeBasic.cs
+++ b/PartPreviewWindow/ViewGcodeBasic.cs
@@ -44,6 +44,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 {
     public class ViewGcodeBasic : PartPreview3DWidget
     {
+        public enum WindowMode { Embeded, StandAlone };
+
         public SolidSlider selectLayerSlider;
 
         SetLayerWidget setLayerWidget;
@@ -69,7 +71,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
         GuiWidget gcodeDisplayWidget;
 
         EventHandler unregisterEvents;
-        bool widgetHasCloseButton;
+        WindowMode windowMode;
 
         public delegate Vector2 GetSizeFunction();
 
@@ -82,12 +84,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
         MeshViewerWidget.BedShape bedShape;
         int sliderWidth;
 
-        public ViewGcodeBasic(PrintItemWrapper printItem, Vector3 viewerVolume, Vector2 bedCenter, MeshViewerWidget.BedShape bedShape, bool addCloseButton)
+        public ViewGcodeBasic(PrintItemWrapper printItem, Vector3 viewerVolume, Vector2 bedCenter, MeshViewerWidget.BedShape bedShape, WindowMode windowMode)
         {
             this.viewerVolume = viewerVolume;
             this.bedShape = bedShape;
             this.bedCenter = bedCenter;
-            widgetHasCloseButton = addCloseButton;
+            this.windowMode = windowMode;
             this.printItem = printItem;
 
             if (ActiveTheme.Instance.DisplayMode == ActiveTheme.ApplicationDisplayType.Touchscreen)
@@ -171,7 +173,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
             GuiWidget holdPanelOpen = new GuiWidget(1, generateGCodeButton.Height);
             layerSelectionButtonsPanel.AddChild(holdPanelOpen);
 
-            if (widgetHasCloseButton)
+            if (windowMode == WindowMode.StandAlone)
             {
                 Button closeButton = textImageButtonFactory.Generate(LocalizedString.Get("Close"));
                 layerSelectionButtonsPanel.AddChild(closeButton);
@@ -601,7 +603,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
             }
 
             // Put in the sync to print checkbox
-            if (!widgetHasCloseButton)
+            if (windowMode == WindowMode.Embeded)
             {
                 syncToPrint = new CheckBox("Sync To Print".Localize(), textColor: ActiveTheme.Instance.PrimaryTextColor);
 				syncToPrint.Checked = (UserSettings.Instance.get("LayerViewSyncToPrint") == "True");
@@ -641,7 +643,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
         private void SetSyncToPrintVisibility()
         {
-            if (!widgetHasCloseButton)
+            if (windowMode == WindowMode.Embeded)
             {
                 if (syncToPrint.Checked)
                 {