Index: Core/Gui/src/Core.Gui/Commands/MainWindowCommands.cs
===================================================================
diff -u
--- Core/Gui/src/Core.Gui/Commands/MainWindowCommands.cs	(revision 0)
+++ Core/Gui/src/Core.Gui/Commands/MainWindowCommands.cs	(revision 577bf2384ad70fef1d46fe46c399fee1a3401718)
@@ -0,0 +1,67 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Windows.Input;
+using Core.Gui.Forms.MainWindow;
+
+namespace Core.Gui.Commands
+{
+    /// <summary>
+    /// This class defines <see cref="RoutedUICommand"/> members for the custom commands of <see cref="MainWindow"/>.
+    /// </summary>
+    public static class MainWindowCommands
+    {
+        /// <summary>
+        /// The command for creating a new project.
+        /// </summary>
+        public static readonly ICommand NewProjectCommand = new RoutedCommand();
+
+        /// <summary>
+        /// The command for saving the project.
+        /// </summary>
+        public static readonly ICommand SaveProjectCommand = new RoutedCommand();
+
+        /// <summary>
+        /// The command for saving the project as.
+        /// </summary>
+        public static readonly ICommand SaveProjectAsCommand = new RoutedCommand();
+
+        /// <summary>
+        /// The command for opening a project.
+        /// </summary>
+        public static readonly ICommand OpenProjectCommand = new RoutedCommand();
+        
+        /// <summary>
+        /// The command for closing the application.
+        /// </summary>
+        public static readonly ICommand CloseApplicationCommand = new RoutedCommand();
+
+        /// <summary>
+        /// The command for closing the current active view.
+        /// </summary>
+        public static readonly ICommand CloseViewTabCommand = new RoutedCommand();
+
+        /// <summary>
+        /// The command for toggling the backstage.
+        /// </summary>
+        public static readonly ICommand ToggleBackstageCommand = new RoutedCommand();
+    }
+}
\ No newline at end of file
Index: Core/Gui/src/Core.Gui/Commands/RelayCommand.cs
===================================================================
diff -u
--- Core/Gui/src/Core.Gui/Commands/RelayCommand.cs	(revision 0)
+++ Core/Gui/src/Core.Gui/Commands/RelayCommand.cs	(revision 577bf2384ad70fef1d46fe46c399fee1a3401718)
@@ -0,0 +1,55 @@
+using System;
+using System.Windows.Input;
+
+namespace Core.Gui.Commands
+{
+    /// <summary>
+    /// Defines a simple command that executes an <see cref="Action"/>.
+    /// </summary>
+    public class RelayCommand : ICommand
+    {
+        private readonly Action<object> action;
+        private readonly Func<object, bool> canExecute;
+
+        public event EventHandler CanExecuteChanged;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="RelayCommand"/>.
+        /// </summary>
+        /// <param name="action">The action to execute.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="action"/> is <c>null</c>.</exception>
+        public RelayCommand(Action<object> action) : this(action, o => true) {}
+
+        /// <summary>
+        /// Creates a new instance of <see cref="RelayCommand"/>.
+        /// </summary>
+        /// <param name="action">The action to execute.</param>
+        /// <param name="canExecute">The function that determines whether command can execute.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="action"/> is <c>null</c>.</exception>
+        public RelayCommand(Action<object> action, Func<object, bool> canExecute)
+        {
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            if (canExecute == null)
+            {
+                throw new ArgumentNullException(nameof(canExecute));
+            }
+
+            this.action = action;
+            this.canExecute = canExecute;
+        }
+
+        public bool CanExecute(object parameter)
+        {
+            return canExecute(parameter);
+        }
+
+        public void Execute(object parameter)
+        {
+            action(parameter);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Gui/src/Core.Gui/Commands/RoutedCommandHandler.cs
===================================================================
diff -u
--- Core/Gui/src/Core.Gui/Commands/RoutedCommandHandler.cs	(revision 0)
+++ Core/Gui/src/Core.Gui/Commands/RoutedCommandHandler.cs	(revision 577bf2384ad70fef1d46fe46c399fee1a3401718)
@@ -0,0 +1,75 @@
+using System.Windows;
+using System.Windows.Input;
+
+namespace Core.Gui.Commands
+{
+     /// <summary>
+    /// Allows for binding of <see cref="RoutedCommand"/> to the execution of a <see cref="ICommand"/>.
+    /// </summary>
+    public class RoutedCommandHandler : Freezable
+    {
+        /// <summary>
+        /// Identifies the <see cref="Command"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty CommandProperty = DependencyProperty.Register(
+            nameof(Command),
+            typeof(ICommand),
+            typeof(RoutedCommandHandler),
+            new PropertyMetadata(default(ICommand)));
+
+        /// <summary>
+        /// Gets or sets the command that should be executed when the RoutedCommand fires.
+        /// </summary>
+        public ICommand Command
+        {
+            get => (ICommand) GetValue(CommandProperty);
+            set => SetValue(CommandProperty, value);
+        }
+
+        /// <summary>
+        /// The command that triggers the <see cref="ICommand"/>.
+        /// </summary>
+        public ICommand RoutedCommand { get; set; }
+
+        protected override Freezable CreateInstanceCore()
+        {
+            return new RoutedCommandHandler();
+        }
+
+        /// <summary>
+        /// Registers this handler to respond to the registered RoutedCommand for the
+        /// given element.
+        /// </summary>
+        /// <param name="owner"> The element for which we should register the command
+        /// binding for the current routed command. </param>
+        internal void Register(FrameworkElement owner)
+        {
+            var binding = new CommandBinding(RoutedCommand, HandleExecute, HandleCanExecute);
+            owner.CommandBindings.Add(binding);
+        }
+
+        /// <summary>
+        /// Executes <see cref="ICommand.CanExecute(object)"/> with the 
+        /// <see cref="CanExecuteRoutedEventArgs.Parameter"/> from <paramref name="e"/>.
+        /// </summary>
+        /// <param name="sender">The owner of the routed command.</param>
+        /// <param name="e">The event arguments given by the routed event.</param>
+        private void HandleCanExecute(object sender, CanExecuteRoutedEventArgs e)
+        {
+            e.CanExecute = Command?.CanExecute(e.Parameter) == true;
+            e.Handled = true;
+        }
+
+        /// <summary>
+        /// Executes <see cref="ICommand.Execute(object)"/> with the 
+        /// <see cref="ExecutedRoutedEventArgs.Parameter"/> from <paramref name="e"/>.
+        /// </summary>
+        /// <param name="sender">The owner of the routed command.</param>
+        /// <param name="e">The event arguments given by the routed event.</param>
+        private void HandleExecute(object sender, ExecutedRoutedEventArgs e)
+        {
+            Command?.Execute(e.Parameter);
+            e.Handled = true;
+        }
+    }
+}
\ No newline at end of file
Index: Core/Gui/src/Core.Gui/Commands/RoutedCommandHandlers.cs
===================================================================
diff -u
--- Core/Gui/src/Core.Gui/Commands/RoutedCommandHandlers.cs	(revision 0)
+++ Core/Gui/src/Core.Gui/Commands/RoutedCommandHandlers.cs	(revision 577bf2384ad70fef1d46fe46c399fee1a3401718)
@@ -0,0 +1,73 @@
+using System.Collections;
+using System.Collections.Specialized;
+using System.Windows;
+
+namespace Core.Gui.Commands
+{
+    /// <summary>
+    ///  Holds a collection of <see cref="RoutedCommandHandler"/> that should be
+    ///  turned into CommandBindings.
+    /// </summary>
+    public class RoutedCommandHandlers : FreezableCollection<RoutedCommandHandler>
+    {
+        private static readonly DependencyProperty commandsProperty = DependencyProperty.RegisterAttached(
+            "CommandsPrivate",
+            typeof(RoutedCommandHandlers),
+            typeof(RoutedCommandHandlers),
+            new PropertyMetadata(default(RoutedCommandHandlers)));
+
+        private readonly FrameworkElement owner;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="RoutedCommandHandlers"/>.
+        /// </summary>
+        /// <param name="owner"> The element for which this collection is created. </param>
+        private RoutedCommandHandlers(FrameworkElement owner)
+        {
+            this.owner = owner;
+
+            ((INotifyCollectionChanged) this).CollectionChanged += OnCollectionChanged;
+        }
+
+        /// <summary>
+        /// Gets the collection of RoutedCommandHandler for a given element, creating
+        ///  it if it doesn't already exist.
+        /// </summary>
+        /// <param name="element">The element to which <see cref="RoutedCommandHandlers"/>
+        /// was added.</param>
+        public static RoutedCommandHandlers GetCommands(FrameworkElement element)
+        {
+            var handlers = (RoutedCommandHandlers) element.GetValue(commandsProperty);
+            if (handlers == null)
+            {
+                handlers = new RoutedCommandHandlers(element);
+                element.SetValue(commandsProperty, handlers);
+            }
+
+            return handlers;
+        }
+
+        protected override Freezable CreateInstanceCore()
+        {
+            return new RoutedCommandHandlers(owner);
+        }
+
+        private static void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs args)
+        {
+            ((RoutedCommandHandlers) sender).OnAdd(args.NewItems);
+        }
+
+        private void OnAdd(IEnumerable newItems)
+        {
+            if (newItems == null)
+            {
+                return;
+            }
+
+            foreach (RoutedCommandHandler routedHandler in newItems)
+            {
+                routedHandler.Register(owner);
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Gui/src/Core.Gui/Forms/Backstage/BackstageControl.xaml
===================================================================
diff -u -r25b3196f83ff6455104b5b61d996982beaf9a116 -r577bf2384ad70fef1d46fe46c399fee1a3401718
--- Core/Gui/src/Core.Gui/Forms/Backstage/BackstageControl.xaml	(.../BackstageControl.xaml)	(revision 25b3196f83ff6455104b5b61d996982beaf9a116)
+++ Core/Gui/src/Core.Gui/Forms/Backstage/BackstageControl.xaml	(.../BackstageControl.xaml)	(revision 577bf2384ad70fef1d46fe46c399fee1a3401718)
@@ -25,7 +25,7 @@
                    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:commands="clr-namespace:Core.Gui.Forms.MainWindow"
+                   xmlns:commands="clr-namespace:Core.Gui.Commands"
                    mc:Ignorable="d">
     
     <UserControl.Resources>
@@ -43,14 +43,14 @@
                 <Separator/>
                 <ToggleButton>INFO</ToggleButton>
                 <ToggleButton>OPENEN</ToggleButton>
-                <Button Command="Save">Opslaan</Button>
-                <Button Command="SaveAs">Opslaan Als</Button>
+                <Button Command="{x:Static commands:MainWindowCommands.SaveProjectCommand}">Opslaan</Button>
+                <Button Command="{x:Static commands:MainWindowCommands.SaveProjectAsCommand}">Opslaan Als</Button>
                 <Separator/>
                 <ToggleButton>OVER</ToggleButton>
                 <Button>Toon log</Button>
                 <Button>Handleiding</Button>
                 <Separator/>
-                <Button Command="Close">Afsluiten</Button>
+                <Button Command="{x:Static commands:MainWindowCommands.CloseApplicationCommand}">Afsluiten</Button>
             </StackPanel>
             
             <Border/>
Index: Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -r7d6dbf16901f397773a04a2beacf3c07589ce73f -r577bf2384ad70fef1d46fe46c399fee1a3401718
--- Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 7d6dbf16901f397773a04a2beacf3c07589ce73f)
+++ Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 577bf2384ad70fef1d46fe46c399fee1a3401718)
@@ -26,35 +26,41 @@
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                    xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
-                   xmlns:commands="clr-namespace:Core.Gui.Forms.MainWindow"
                    xmlns:properties="clr-namespace:Core.Gui.Properties"
                    xmlns:viewHost="clr-namespace:Core.Gui.Forms.ViewHost"
                    xmlns:backstage="clr-namespace:Core.Gui.Forms.Backstage"
+                   xmlns:commands="clr-namespace:Core.Gui.Commands"
                    mc:Ignorable="d" 
                    Title="MainWindow" Height="768" Width="1024" 
                    x:Name="Window"
                    Icon="/Core.Gui;component\Resources/Riskeer.ico"
                    ResizeMode="CanResizeWithGrip"
                    FlowDirection="LeftToRight"
                    Loaded="MainWindow_OnLoaded">
+    
+    <commands:RoutedCommandHandlers.Commands>
+        <commands:RoutedCommandHandler RoutedCommand="{x:Static commands:MainWindowCommands.NewProjectCommand}"
+                                       Command="{Binding Path=NewProjectCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=metro:MetroWindow}}" />
+        <commands:RoutedCommandHandler RoutedCommand="{x:Static commands:MainWindowCommands.SaveProjectCommand}"
+                                       Command="{Binding Path=SaveProjectCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=metro:MetroWindow}}" />
+        <commands:RoutedCommandHandler RoutedCommand="{x:Static commands:MainWindowCommands.SaveProjectAsCommand}"
+                                       Command="{Binding Path=SaveProjectAsCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=metro:MetroWindow}}" />
+        <commands:RoutedCommandHandler RoutedCommand="{x:Static commands:MainWindowCommands.OpenProjectCommand}"
+                                       Command="{Binding Path=OpenProjectCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=metro:MetroWindow}}" />
+        <commands:RoutedCommandHandler RoutedCommand="{x:Static commands:MainWindowCommands.CloseApplicationCommand}"
+                                       Command="{Binding Path=CloseApplicationCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=metro:MetroWindow}}" />
+        <commands:RoutedCommandHandler RoutedCommand="{x:Static commands:MainWindowCommands.ToggleBackstageCommand}"
+                                       Command="{Binding Path=ToggleBackStageCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=metro:MetroWindow}}" />
+    </commands:RoutedCommandHandlers.Commands>
 
-    <metro:MetroWindow.CommandBindings>
-        <CommandBinding Command="New" Executed="OnFileNewClicked" />
-        <CommandBinding Command="Save" Executed="OnFileSaveClicked" />
-        <CommandBinding Command="SaveAs" Executed="OnFileSaveAsClicked" />
-        <CommandBinding Command="Open" Executed="OnFileOpenClicked" />
-        <CommandBinding Command="Close" Executed="OnFileExitClicked" />
-        <CommandBinding Command="{x:Static commands:MainWindowCommands.CloseViewTabCommand}" Executed="CloseDocumentTab" CanExecute="CanCloseDocumentTab"/>
-        <CommandBinding Command="{x:Static commands:MainWindowCommands.ToggleBackstageCommand}" Executed="CommandBinding_OnExecuted"/>
-    </metro:MetroWindow.CommandBindings>
-
     <metro:MetroWindow.InputBindings>
-        <KeyBinding Command="New" Key="N" Modifiers="Ctrl"/>
-        <KeyBinding Command="Save" Key="S" Modifiers="Ctrl"/>
-        <KeyBinding Command="SaveAs" Key="S" Modifiers="Ctrl + Shift" />
-        <KeyBinding Command="Open" Key="O" Modifiers="Ctrl"/>
-        <KeyBinding Command="Close" Key="F4" Modifiers="Alt"/>
-        <KeyBinding Command="{x:Static commands:MainWindowCommands.CloseViewTabCommand}" Key="F4" Modifiers="Ctrl"/>
+        <KeyBinding Command="{x:Static commands:MainWindowCommands.NewProjectCommand}" Key="N" Modifiers="Ctrl"/>
+        <KeyBinding Command="{x:Static commands:MainWindowCommands.SaveProjectCommand}" Key="S" Modifiers="Ctrl"/>
+        <KeyBinding Command="{x:Static commands:MainWindowCommands.SaveProjectAsCommand}" Key="S" Modifiers="Ctrl + Shift" />
+        <KeyBinding Command="{x:Static commands:MainWindowCommands.OpenProjectCommand}" Key="O" Modifiers="Ctrl"/>
+        <KeyBinding Command="{x:Static commands:MainWindowCommands.CloseApplicationCommand}" Key="F4" Modifiers="Alt"/>
+        <KeyBinding Command="{Binding Path=CloseViewTabCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=metro:MetroWindow}}"
+                    Key="F4" Modifiers="Ctrl"/>
     </metro:MetroWindow.InputBindings>
 
     <metro:MetroWindow.Resources>
@@ -81,26 +87,26 @@
         <metro:WindowCommands>
             <Button Style="{StaticResource WindowCommandsButtonStyle}"
                     ToolTip="{x:Static properties:Resources.WindowCommands_New_ToolTip}"
-                    AutomationProperties.AutomationId="WindowCommandsNewProject"
-                    Click="OnFileNewClicked">
-                <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE93C;"/>
+                    Command="{x:Static commands:MainWindowCommands.NewProjectCommand}"
+                    AutomationProperties.AutomationId="WindowCommandsNewProject">
+            <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE93C;"/>
             </Button>
             <Button Style="{StaticResource WindowCommandsButtonStyle}"
                     ToolTip="{x:Static properties:Resources.WindowCommands_Save_ToolTip}"
-                    AutomationProperties.AutomationId="WindowCommandsSaveProject"
-                    Click="OnFileSaveClicked">
+                    Command="{x:Static commands:MainWindowCommands.SaveProjectCommand}"
+                    AutomationProperties.AutomationId="WindowCommandsSaveProject">
                 <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE93E;"/>
             </Button>
             <Button Style="{StaticResource WindowCommandsButtonStyle}"
                     ToolTip="{x:Static properties:Resources.WindowCommands_SaveAs_ToolTip}"
-                    AutomationProperties.AutomationId="WindowCommandsSaveProjectAs"
-                    Click="OnFileSaveAsClicked">
+                    Command="{x:Static commands:MainWindowCommands.SaveProjectAsCommand}"
+                    AutomationProperties.AutomationId="WindowCommandsSaveProjectAs">
                 <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE940;"/>
             </Button>
             <Button Style="{StaticResource WindowCommandsButtonStyle}"
                     ToolTip="{x:Static properties:Resources.WindowCommands_Open_ToolTip}"
-                    AutomationProperties.AutomationId= "WindowCommandsOpenProject"
-                    Click="OnFileOpenClicked">
+                    Command="{x:Static commands:MainWindowCommands.OpenProjectCommand}"
+                    AutomationProperties.AutomationId= "WindowCommandsOpenProject">
                 <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE93D;"/>
             </Button>
         </metro:WindowCommands>
@@ -190,7 +196,7 @@
                     </Button>
                     <Button Style="{StaticResource ViewStateBarButtonStyle}"
                             ToolTip="{x:Static properties:Resources.ViewStateBar_Exit_ToolTip}"
-                            Click="OnFileExitClicked"
+                            Command="{x:Static commands:MainWindowCommands.CloseApplicationCommand}"
                             AutomationProperties.AutomationId="ViewStateButtonBarExit">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE901;"/>
                     </Button>
Index: Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r7d6dbf16901f397773a04a2beacf3c07589ce73f -r577bf2384ad70fef1d46fe46c399fee1a3401718
--- Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 7d6dbf16901f397773a04a2beacf3c07589ce73f)
+++ Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 577bf2384ad70fef1d46fe46c399fee1a3401718)
@@ -69,6 +69,14 @@
         private PropertyGridView.PropertyGridView propertyGrid;
         private IMapView currentMapView;
         private IChartView currentChartView;
+        
+        public ICommand NewProjectCommand { get; }
+        public ICommand SaveProjectCommand { get; }
+        public ICommand SaveProjectAsCommand { get; }
+        public ICommand OpenProjectCommand { get; }
+        public ICommand CloseApplicationCommand { get; }
+        public ICommand CloseViewTabCommand { get; }
+        public ICommand ToggleBackStageCommand { get; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="MainWindow"/> class.
@@ -79,6 +87,15 @@
 
             windowInteropHelper = new WindowInteropHelper(this);
             Name = "RiskeerMainWindow";
+
+            NewProjectCommand = new RelayCommand(OnNewProject);
+            SaveProjectCommand = new RelayCommand(OnSaveProject);
+            SaveProjectAsCommand = new RelayCommand(OnSaveProjectAs);
+            OpenProjectCommand = new RelayCommand(OnOpenProject);
+            CloseApplicationCommand = new RelayCommand(OnCloseApplication);
+            CloseViewTabCommand = new RelayCommand(OnCloseViewTab, CanCloseViewTab);
+
+            ToggleBackStageCommand = new RelayCommand(OnToggleBackstage);
         }
 
         /// <summary>
@@ -315,17 +332,23 @@
 
         #region OnClick events
 
-        private void OnFileSaveClicked(object sender, RoutedEventArgs e)
+        private void OnNewProject(object obj)
         {
+            commands.StorageCommands.CreateNewProject();
+            ValidateItems();
+        }
+        
+        private void OnSaveProject(object obj)
+        {
             commands.StorageCommands.SaveProject();
         }
-
-        private void OnFileSaveAsClicked(object sender, RoutedEventArgs e)
+        
+        private void OnSaveProjectAs(object obj)
         {
             commands.StorageCommands.SaveProjectAs();
         }
-
-        private void OnFileOpenClicked(object sender, RoutedEventArgs e)
+        
+        private void OnOpenProject(object obj)
         {
             string projectPath = commands.StorageCommands.GetExistingProjectFilePath();
             if (!string.IsNullOrEmpty(projectPath))
@@ -334,24 +357,33 @@
             }
         }
 
-        private void OnFileNewClicked(object sender, RoutedEventArgs e)
+        private void OnCloseApplication(object obj)
         {
-            commands.StorageCommands.CreateNewProject();
-            ValidateItems();
+            gui.ExitApplication();
         }
-
-        private void OnFileExitClicked(object sender, RoutedEventArgs e)
+        
+        private bool CanCloseViewTab(object arg)
         {
-            gui.ExitApplication();
+            return viewController.ViewHost.DocumentViews.Any();
         }
 
-        private void MainWindow_OnLoaded(object sender, RoutedEventArgs e)
+        private void OnCloseViewTab(object obj)
         {
-            WindowState = WindowState.Maximized;
+            viewController.ViewHost.Remove(viewController.ViewHost.ActiveDocumentView);
+        }
 
-            FileManualButton.IsEnabled = File.Exists(settings.FixedSettings.ManualFilePath);
-
-            ValidateItems();
+        private void OnToggleBackstage(object obj)
+        {
+            if (MainDockPanel.Visibility == Visibility.Visible)
+            {
+                MainDockPanel.Visibility = Visibility.Collapsed;
+                BackstageDockPanel.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                MainDockPanel.Visibility = Visibility.Visible;
+                BackstageDockPanel.Visibility = Visibility.Collapsed;
+            }
         }
 
         private void ButtonShowProjectExplorer_Click(object sender, RoutedEventArgs e)
@@ -410,16 +442,6 @@
             }
         }
 
-        private void CloseDocumentTab(object sender, ExecutedRoutedEventArgs e)
-        {
-            viewController.ViewHost.Remove(viewController.ViewHost.ActiveDocumentView);
-        }
-
-        private void CanCloseDocumentTab(object sender, CanExecuteRoutedEventArgs e)
-        {
-            e.CanExecute = viewController.ViewHost.DocumentViews.Any();
-        }
-
         private void OnAboutDialog_Clicked(object sender, RoutedEventArgs e)
         {
             var aboutDialog = new SplashScreen.SplashScreen
@@ -532,6 +554,15 @@
 
         #region Events
 
+        private void MainWindow_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            WindowState = WindowState.Maximized;
+
+            FileManualButton.IsEnabled = File.Exists(settings.FixedSettings.ManualFilePath);
+
+            ValidateItems();
+        }
+        
         private void OnViewOpened(object sender, ViewChangeEventArgs e)
         {
             var mapView = e.View as IMapView;
@@ -655,19 +686,5 @@
         }
 
         #endregion
-
-        private void CommandBinding_OnExecuted(object sender, ExecutedRoutedEventArgs e)
-        {
-            if (MainDockPanel.Visibility == Visibility.Visible)
-            {
-                MainDockPanel.Visibility = Visibility.Collapsed;
-                BackstageDockPanel.Visibility = Visibility.Visible;
-            }
-            else
-            {
-                MainDockPanel.Visibility = Visibility.Visible;
-                BackstageDockPanel.Visibility = Visibility.Collapsed;
-            }
-        }
     }
 }
\ No newline at end of file
Fisheye: Tag 577bf2384ad70fef1d46fe46c399fee1a3401718 refers to a dead (removed) revision in file `Core/Gui/src/Core.Gui/Forms/MainWindow/MainWindowCommands.cs'.
Fisheye: No comparison available.  Pass `N' to diff?