diff --git a/AM2RModPacker/ModPacker.Designer.cs b/AM2RModPacker/ModPacker.Designer.cs
index 101adef..0e6b2d4 100644
--- a/AM2RModPacker/ModPacker.Designer.cs
+++ b/AM2RModPacker/ModPacker.Designer.cs
@@ -2,6 +2,7 @@ using Eto.Forms;
 using Eto.Drawing;
 using AM2RModPackerLib.XML;
 using System.IO;
+using AM2RModPackerLib;
 
 namespace AM2RModPacker;
 
@@ -83,15 +84,15 @@ public partial class ModPacker : Form
         // Assign events
         originalZipButton.Click += OriginalZipButton_Click;
         createButton.Click += CreateButton_Click;
-        windowsCheckBox.CheckedChanged += WindowsCheckBox_CheckedChanged;
-        windowsButton.Click += WindowsButton_Click;
-        apkButton.Click += ApkButton_Click;
-        apkCheckBox.CheckedChanged += ApkCheckBoxCheckedChanged;
-        customSaveCheckBox.CheckedChanged += CustomSaveCheckBoxChecked_Changed;
-        linuxCheckBox.CheckedChanged += LinuxCheckBox_CheckedChanged;
-        linuxButton.Click += LinuxButton_Click;
+        windowsCheckBox.CheckedChanged += (_, _) => OSCheckboxChanged(ProfileOperatingSystems.Windows);
+        windowsButton.Click += (_, _) => OSButtonClicked(ProfileOperatingSystems.Windows);
+        apkCheckBox.CheckedChanged += (_, _) => OSCheckboxChanged(ProfileOperatingSystems.Android);
+        apkButton.Click += (_, _) => OSButtonClicked(ProfileOperatingSystems.Android);
+        linuxCheckBox.CheckedChanged += (_, _) => OSCheckboxChanged(ProfileOperatingSystems.Linux);
+        linuxButton.Click += (_, _) => OSButtonClicked(ProfileOperatingSystems.Linux);
         macCheckBox.CheckedChanged += macCheckBox_CheckedChanged;
-        macButton.Click += macButton_Click;
+        macButton.Click += (_, _) => OSButtonClicked(ProfileOperatingSystems.Mac);
+        customSaveCheckBox.CheckedChanged += CustomSaveCheckBoxChecked_Changed;
         customSaveButton.Click += CustomSaveDataButton_Click;
         yycCheckBox.CheckedChanged += YYCCheckBox_CheckedChanged;
     }
diff --git a/AM2RModPacker/ModPacker.cs b/AM2RModPacker/ModPacker.cs
index 6668b7a..3f28e4f 100644
--- a/AM2RModPacker/ModPacker.cs
+++ b/AM2RModPacker/ModPacker.cs
@@ -98,20 +98,6 @@ public partial class ModPacker : Form
         modInfo.MacModPath = null;
     }
     
-    private void WindowsCheckBox_CheckedChanged(object sender, EventArgs e) => OSCheckboxChanged(ProfileOperatingSystems.Windows);
-    
-    
-    private void WindowsButton_Click(object sender, EventArgs e) => OSButtonClicked(ProfileOperatingSystems.Windows);
-
-
-    private void ApkCheckBoxCheckedChanged(object sender, EventArgs e) => OSCheckboxChanged(ProfileOperatingSystems.Android);
-
-    private void ApkButton_Click(object sender, EventArgs e) => OSButtonClicked(ProfileOperatingSystems.Android);
-
-    private void LinuxCheckBox_CheckedChanged(object sender, EventArgs e) => OSCheckboxChanged(ProfileOperatingSystems.Linux);
-
-    private void LinuxButton_Click(object sender, EventArgs e) => OSButtonClicked(ProfileOperatingSystems.Linux);
-    
     private void macCheckBox_CheckedChanged(object sender, EventArgs e)
     {
         if (!yycCheckBox.Checked.Value)
@@ -123,8 +109,6 @@ public partial class ModPacker : Form
         }
     }
 
-    private void macButton_Click(object sender, EventArgs e) => OSButtonClicked(ProfileOperatingSystems.Mac);
-
     private void OriginalZipButton_Click(object sender, EventArgs e)
     {
         // Open window to select AM2R 1.1
@@ -360,7 +344,7 @@ public partial class ModPacker : Form
     
     private void OSButtonClicked(ProfileOperatingSystems os)
     {
-        string pickerMessage = null;
+        string pickerMessage = $"Please select your custom {os.ToString()} AM2R .{(os == ProfileOperatingSystems.Android ?  "apk" : "zip")}";
         Label osLabel = null;
         FieldInfo osModPathPropertyField = null;
         PropertyInfo isOsModLoaded = null;
@@ -368,25 +352,21 @@ public partial class ModPacker : Form
         switch (os)
         {
             case ProfileOperatingSystems.Windows:
-                pickerMessage = "Please select your custom Windows AM2R .zip";
                 osLabel = windowsLabel;
                 osModPathPropertyField = modInfo.GetType().GetField(nameof(modInfo.WindowsModPath));
                 isOsModLoaded = modInfo.GetType().GetProperty(nameof(modInfo.IsWindowsModLoaded));
                 break;
             case ProfileOperatingSystems.Linux:
-                pickerMessage = "Please select your custom Linux AM2R .zip";
                 osLabel = linuxLabel;
                 osModPathPropertyField = modInfo.GetType().GetField(nameof(modInfo.LinuxModPath));
                 isOsModLoaded = modInfo.GetType().GetProperty(nameof(modInfo.IsLinuxModLoaded));
                 break;
             case ProfileOperatingSystems.Mac:
-                pickerMessage = "Please select your custom Mac AM2R .zip";
                 osLabel = macLabel;
                 osModPathPropertyField = modInfo.GetType().GetField(nameof(modInfo.MacModPath));
                 isOsModLoaded = modInfo.GetType().GetProperty(nameof(modInfo.IsMacModLoaded));
                 break;
             case ProfileOperatingSystems.Android:
-                pickerMessage = "Please select your custom AM2R .apk";
                 osLabel = apkLabel;
                 osModPathPropertyField = modInfo.GetType().GetField(nameof(modInfo.ApkModPath));
                 isOsModLoaded = modInfo.GetType().GetProperty(nameof(modInfo.IsApkModLoaded));