Final UX changes following feedback from the pond

Author: mansellan

Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -64,6 +64,12 @@
             <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="Black" />
 
             <CompositeCollection x:Key="AddModuleCommands">
+                <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_AddExistingFileText}"
+                          Command="{Binding ImportCommand}"
+                          CommandParameter="{Binding SelectedItem, Mode=OneWay}">
+
+                </MenuItem>
+                <Separator />
                 <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_AddVBFormText}"
                                   Command="{Binding AddVBFormCommand}"
                                   CommandParameter="{Binding SelectedItem, Mode=OneWay}"
@@ -127,12 +133,6 @@
                     </MenuItem.Icon>
                 </MenuItem>
                 <Separator />
-                <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_AddExistingFileText}"
-                          Command="{Binding ImportCommand}"
-                          CommandParameter="{Binding SelectedItem, Mode=OneWay}">
-
-                </MenuItem>
-                <Separator />
                 <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_AddTestModuleText}"
                                   Command="{Binding AddTestModuleCommand}"
                                   CommandParameter="{Binding SelectedItem, Mode=OneWay}">
@@ -459,53 +459,53 @@
                             <Image Source="{StaticResource AddModuleImage}" />
                         </MenuItem.Icon>
                     </MenuItem>
+                    <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_Export}"
+                              Command="{Binding ExportCommand}"
+                              CommandParameter="{Binding SelectedItem, Mode=OneWay}"
+                              Visibility="{Binding ExportVisibility}" />
+                    <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_ExportAll}"
+                              Command="{Binding ExportAllCommand}"
+                              CommandParameter="{Binding SelectedItem, Mode=OneWay}" 
+                              Visibility="{Binding ExportAllVisibility}" />
+                    <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_Remove}"
+                              Command="{Binding RemoveCommand}"
+                              CommandParameter="{Binding SelectedItem, Mode=OneWay}"
+                              Visibility="{Binding VBAVisibility}">
+                        <MenuItem.Icon>
+                            <Image Source="{StaticResource RemoveImage}" Style="{StaticResource ToolbarImageOpacity}" />
+                        </MenuItem.Icon>
+                    </MenuItem>
+                    <Separator />
                     <MenuItem Header="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=Find}">
                         <MenuItem.Icon>
                             <Image Source="{StaticResource FindImage}" />
                         </MenuItem.Icon>
                         <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_FindAllReferencesText}"
-                      Command="{Binding FindAllReferencesCommand}"
-                      CommandParameter="{Binding SelectedItem, Mode=OneWay}" />
+                                  Command="{Binding FindAllReferencesCommand}"
+                                  CommandParameter="{Binding SelectedItem, Mode=OneWay}" />
                         <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_FindAllImplementationsText}"
-                      Command="{Binding FindAllImplementationsCommand}"
-                      CommandParameter="{Binding SelectedItem, Mode=OneWay}" />
+                                  Command="{Binding FindAllImplementationsCommand}"
+                                  CommandParameter="{Binding SelectedItem, Mode=OneWay}" />
                     </MenuItem>
                     <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_Indent}"
-                      Command="{Binding IndenterCommand}"
-                      CommandParameter="{Binding SelectedItem, Mode=OneWay}" />
+                              Command="{Binding IndenterCommand}"
+                              CommandParameter="{Binding SelectedItem, Mode=OneWay}" />
                     <Separator />
-                    <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_CollapseSubnodesToolTip}"
-                      Command="{Binding CollapseAllSubnodesCommand}"
-                      CommandParameter="{Binding SelectedItem, Mode=OneWay}">
-                        <MenuItem.Icon>
-                            <Image Source="{StaticResource CollapseNodesImage}" />
-                        </MenuItem.Icon>
-                    </MenuItem>
                     <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_ExpandSubnodesToolTip}"
-                      Command="{Binding ExpandAllSubnodesCommand}"
-                      CommandParameter="{Binding SelectedItem, Mode=OneWay}">
+                              Command="{Binding ExpandAllSubnodesCommand}"
+                              CommandParameter="{Binding SelectedItem, Mode=OneWay}">
                         <MenuItem.Icon>
                             <Image Source="{StaticResource ExpandNodesImage}" />
                         </MenuItem.Icon>
                     </MenuItem>
-                    <Separator />
-                    <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_Export}"
-                      Command="{Binding ExportCommand}"
-                      CommandParameter="{Binding SelectedItem, Mode=OneWay}"
-                      Visibility="{Binding ExportVisibility}" />
-                    <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_ExportAll}"
-                      Command="{Binding ExportAllCommand}"
-                      CommandParameter="{Binding SelectedItem, Mode=OneWay}" 
-                      Visibility="{Binding ExportAllVisibility}" />
-                    <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_Remove}"
-                      Command="{Binding RemoveCommand}"
-                      CommandParameter="{Binding SelectedItem, Mode=OneWay}"
-                      Visibility="{Binding VBAVisibility}">
+                    <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_CollapseSubnodesToolTip}"
+                              Command="{Binding CollapseAllSubnodesCommand}"
+                              CommandParameter="{Binding SelectedItem, Mode=OneWay}">
                         <MenuItem.Icon>
-                            <Image Source="{StaticResource RemoveImage}" Style="{StaticResource ToolbarImageOpacity}" />
+                            <Image Source="{StaticResource CollapseNodesImage}" />
                         </MenuItem.Icon>
                     </MenuItem>
-                    <Separator Visibility="{Binding VBAVisibility}" />
+                    <Separator />
                     <MenuItem Header="{Resx ResxName=Rubberduck.Resources.CodeExplorer.CodeExplorerUI, Key=CodeExplorer_Print}"
                       Command="{Binding PrintCommand}"
                       CommandParameter="{Binding SelectedItem, Mode=OneWay}">
@@ -552,7 +552,7 @@
                                         </MultiBinding.Bindings>
                                     </MultiBinding>
                                 </Image.Source>
-                            </Image> 
+                            </Image>
                             <Image Source="{Binding Declaration, Converter={StaticResource AccessibilityToIcon}}" Style="{StaticResource ToolbarIconStyle}" />
                         </Grid>
                         <TextBlock Style="{StaticResource TreeViewItemStyle}" />