diff --git a/CutList/CutList.csproj b/CutList/CutList.csproj
index 10b0f6a..03597cb 100644
--- a/CutList/CutList.csproj
+++ b/CutList/CutList.csproj
@@ -83,9 +83,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Controls\BinLayoutView.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="Controls\BinLayoutView.cs" />
     <Compile Include="Forms\DataGridViewExtensions.cs" />
     <Compile Include="Forms\MainForm.cs">
       <SubType>Form</SubType>
@@ -93,9 +91,7 @@
     <Compile Include="Forms\MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\ResultsForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="Forms\ResultsForm.cs" />
     <Compile Include="Forms\ResultsForm.Designer.cs">
       <DependentUpon>ResultsForm.cs</DependentUpon>
     </Compile>
diff --git a/CutList/Forms/MainForm.cs b/CutList/Forms/MainForm.cs
index a2bb2be..d4bcf8e 100644
--- a/CutList/Forms/MainForm.cs
+++ b/CutList/Forms/MainForm.cs
@@ -56,22 +56,6 @@ namespace CutList.Forms
             }
         }
 
-        private void BinInputItemBindingSource_ListChanged(object sender, ListChangedEventArgs e)
-        {
-            UpdateRunButtonState();
-        }
-
-        private void ItemBindingSource_ListChanged(object sender, ListChangedEventArgs e)
-        {
-            UpdateRunButtonState();
-        }
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-            UpdateRunButtonState();
-        }
-
         private void UpdateRunButtonState()
         {
             var isValid = IsValid();
@@ -160,6 +144,19 @@ namespace CutList.Forms
             form.ShowDialog();
         }
 
+        private string ToolsFilePath
+        {
+            get { return Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Data\\Tools.json"); }
+        }
+
+        private List<Tool> GetTools()
+        {
+            var json = File.ReadAllText(ToolsFilePath);
+            var list = JsonConvert.DeserializeObject<List<Tool>>(json);
+
+            return list;
+        }
+
         private List<BinItem> GetItems()
         {
             var items2 = new List<BinItem>();
@@ -187,6 +184,18 @@ namespace CutList.Forms
             return comboBox1.SelectedItem as Tool;
         }
 
+        private void SaveTools(IEnumerable<Tool> tools)
+        {
+            var json = JsonConvert.SerializeObject(tools, Formatting.Indented);
+            File.WriteAllText(ToolsFilePath, json);
+        }
+
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            UpdateRunButtonState();
+        }
+
         private void toolStripButton1_Click(object sender, EventArgs e)
         {
             Open();
@@ -202,25 +211,6 @@ namespace CutList.Forms
             Run();
         }
 
-        private string ToolsFilePath
-        {
-            get { return Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Data\\Tools.json"); }
-        }
-
-        private List<Tool> GetTools()
-        {
-            var json = File.ReadAllText(ToolsFilePath);
-            var list = JsonConvert.DeserializeObject<List<Tool>>(json);
-
-            return list;
-        }
-
-        private void SaveTools(IEnumerable<Tool> tools)
-        {
-            var json = JsonConvert.SerializeObject(tools, Formatting.Indented);
-            File.WriteAllText(ToolsFilePath, json);
-        }
-
         private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
         {
             var tool = comboBox1.SelectedItem as Tool;
@@ -288,5 +278,15 @@ namespace CutList.Forms
             if (e.ColumnIndex == lengthInputValueDataGridViewTextBoxColumn.Index)
                 dataGridView2.Refresh();
         }
+
+        private void BinInputItemBindingSource_ListChanged(object sender, ListChangedEventArgs e)
+        {
+            UpdateRunButtonState();
+        }
+
+        private void ItemBindingSource_ListChanged(object sender, ListChangedEventArgs e)
+        {
+            UpdateRunButtonState();
+        }
     }
 }
\ No newline at end of file