diff --git a/ModAssistant/Pages/Options.xaml b/ModAssistant/Pages/Options.xaml
index 98a2f4c..5fc2750 100644
--- a/ModAssistant/Pages/Options.xaml
+++ b/ModAssistant/Pages/Options.xaml
@@ -174,83 +174,55 @@
             IsChecked="{Binding ReinstallInstalledMods, Mode=TwoWay}"
             Unchecked="ReinstallInstalled_Unchecked" />
 
-        <TextBlock
-            Grid.Row="7"
+        <Menu
+            Grid.Row="8"
+            Grid.Column="0"
             Margin="5"
-            HorizontalAlignment="Left"
-            FontSize="16"
-            FontWeight="Bold">
-            <TextBlock Text="{DynamicResource Options:EnableOneClickInstalls}" />
-            : ↳
-        </TextBlock>
-
-        <TextBlock
-            Grid.Row="8"
-            Margin="50,5,5,5"
-            HorizontalAlignment="Left"
-            FontSize="16"
-            FontWeight="Bold"
-            Text="{DynamicResource Options:BeatSaver}" />
-        <CheckBox
-            Name="BeatSaverProtocolHandler"
-            Grid.Row="8"
-            Grid.Column="1"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            Checked="BeatSaverProtocolHandler_Checked"
-            IsChecked="{Binding BeatSaverProtocolHandlerEnabled}"
-            Unchecked="BeatSaverProtocolHandler_Unchecked" />
-
-        <TextBlock
-            Grid.Row="9"
-            Margin="50,5,5,5"
-            HorizontalAlignment="Left"
-            FontSize="16"
-            FontWeight="Bold"
-            Text="{DynamicResource Options:ModelSaber}" />
-        <CheckBox
-            Name="ModelSaberProtocolHandler"
-            Grid.Row="9"
-            Grid.Column="1"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            Checked="ModelSaberProtocolHandler_Checked"
-            IsChecked="{Binding ModelSaberProtocolHandlerEnabled}"
-            Unchecked="ModelSaberProtocolHandler_Unchecked" />
-        
-        <TextBlock
-            Grid.Row="10"
-            Margin="50,5,5,5"
-            HorizontalAlignment="Left"
-            FontSize="16"
-            FontWeight="Bold"
-            Text="{DynamicResource Options:Playlists}" />
-        <CheckBox
-            Name="PlaylistProtocolHandler"
-            Grid.Row="10"
-            Grid.Column="1"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            Checked="PlaylistsProtocolHandler_Checked"
-            IsChecked="{Binding PlaylistsProtocolHandlerEnabled}"
-            Unchecked="PlaylistsProtocolHandler_Unchecked" />
-
-        <TextBlock
-            Grid.Row="11"
-            Margin="50,5,5,5"
-            HorizontalAlignment="Left"
-            FontSize="16"
-            FontWeight="Bold"
-            Text="{DynamicResource Options:CloseWindow}" />
-        <CheckBox
-            Name="CloseWindowToggle"
-            Grid.Row="11"
-            Grid.Column="1"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            Checked="CloseWindowOnFinish_Checked"
-            IsChecked="{Binding CloseWindowOnFinish}"
-            Unchecked="CloseWindowOnFinish_Unchecked" />
+            Background="Transparent"
+            BorderBrush="Transparent">
+            <MenuItem
+                Header="{DynamicResource Options:EnableOneClickInstalls}"
+                StaysOpenOnClick="True"
+                Padding="5,0">
+                <MenuItem
+                    Padding="5,0"
+                    Header="{DynamicResource Options:BeatSaver}"
+                    Name="BeatSaverProtocolHandler"
+                    IsCheckable="True"
+                    StaysOpenOnClick="True"
+                    Checked="BeatSaverProtocolHandler_Checked"
+                    IsChecked="{Binding BeatSaverProtocolHandlerEnabled}"
+                    Unchecked="BeatSaverProtocolHandler_Unchecked"/>
+                <MenuItem
+                    Padding="5,0"
+                    Header="{DynamicResource Options:ModelSaber}"
+                    Name="ModelSaberProtocolHandler"
+                    IsCheckable="True"
+                    StaysOpenOnClick="True"
+                    Checked="ModelSaberProtocolHandler_Checked"
+                    IsChecked="{Binding ModelSaberProtocolHandlerEnabled}"
+                    Unchecked="ModelSaberProtocolHandler_Unchecked"/>
+                <MenuItem
+                    Padding="5,0"
+                    Header="{DynamicResource Options:Playlists}"
+                    Name="PlaylistProtocolHandler"
+                    IsCheckable="True"
+                    StaysOpenOnClick="True"
+                    Checked="PlaylistsProtocolHandler_Checked"
+                    IsChecked="{Binding PlaylistsProtocolHandlerEnabled}"
+                    Unchecked="PlaylistsProtocolHandler_Unchecked" />
+                <!-- <MenuItem
+                    Padding="5,0"
+                    Header="{DynamicResource Options:CloseWindow}"
+                    Name="CloseWindowToggle"
+                    IsCheckable="True"
+                    StaysOpenOnClick="True"
+                    Checked="CloseWindowOnFinish_Checked"
+                    IsChecked="{Binding CloseWindowOnFinish}"
+                    Unchecked="CloseWindowOnFinish_Unchecked" />
+                -->
+            </MenuItem>
+        </Menu>
 
         <StackPanel
             Grid.Row="12"