diff --git a/MinecraftUSkinEditor/MainForm.Designer.cs b/MinecraftUSkinEditor/MainForm.Designer.cs
index a275be63..ecd3bc75 100644
--- a/MinecraftUSkinEditor/MainForm.Designer.cs
+++ b/MinecraftUSkinEditor/MainForm.Designer.cs
@@ -878,73 +878,61 @@
 			// 
 			this.skinToolStripMenuItem1.Name = "skinToolStripMenuItem1";
 			resources.ApplyResources(this.skinToolStripMenuItem1, "skinToolStripMenuItem1");
-			this.skinToolStripMenuItem1.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 0); };
 			// 
 			// capeToolStripMenuItem
 			// 
 			this.capeToolStripMenuItem.Name = "capeToolStripMenuItem";
 			resources.ApplyResources(this.capeToolStripMenuItem, "capeToolStripMenuItem");
-			this.capeToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 1); };
 			// 
 			// textureToolStripMenuItem
 			// 
 			this.textureToolStripMenuItem.Name = "textureToolStripMenuItem";
 			resources.ApplyResources(this.textureToolStripMenuItem, "textureToolStripMenuItem");
-			this.textureToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 2); };
 			// 
 			// languagesFileLOCToolStripMenuItem
 			// 
 			this.languagesFileLOCToolStripMenuItem.Name = "languagesFileLOCToolStripMenuItem";
 			resources.ApplyResources(this.languagesFileLOCToolStripMenuItem, "languagesFileLOCToolStripMenuItem");
-			this.languagesFileLOCToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 6); };
 			// 
 			// gameRulesFileGRFToolStripMenuItem
 			// 
 			this.gameRulesFileGRFToolStripMenuItem.Name = "gameRulesFileGRFToolStripMenuItem";
 			resources.ApplyResources(this.gameRulesFileGRFToolStripMenuItem, "gameRulesFileGRFToolStripMenuItem");
-			this.gameRulesFileGRFToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 7); };
 			// 
 			// audioPCKFileToolStripMenuItem
 			// 
 			this.audioPCKFileToolStripMenuItem.Name = "audioPCKFileToolStripMenuItem";
 			resources.ApplyResources(this.audioPCKFileToolStripMenuItem, "audioPCKFileToolStripMenuItem");
-			this.audioPCKFileToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 8); };
 			// 
 			// coloursCOLFileToolStripMenuItem
 			// 
 			this.coloursCOLFileToolStripMenuItem.Name = "coloursCOLFileToolStripMenuItem";
 			resources.ApplyResources(this.coloursCOLFileToolStripMenuItem, "coloursCOLFileToolStripMenuItem");
-			this.coloursCOLFileToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 9); };
 			// 
 			// gameRulesHeaderGRHToolStripMenuItem
 			// 
 			this.gameRulesHeaderGRHToolStripMenuItem.Name = "gameRulesHeaderGRHToolStripMenuItem";
 			resources.ApplyResources(this.gameRulesHeaderGRHToolStripMenuItem, "gameRulesHeaderGRHToolStripMenuItem");
-			this.gameRulesHeaderGRHToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 10); };
 			// 
 			// skinsPCKToolStripMenuItem
 			// 
 			this.skinsPCKToolStripMenuItem.Name = "skinsPCKToolStripMenuItem";
 			resources.ApplyResources(this.skinsPCKToolStripMenuItem, "skinsPCKToolStripMenuItem");
-			this.skinsPCKToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 11); };
 			// 
 			// modelsFileBINToolStripMenuItem
 			// 
 			this.modelsFileBINToolStripMenuItem.Name = "modelsFileBINToolStripMenuItem";
 			resources.ApplyResources(this.modelsFileBINToolStripMenuItem, "modelsFileBINToolStripMenuItem");
-			this.modelsFileBINToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 12); };
 			// 
 			// behavioursFileBINToolStripMenuItem
 			// 
 			this.behavioursFileBINToolStripMenuItem.Name = "behavioursFileBINToolStripMenuItem";
 			resources.ApplyResources(this.behavioursFileBINToolStripMenuItem, "behavioursFileBINToolStripMenuItem");
-			this.behavioursFileBINToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 13); };
 			// 
 			// entityMaterialsFileBINToolStripMenuItem
 			// 
 			this.entityMaterialsFileBINToolStripMenuItem.Name = "entityMaterialsFileBINToolStripMenuItem";
 			resources.ApplyResources(this.entityMaterialsFileBINToolStripMenuItem, "entityMaterialsFileBINToolStripMenuItem");
-			this.entityMaterialsFileBINToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 14); };
 			// 
 			// MainForm
 			// 
diff --git a/MinecraftUSkinEditor/MainForm.cs b/MinecraftUSkinEditor/MainForm.cs
index aa095e08..95529488 100644
--- a/MinecraftUSkinEditor/MainForm.cs
+++ b/MinecraftUSkinEditor/MainForm.cs
@@ -23,7 +23,7 @@ namespace PckStudio
 {
     public partial class MainForm : MetroFramework.Forms.MetroForm
     {
-        string saveLocation = string.Empty;
+        public string saveLocation = string.Empty;
         PCKFile currentPCK = null;
         bool needsUpdate = false;
         bool saved = true;
@@ -31,6 +31,18 @@ namespace PckStudio
         public MainForm()
         {
             InitializeComponent();
+            this.skinToolStripMenuItem1.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 0); };
+            this.capeToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 1); };
+            this.textureToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 2); };
+            this.languagesFileLOCToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 6); };
+            this.gameRulesFileGRFToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 7); };
+            this.audioPCKFileToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 8); };
+            this.coloursCOLFileToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 9); };
+            this.gameRulesHeaderGRHToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 10); };
+            this.skinsPCKToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 11); };
+            this.modelsFileBINToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 12); };
+            this.behavioursFileBINToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 13); };
+            this.entityMaterialsFileBINToolStripMenuItem.Click += (sender, EventArgs) => { setFileType_Click(sender, EventArgs, 14); };
             imageList.Images.Add(Resources.ZZFolder);
             imageList.Images.Add(Resources.BINKA_ICON);
             imageList.Images.Add(Resources.IMAGE_ICON);
diff --git a/MinecraftUSkinEditor/Resources/terrain.png b/MinecraftUSkinEditor/Resources/terrain.png
index 2c15196a..1688c5bb 100644
Binary files a/MinecraftUSkinEditor/Resources/terrain.png and b/MinecraftUSkinEditor/Resources/terrain.png differ