diff --git a/MatterControl.csproj b/MatterControl.csproj
index 7d99859e9..fbd4675e7 100644
--- a/MatterControl.csproj
+++ b/MatterControl.csproj
@@ -209,6 +209,7 @@
     <Compile Include="Library\Providers\Zip\ZipMemoryContainer.cs" />
     <Compile Include="PartPreviewWindow\LayerNavigationWidget.cs" />
     <Compile Include="PartPreviewWindow\OverflowDropdown.cs" />
+    <Compile Include="PartPreviewWindow\SetLayerWidget.cs" />
     <Compile Include="PartPreviewWindow\View3D\GridOptionsPanel.cs" />
     <Compile Include="PartPreviewWindow\View3D\InteractionVolume.cs" />
     <Compile Include="PartPreviewWindow\View3D\MeshViewerWidget.cs" />
diff --git a/PartPreviewWindow/SetLayerWidget.cs b/PartPreviewWindow/SetLayerWidget.cs
new file mode 100644
index 000000000..4d156de84
--- /dev/null
+++ b/PartPreviewWindow/SetLayerWidget.cs
@@ -0,0 +1,68 @@
+/*
+Copyright (c) 2017, Lars Brubaker, John Lewin
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+either expressed or implied, of the FreeBSD Project.
+*/
+
+using MatterHackers.Agg;
+using MatterHackers.Agg.UI;
+using MatterHackers.Localizations;
+
+namespace MatterHackers.MatterControl.PartPreviewWindow
+{
+	public class SetLayerWidget : FlowLayoutWidget
+	{
+		public SetLayerWidget(ViewGcodeWidget gcodeViewWidget, TextImageButtonFactory buttonFactory)
+			: base(FlowDirection.LeftToRight)
+		{
+			var editCurrentLayerIndex = new NumberEdit(1, pixelWidth: 40)
+			{
+				VAnchor = VAnchor.ParentCenter,
+				Name = "Current GCode Layer Edit",
+				Margin = new BorderDouble(5, 0)
+			};
+			editCurrentLayerIndex.EditComplete += (s, e) =>
+			{
+				gcodeViewWidget.ActiveLayerIndex = ((int)editCurrentLayerIndex.Value - 1);
+				editCurrentLayerIndex.Value = gcodeViewWidget.ActiveLayerIndex + 1;
+			};
+			this.AddChild(editCurrentLayerIndex);
+
+			gcodeViewWidget.ActiveLayerChanged += (s, e) =>
+			{
+				editCurrentLayerIndex.Value = gcodeViewWidget.ActiveLayerIndex + 1;
+			};
+
+			var setLayerButton = buttonFactory.Generate("Go".Localize());
+			setLayerButton.VAnchor = VAnchor.ParentCenter;
+			setLayerButton.Click += (s, e) =>
+			{
+				gcodeViewWidget.ActiveLayerIndex = ((int)editCurrentLayerIndex.Value - 1);
+			};
+			this.AddChild(setLayerButton);
+		}
+	}
+}
diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs
index 6817ed720..9023b2b7f 100644
--- a/PartPreviewWindow/ViewGcodeBasic.cs
+++ b/PartPreviewWindow/ViewGcodeBasic.cs
@@ -1089,37 +1089,4 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			startedSliceFromGenerateButton = false;
 		}
 	}
-
-	public class SetLayerWidget : FlowLayoutWidget
-	{
-		public SetLayerWidget(ViewGcodeWidget gcodeViewWidget, TextImageButtonFactory buttonFactory)
-			: base(FlowDirection.LeftToRight)
-		{
-			var editCurrentLayerIndex = new NumberEdit(1, pixelWidth: 40)
-			{
-				VAnchor = VAnchor.ParentCenter,
-				Name = "Current GCode Layer Edit",
-				Margin = new BorderDouble(5, 0)
-			};
-			editCurrentLayerIndex.EditComplete += (s, e) =>
-			{
-				gcodeViewWidget.ActiveLayerIndex = ((int)editCurrentLayerIndex.Value - 1);
-				editCurrentLayerIndex.Value = gcodeViewWidget.ActiveLayerIndex + 1;
-			};
-			this.AddChild(editCurrentLayerIndex);
-
-			gcodeViewWidget.ActiveLayerChanged += (s, e) =>
-			{
-				editCurrentLayerIndex.Value = gcodeViewWidget.ActiveLayerIndex + 1;
-			};
-
-			var setLayerButton = buttonFactory.Generate("Go".Localize());
-			setLayerButton.VAnchor = VAnchor.ParentCenter;
-			setLayerButton.Click += (s, e) =>
-			{
-				gcodeViewWidget.ActiveLayerIndex = ((int)editCurrentLayerIndex.Value - 1);
-			};
-			this.AddChild(setLayerButton);
-		}
-	}
 }