diff --git a/ControlElements/PopOutManager.cs b/ControlElements/PopOutManager.cs
index 60ce32696..d8ad182a7 100644
--- a/ControlElements/PopOutManager.cs
+++ b/ControlElements/PopOutManager.cs
@@ -97,6 +97,7 @@ namespace MatterHackers.MatterControl
                 }
 
                 PopedOutSystemWindow = new SystemWindow(width, height);
+				PopedOutSystemWindow.Padding = new BorderDouble(3);
                 PopedOutSystemWindow.Title = windowTitle;
                 PopedOutSystemWindow.AlwaysOnTopOfMain = true;
                 PopedOutSystemWindow.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
diff --git a/MatterControl.sln b/MatterControl.sln
index 9ea7812bb..b2888ead5 100644
--- a/MatterControl.sln
+++ b/MatterControl.sln
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl", "MatterControl.csproj", "{0B8D6F56-BD7F-4426-B858-D9292B084656}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F67AE800-B0C7-42A8-836F-597B4E74591C} = {F67AE800-B0C7-42A8-836F-597B4E74591C}
@@ -104,6 +106,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{9EA7B0
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrintNotifications", "..\CloudServicesPlugin\PrintNotifications\PrintNotifications.csproj", "{291CD87C-2C58-4369-9D85-238C7EB31542}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarlinFirmwareUpdatePlugin", "..\MarlinFirmwareUpdatePlugin\MarlinFirmwareUpdatePlugin\MarlinFirmwareUpdatePlugin.csproj", "{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -690,11 +694,28 @@ Global
 		{291CD87C-2C58-4369-9D85-238C7EB31542}.Release64|x64.ActiveCfg = Release64|x64
 		{291CD87C-2C58-4369-9D85-238C7EB31542}.Release64|x64.Build.0 = Release64|x64
 		{291CD87C-2C58-4369-9D85-238C7EB31542}.Release64|x86.ActiveCfg = Release64|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Debug64|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Debug64|Any CPU.Build.0 = Debug|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Debug64|x64.ActiveCfg = Debug|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Debug64|x86.ActiveCfg = Debug|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Release|x64.ActiveCfg = Release|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Release|x86.ActiveCfg = Release|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Release64|Any CPU.ActiveCfg = Release|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Release64|Any CPU.Build.0 = Release|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Release64|x64.ActiveCfg = Release|Any CPU
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934}.Release64|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
 		{670BDDFF-927B-425D-9DD1-22ACB14356EB} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
 		{D3E41B4E-BFBB-44CA-94C8-95C00F754FDD} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
 		{545B6912-77FF-4B34-BA76-6C3D6A32BE6A} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
@@ -711,14 +732,14 @@ Global
 		{9B062971-A88E-4A3D-B3C9-12B78D15FA66} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
 		{DF6845CD-64C6-4263-8357-DA8066855739} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
 		{A526DC5D-65F3-461B-805F-D3AC9665F5C9} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
-		{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
-		{AE37DE1F-22F7-49EE-8732-FC6BC8DC58D9} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
 		{F49EC1DD-D645-4709-8667-B57318AF67B0} = {DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84}
 		{239CC6B1-537C-4998-9AA9-3372A3464498} = {DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84}
 		{BEC6FD13-C765-4B90-836B-53823AC12E20} = {DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84}
+		{3E4AABA8-D85F-4922-88C6-5C1B2D2308FB} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
 		{6782BF37-8139-4DC6-885E-98D22D1FB258} = {DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84}
 		{F5D74163-145F-47BF-83DC-D0E07249C6CA} = {DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84}
 		{291CD87C-2C58-4369-9D85-238C7EB31542} = {DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84}
+		{1B4AF237-0171-4D5C-B2C1-B8F3EB9A5934} = {DA2BE4E5-5FB2-4C74-9170-0D2513AAFC84}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = MatterControl.csproj
diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt
index 602e980e4..3ff29dc57 100644
--- a/StaticData/Translations/Master.txt
+++ b/StaticData/Translations/Master.txt
@@ -3035,3 +3035,18 @@ Translated:Printing: {0}
 English:Finished Print: {0}
 Translated:Finished Print: {0}
 
+English:Smaller numbers create less support. Larger numbers create more support. Starting at 0, the angles from the bed that requires support.
+Translated:Smaller numbers create less support. Larger numbers create more support. Starting at 0, the angles from the bed that requires support.
+
+English:Preview
+Translated:Preview
+
+English:Send Test
+Translated:Send Test
+
+English:NOTE: Standard messaging rates may apply.
+Translated:NOTE: Standard messaging rates may apply.
+
+English:Include a picture of my finished print
+Translated:Include a picture of my finished print
+