diff --git a/MFIGamepadFeeder/App.config b/MFIGamepadFeeder/App.config
index 8a48343..4f8adab 100644
--- a/MFIGamepadFeeder/App.config
+++ b/MFIGamepadFeeder/App.config
@@ -58,6 +58,12 @@
             <setting name="ControllerActive4" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="StartMinimized" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="AutoPlugIn" serializeAs="String">
+                <value>False</value>
+            </setting>
         </MFIGamepadFeeder.Properties.Settings>
     </userSettings>
   <runtime>
diff --git a/MFIGamepadFeeder/MFIGamepadFeeder.csproj b/MFIGamepadFeeder/MFIGamepadFeeder.csproj
index 0283347..ce5d125 100644
--- a/MFIGamepadFeeder/MFIGamepadFeeder.csproj
+++ b/MFIGamepadFeeder/MFIGamepadFeeder.csproj
@@ -15,7 +15,8 @@
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>D:\Users\axadiw\Desktop\MFIGamepad\</PublishUrl>
+    <HockeyAppResourceId>11e577087eab47da8e602d846426c923</HockeyAppResourceId>
+    <PublishUrl>C:\Repos\MFIGamepadRelease\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -25,13 +26,11 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <AutorunEnabled>true</AutorunEnabled>
-    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationRevision>3</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <HockeyAppResourceId>11e577087eab47da8e602d846426c923</HockeyAppResourceId>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>icon.ico</ApplicationIcon>
@@ -43,7 +42,7 @@
     <ManifestKeyFile>MFIGamepadFeeder_1_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>false</GenerateManifests>
+    <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>false</SignManifests>
@@ -225,9 +224,16 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="OptionsWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainWindowViewModel.cs" />
+    <Compile Include="OptionsWindow.xaml.cs">
+      <DependentUpon>OptionsWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/MFIGamepadFeeder/MainWindow.xaml b/MFIGamepadFeeder/MainWindow.xaml
index aa5f9e3..a6728f5 100644
--- a/MFIGamepadFeeder/MainWindow.xaml
+++ b/MFIGamepadFeeder/MainWindow.xaml
@@ -7,7 +7,8 @@
         mc:Ignorable="d"
         Title="MFI Gamepad Feeder" Width="800" Height="350"
         ResizeMode="CanResizeWithGrip" Icon="icon.ico" Closing="Window_Closing" WindowStartupLocation="CenterScreen"
-        StateChanged="Window_StateChanged" MinWidth="500" MinHeight="250">
+        StateChanged="Window_StateChanged" MinWidth="500" MinHeight="250"        
+        >
     <Grid Loaded="Grid_Loaded">
         <DockPanel>
             <tb:TaskbarIcon x:Name="NotifyIcon"
@@ -90,7 +91,20 @@
                           Unchecked="ControllerActiveCheckbox_IsCheckedChanged" />
             </Grid>
 
-            <Button x:Name="StartButton" Content="Start" Margin="10" Click="StartButton_Click" DockPanel.Dock="Top" />
+            <Grid DockPanel.Dock="Top" Margin="10">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="100"/>
+                </Grid.ColumnDefinitions>
+                <Button x:Name="StartButton" Content="Start" Click="StartButton_Click" />
+                <Button x:Name="EditorButton" Content="Mapping editor" Click="EditorButton_Click" Grid.Column="1" Margin="10,0"/>
+                <Button x:Name="OptionsButton" Content="Options" Click="OptionsButton_Click" Grid.Column="2" />
+            </Grid>
+            
             <TextBox x:Name="LogLabel" Text="" Background="#FFF3F3F3" DockPanel.Dock="Bottom" TextWrapping="Wrap"
                      ScrollViewer.HorizontalScrollBarVisibility="Visible" ScrollViewer.CanContentScroll="True"
                      HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible" IsReadOnly="True" />
diff --git a/MFIGamepadFeeder/MainWindow.xaml.cs b/MFIGamepadFeeder/MainWindow.xaml.cs
index f4fdf6d..8a8756a 100644
--- a/MFIGamepadFeeder/MainWindow.xaml.cs
+++ b/MFIGamepadFeeder/MainWindow.xaml.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
@@ -61,7 +60,10 @@ private void SetupUi()
 
         private void Grid_Loaded(object sender, RoutedEventArgs e)
         {
-            //            WindowState = WindowState.Minimized;
+            if (Settings.Default.StartMinimized)
+            {
+                WindowState = WindowState.Minimized;
+            }
 
             HidDeviceCombobox1.ItemsSource = ViewModel.HidManager.FoundDevices;
             HidDeviceCombobox2.ItemsSource = ViewModel.HidManager.FoundDevices;
@@ -108,16 +110,33 @@ private void Grid_Loaded(object sender, RoutedEventArgs e)
             ControllerActiveCheckbox2.IsChecked = Settings.Default.ControllerActive2;
             ControllerActiveCheckbox3.IsChecked = Settings.Default.ControllerActive3;
             ControllerActiveCheckbox4.IsChecked = Settings.Default.ControllerActive4;
+
+            if (Settings.Default.AutoPlugIn)
+            {
+                StartButton_Click(null, null);
+            }
         }
 
         private void DeviceId_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             try
             {
-                if (DeviceIdComboBox1.SelectedItem != null && ReferenceEquals(sender, DeviceIdComboBox1)) Settings.Default.SelectedControllerId1 = (uint)DeviceIdComboBox1.SelectedItem;
-                if (DeviceIdComboBox2.SelectedItem != null && ReferenceEquals(sender, DeviceIdComboBox2)) Settings.Default.SelectedControllerId2 = (uint)DeviceIdComboBox2.SelectedItem;
-                if (DeviceIdComboBox3.SelectedItem != null && ReferenceEquals(sender, DeviceIdComboBox3)) Settings.Default.SelectedControllerId3 = (uint)DeviceIdComboBox3.SelectedItem;
-                if (DeviceIdComboBox4.SelectedItem != null && ReferenceEquals(sender, DeviceIdComboBox4)) Settings.Default.SelectedControllerId4 = (uint)DeviceIdComboBox4.SelectedItem;
+                if ((DeviceIdComboBox1.SelectedItem != null) && ReferenceEquals(sender, DeviceIdComboBox1))
+                {
+                    Settings.Default.SelectedControllerId1 = (uint) DeviceIdComboBox1.SelectedItem;
+                }
+                if ((DeviceIdComboBox2.SelectedItem != null) && ReferenceEquals(sender, DeviceIdComboBox2))
+                {
+                    Settings.Default.SelectedControllerId2 = (uint) DeviceIdComboBox2.SelectedItem;
+                }
+                if ((DeviceIdComboBox3.SelectedItem != null) && ReferenceEquals(sender, DeviceIdComboBox3))
+                {
+                    Settings.Default.SelectedControllerId3 = (uint) DeviceIdComboBox3.SelectedItem;
+                }
+                if ((DeviceIdComboBox4.SelectedItem != null) && ReferenceEquals(sender, DeviceIdComboBox4))
+                {
+                    Settings.Default.SelectedControllerId4 = (uint) DeviceIdComboBox4.SelectedItem;
+                }
 
                 Settings.Default.Save();
             }
@@ -129,28 +148,64 @@ private void DeviceId_SelectionChanged(object sender, SelectionChangedEventArgs
 
         private void ControllerActiveCheckbox_IsCheckedChanged(object sender, RoutedEventArgs routedEventArgs)
         {
-            if (ControllerActiveCheckbox1.IsChecked != null && ReferenceEquals(sender, ControllerActiveCheckbox1)) Settings.Default.ControllerActive1 = ControllerActiveCheckbox1.IsChecked.Value;
-            if (ControllerActiveCheckbox2.IsChecked != null && ReferenceEquals(sender, ControllerActiveCheckbox2)) Settings.Default.ControllerActive2 = ControllerActiveCheckbox2.IsChecked.Value;
-            if (ControllerActiveCheckbox3.IsChecked != null && ReferenceEquals(sender, ControllerActiveCheckbox3)) Settings.Default.ControllerActive3 = ControllerActiveCheckbox3.IsChecked.Value;
-            if (ControllerActiveCheckbox4.IsChecked != null && ReferenceEquals(sender, ControllerActiveCheckbox4)) Settings.Default.ControllerActive4 = ControllerActiveCheckbox4.IsChecked.Value;
+            if ((ControllerActiveCheckbox1.IsChecked != null) && ReferenceEquals(sender, ControllerActiveCheckbox1))
+            {
+                Settings.Default.ControllerActive1 = ControllerActiveCheckbox1.IsChecked.Value;
+            }
+            if ((ControllerActiveCheckbox2.IsChecked != null) && ReferenceEquals(sender, ControllerActiveCheckbox2))
+            {
+                Settings.Default.ControllerActive2 = ControllerActiveCheckbox2.IsChecked.Value;
+            }
+            if ((ControllerActiveCheckbox3.IsChecked != null) && ReferenceEquals(sender, ControllerActiveCheckbox3))
+            {
+                Settings.Default.ControllerActive3 = ControllerActiveCheckbox3.IsChecked.Value;
+            }
+            if ((ControllerActiveCheckbox4.IsChecked != null) && ReferenceEquals(sender, ControllerActiveCheckbox4))
+            {
+                Settings.Default.ControllerActive4 = ControllerActiveCheckbox4.IsChecked.Value;
+            }
             Settings.Default.Save();
         }
 
         private void HidDeviceCombobox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (ReferenceEquals(sender, HidDeviceCombobox1)) Settings.Default.SelectedHidDevice1 = JsonConvert.SerializeObject(HidDeviceCombobox1.SelectedItem);
-            if (ReferenceEquals(sender, HidDeviceCombobox2)) Settings.Default.SelectedHidDevice2 = JsonConvert.SerializeObject(HidDeviceCombobox2.SelectedItem);
-            if (ReferenceEquals(sender, HidDeviceCombobox3)) Settings.Default.SelectedHidDevice3 = JsonConvert.SerializeObject(HidDeviceCombobox3.SelectedItem);
-            if (ReferenceEquals(sender, HidDeviceCombobox4)) Settings.Default.SelectedHidDevice4 = JsonConvert.SerializeObject(HidDeviceCombobox4.SelectedItem);
+            if (ReferenceEquals(sender, HidDeviceCombobox1))
+            {
+                Settings.Default.SelectedHidDevice1 = JsonConvert.SerializeObject(HidDeviceCombobox1.SelectedItem);
+            }
+            if (ReferenceEquals(sender, HidDeviceCombobox2))
+            {
+                Settings.Default.SelectedHidDevice2 = JsonConvert.SerializeObject(HidDeviceCombobox2.SelectedItem);
+            }
+            if (ReferenceEquals(sender, HidDeviceCombobox3))
+            {
+                Settings.Default.SelectedHidDevice3 = JsonConvert.SerializeObject(HidDeviceCombobox3.SelectedItem);
+            }
+            if (ReferenceEquals(sender, HidDeviceCombobox4))
+            {
+                Settings.Default.SelectedHidDevice4 = JsonConvert.SerializeObject(HidDeviceCombobox4.SelectedItem);
+            }
             Settings.Default.Save();
         }
 
         private void MappingFileCombobox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (ReferenceEquals(sender, MappingFileCombobox1)) Settings.Default.SelectedConfigFile1 = MappingFileCombobox1.SelectedItem as string;
-            if (ReferenceEquals(sender, MappingFileCombobox2)) Settings.Default.SelectedConfigFile2 = MappingFileCombobox2.SelectedItem as string;
-            if (ReferenceEquals(sender, MappingFileCombobox3)) Settings.Default.SelectedConfigFile3 = MappingFileCombobox3.SelectedItem as string;
-            if (ReferenceEquals(sender, MappingFileCombobox4)) Settings.Default.SelectedConfigFile4 = MappingFileCombobox4.SelectedItem as string;
+            if (ReferenceEquals(sender, MappingFileCombobox1))
+            {
+                Settings.Default.SelectedConfigFile1 = MappingFileCombobox1.SelectedItem as string;
+            }
+            if (ReferenceEquals(sender, MappingFileCombobox2))
+            {
+                Settings.Default.SelectedConfigFile2 = MappingFileCombobox2.SelectedItem as string;
+            }
+            if (ReferenceEquals(sender, MappingFileCombobox3))
+            {
+                Settings.Default.SelectedConfigFile3 = MappingFileCombobox3.SelectedItem as string;
+            }
+            if (ReferenceEquals(sender, MappingFileCombobox4))
+            {
+                Settings.Default.SelectedConfigFile4 = MappingFileCombobox4.SelectedItem as string;
+            }
 
             Settings.Default.Save();
         }
@@ -167,13 +222,10 @@ private void Log(string message)
                 LogLabel.Text += $"{DateTime.Now}: {message}{Environment.NewLine}";
                 LogLabel.ScrollToEnd();
             });
-        }        
+        }
 
         private void StartButton_Click(object sender, RoutedEventArgs e)
         {
-            StartButton.Content = "Processing...";
-            StartButton.UpdateLayout();
-
             if (!ViewModel.IsRunning.Value)
             {
                 var activeGamepads = GamepadControls.Keys.Where(box => (box.IsChecked != null) && box.IsChecked.Value).ToList();
@@ -206,7 +258,7 @@ private void StartButton_Click(object sender, RoutedEventArgs e)
             {
                 ViewModel.Stop();
             }
-        }        
+        }
 
 
         private void Window_Closing(object sender, CancelEventArgs e)
@@ -235,5 +287,15 @@ private void Window_StateChanged(object sender, EventArgs e)
             }
         }
 
+        private void OptionsButton_Click(object sender, RoutedEventArgs e)
+        {
+            var optionsWindow = new OptionsWindow();
+            optionsWindow.ShowDialog();
+        }
+
+        private void EditorButton_Click(object sender, RoutedEventArgs e)
+        {
+            
+        }
     }
 }
\ No newline at end of file
diff --git a/MFIGamepadFeeder/OptionsWindow.xaml b/MFIGamepadFeeder/OptionsWindow.xaml
new file mode 100644
index 0000000..d225e0a
--- /dev/null
+++ b/MFIGamepadFeeder/OptionsWindow.xaml
@@ -0,0 +1,25 @@
+<Window x:Class="MFIGamepadFeeder.OptionsWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:MFIGamepadFeeder"
+        mc:Ignorable="d"
+        Title="OptionsWindow" Height="130" Width="300" ResizeMode="NoResize"
+        WindowStartupLocation="CenterScreen"
+        >
+    <Grid Loaded="Grid_Loaded">
+        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+            <StackPanel Orientation="Horizontal" >
+                <CheckBox x:Name="StartMinimizedCheckBox" VerticalAlignment="Center"></CheckBox>
+                <Label Content="Start minimized" VerticalAlignment="Center" MouseDown="StartMinimized_MouseDown"></Label>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" >
+                <CheckBox x:Name="AutoPlugInCheckBox" VerticalAlignment="Center"></CheckBox>
+                <Label Content="Automatically plugin all controllers at launch" VerticalAlignment="Center" MouseDown="AutoPlugIn_MouseDown"></Label>
+            </StackPanel>
+
+            <Button x:Name="SaveButton" Content="Save" HorizontalAlignment="Center" Margin="0,10,0,0" Click="SaveButton_Click"></Button>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/MFIGamepadFeeder/OptionsWindow.xaml.cs b/MFIGamepadFeeder/OptionsWindow.xaml.cs
new file mode 100644
index 0000000..e5771e4
--- /dev/null
+++ b/MFIGamepadFeeder/OptionsWindow.xaml.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using MFIGamepadFeeder.Properties;
+
+namespace MFIGamepadFeeder
+{
+    /// <summary>
+    /// Interaction logic for OptionsWindow.xaml
+    /// </summary>
+    public partial class OptionsWindow : Window
+    {
+        public OptionsWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void Grid_Loaded(object sender, RoutedEventArgs e)
+        {
+            AutoPlugInCheckBox.IsChecked = Settings.Default.AutoPlugIn;
+            StartMinimizedCheckBox.IsChecked = Settings.Default.StartMinimized;
+        }
+
+        private void SaveButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (AutoPlugInCheckBox.IsChecked != null) Settings.Default.AutoPlugIn = AutoPlugInCheckBox.IsChecked.Value;
+            if (StartMinimizedCheckBox.IsChecked != null) Settings.Default.StartMinimized = StartMinimizedCheckBox.IsChecked.Value;
+            Settings.Default.Save();
+            Close();
+        }
+
+        private void StartMinimized_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            StartMinimizedCheckBox.IsChecked = !StartMinimizedCheckBox.IsChecked;
+        }
+
+        private void AutoPlugIn_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            AutoPlugInCheckBox.IsChecked = !AutoPlugInCheckBox.IsChecked;
+        }
+    }
+}
diff --git a/MFIGamepadFeeder/Properties/Settings.Designer.cs b/MFIGamepadFeeder/Properties/Settings.Designer.cs
index a2931bb..9b153be 100644
--- a/MFIGamepadFeeder/Properties/Settings.Designer.cs
+++ b/MFIGamepadFeeder/Properties/Settings.Designer.cs
@@ -214,5 +214,29 @@ public bool ControllerActive4 {
                 this["ControllerActive4"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool StartMinimized {
+            get {
+                return ((bool)(this["StartMinimized"]));
+            }
+            set {
+                this["StartMinimized"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool AutoPlugIn {
+            get {
+                return ((bool)(this["AutoPlugIn"]));
+            }
+            set {
+                this["AutoPlugIn"] = value;
+            }
+        }
     }
 }
diff --git a/MFIGamepadFeeder/Properties/Settings.settings b/MFIGamepadFeeder/Properties/Settings.settings
index bcc152b..cbeb5c8 100644
--- a/MFIGamepadFeeder/Properties/Settings.settings
+++ b/MFIGamepadFeeder/Properties/Settings.settings
@@ -50,5 +50,11 @@
     <Setting Name="ControllerActive4" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="StartMinimized" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="AutoPlugIn" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file