Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -r1028113832506dab8d0613f9d739cb4408266058 -ra5e4ebcce8619e8154972b937bfde6495ade4836
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 1028113832506dab8d0613f9d739cb4408266058)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision a5e4ebcce8619e8154972b937bfde6495ade4836)
@@ -67,101 +67,77 @@
         </Grid.RowDefinitions>
 
         <fluent:Ribbon Focusable="True" x:Name="Ribbon" AutomaticStateManagement="False" x:FieldModifier="protected">
-            <!--Backstage-->
-            <fluent:Ribbon.Menu>
-                <fluent:Backstage Background="#008fc5" x:Name="Menu" x:FieldModifier="private">
 
-                    <fluent:BackstageTabControl>
-                        <fluent:Button Header="{x:Static properties:Resources.Ribbon_Command_New}"
-                                       x:Name="ButtonMenuFileNewProject"
-                                       AutomationProperties.AutomationId="ButtonMenuFileNewProject"
-                                       AutomationProperties.Name="ButtonMenuFileNewProject"
-                                       Icon="/Core.Common.Gui;component\Resources\DocumentHS.png"
-                                       fluent:KeyTip.Keys="N"
-                                       Click="OnFileNewClicked" x:FieldModifier="private" />
-
-                        <fluent:Button Header="{x:Static properties:Resources.Ribbon_Command_Save}" 
-                                       x:Name="ButtonMenuFileSaveProject"
-                                       Icon="/Core.Common.Gui;component\Resources\saveHS.png"
-                                       fluent:KeyTip.Keys="S"
-                                       Click="OnFileSaveClicked" x:FieldModifier="private" />
-
-                        <fluent:Button Header="{x:Static properties:Resources.Ribbon_Command_Save_As}"
-                                       x:Name="ButtonMenuFileSaveProjectAs"
-                                       AutomationProperties.AutomationId="ButtonMenuFileSaveProjectAs"
-                                       Icon="/Core.Common.Gui;component\Resources\SaveAsHH.png"
-                                       fluent:KeyTip.Keys="A" 
-                                       Click="OnFileSaveAsClicked" x:FieldModifier="private" />
-
-                        <fluent:Button Header="{x:Static properties:Resources.Ribbon_Command_Open}"
-                                       x:Name="ButtonMenuFileOpenProject"
-                                       AutomationProperties.AutomationId= "ButtonMenuFileOpenProject"
-                                       Icon="/Core.Common.Gui;component\Resources\openfolderHS.png"
-                                       fluent:KeyTip.Keys="O"
-                                       Click="OnFileOpenClicked" x:FieldModifier="private" />
-
-                        <fluent:SeparatorTabItem />
-
-                        <fluent:BackstageTabItem Header="{x:Static properties:Resources.Ribbon_TabItem_Help}" fluent:KeyTip.Keys="H">
-                            <fluent:BackstageTabControl>
-                                <fluent:Button Header="{x:Static properties:Resources.Ribbon_Show_Log}" Icon="/Core.Common.Gui;component\Resources\application_view_list.png" fluent:KeyTip.Keys="O" Click="OnFileHelpShowLog_Clicked" />
-                                <fluent:Button x:Name="FileManualButton" Header="{x:Static properties:Resources.Ribbon_Open_Manual}" Icon="/Core.Common.Gui;component\Resources\manual.png" fluent:KeyTip.Keys="M" Click="OnFileManual_Clicked" />
-                                <fluent:Button x:Name ="AboutButton" Header="{x:Static properties:Resources.Ribbon_About}" Icon="/Core.Common.Gui;component\Resources\information.png" fluent:KeyTip.Keys="A" Click="OnAboutDialog_Clicked"/>
-                            </fluent:BackstageTabControl>
-                        </fluent:BackstageTabItem>
-                        
-                        <fluent:Button Header="{x:Static properties:Resources.Ribbon_Exit}"
-                                       Icon="/Core.Common.Gui;component\Resources\ClosePreviewHH.png"
-                                       fluent:KeyTip.Keys="X"
-                                       Click="OnFileExitClicked" />
-
-                    </fluent:BackstageTabControl>
-                </fluent:Backstage>
-            </fluent:Ribbon.Menu>
-
-            <fluent:Ribbon.QuickAccessItems>
-
-                <fluent:QuickAccessMenuItem IsChecked="True">
-                    <fluent:Button Header="{x:Static properties:Resources.Ribbon_Command_New}"
-                                    x:Name="ButtonQuickAccessNewProject"
-                                    AutomationProperties.AutomationId="ButtonQuickAccessNewProject"
-                                    AutomationProperties.Name="ButtonQuickAccessNewProject"
-                                    Icon="/Core.Common.Gui;component\Resources\DocumentHS.png"
-                                    Click="OnFileNewClicked"/>
-                </fluent:QuickAccessMenuItem>
-
-                <fluent:QuickAccessMenuItem IsChecked="True">
-                    <fluent:Button Header="{x:Static properties:Resources.Ribbon_Command_Open}"
-                                   x:Name="ButtonQuickAccessOpenProject"
-                                   AutomationProperties.AutomationId="ButtonQuickAccessOpenProject"
-                                   AutomationProperties.Name="ButtonQuickAccessOpenProject"
-                                   Icon="/Core.Common.Gui;component\Resources\openfolderHS.png"
-                                   Click="OnFileOpenClicked" />
-                </fluent:QuickAccessMenuItem>
-
-                <fluent:QuickAccessMenuItem IsChecked="True">
-                    <fluent:Button Header="{x:Static properties:Resources.Ribbon_Command_Save}" 
-                                   x:Name="ButtonQuickAccessSaveProject"
-                                   AutomationProperties.AutomationId="ButtonQuickAccessSaveProject"
-                                   AutomationProperties.Name="ButtonQuickAccessSaveProject"
-                                   Icon="/Core.Common.Gui;component\Resources\saveHS.png"
-                                   Click="OnFileSaveClicked" />
-                </fluent:QuickAccessMenuItem>
-
-            </fluent:Ribbon.QuickAccessItems>
-
         </fluent:Ribbon>
 
         <viewHost:AvalonDockViewHost Grid.Row="1" x:Name="AvalonDockViewHost" />
 
-        <StackPanel Grid.Row="3" Orientation="Horizontal">
-            <ToggleButton Name="ButtonShowProperties" Width="30" ToolTip="{x:Static properties:Resources.Ribbon_Properties}" Click="ButtonShowProperties_Click">
-                <Image Source="/Core.Common.Gui;component\Resources\PropertiesHS.png"></Image>
-            </ToggleButton>
-            <ToggleButton Name="ButtonShowMessages" Width="30" ToolTip="{x:Static properties:Resources.Ribbon_Messages}" Click="ButtonShowMessages_Click">
-                <Image Source="/Core.Common.Gui;component\Resources\application_view_list.png"></Image>
-            </ToggleButton>
-        </StackPanel>
-
+        <Grid Grid.Row="3">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="100"/>
+                <ColumnDefinition Width="160"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <StackPanel Grid.Column="0" Orientation="Horizontal">
+                <ToggleButton Name="ButtonShowProperties" Width="30" ToolTip="{x:Static properties:Resources.Ribbon_Properties}" Click="ButtonShowProperties_Click">
+                    <Image Source="/Core.Common.Gui;component\Resources\PropertiesHS.png" />
+                </ToggleButton>
+                <ToggleButton Name="ButtonShowMessages" Width="30" ToolTip="{x:Static properties:Resources.Ribbon_Messages}" Click="ButtonShowMessages_Click">
+                    <Image Source="/Core.Common.Gui;component\Resources\application_view_list.png" />
+                </ToggleButton>
+            </StackPanel>
+            <StackPanel Grid.Column="1" Orientation="Horizontal">
+                <Button Name="ButtonMenuFileNewProject"
+                        ToolTip="{x:Static properties:Resources.Ribbon_Command_New}"
+                        AutomationProperties.AutomationId="ButtonMenuFileNewProject"
+                        AutomationProperties.Name="ButtonMenuFileNewProject"
+                        Click="OnFileNewClicked"
+                        x:FieldModifier="private">
+                    <Image Source="/Core.Common.Gui;component\Resources\DocumentHS.png"/>
+                </Button>
+                <Button Name="ButtonMenuFileSaveProject"
+                        ToolTip="{x:Static properties:Resources.Ribbon_Command_Save}"
+                        Click="OnFileSaveClicked"
+                        x:FieldModifier="private">
+                    <Image Source="/Core.Common.Gui;component\Resources\saveHS.png"/>
+                </Button>
+                <Button Name="ButtonMenuFileSaveProjectAs"
+                        ToolTip="{x:Static properties:Resources.Ribbon_Command_Save_As}"
+                        AutomationProperties.AutomationId="ButtonMenuFileSaveProjectAs"
+                        Click="OnFileSaveAsClicked"
+                        x:FieldModifier="private">
+                    <Image Source="/Core.Common.Gui;component\Resources\SaveAsHH.png"/>
+                </Button>
+                <Button Name="ButtonMenuFileOpenProject"
+                        ToolTip="{x:Static properties:Resources.Ribbon_Command_Open}"
+                        AutomationProperties.AutomationId= "ButtonMenuFileOpenProject"
+                        Click="OnFileOpenClicked"
+                        x:FieldModifier="private">
+                    <Image Source="/Core.Common.Gui;component\Resources\openfolderHS.png"/>
+                </Button>
+            </StackPanel>
+            <StackPanel Grid.Column="2" Orientation="Horizontal">
+                <Button ToolTip="{x:Static properties:Resources.Ribbon_Show_Log}"
+                        Click="OnFileHelpShowLog_Clicked">
+                    <Image Source="/Core.Common.Gui;component\Resources\application_view_list.png"/>
+                </Button>
+                <Button Name="FileManualButton"
+                        ToolTip="{x:Static properties:Resources.Ribbon_Open_Manual}"
+                        Click="OnFileManual_Clicked"
+                        x:FieldModifier="private">
+                    <Image Source="/Core.Common.Gui;component\Resources\manual.png"/>
+                </Button>
+                <Button Name="AboutButton"
+                        ToolTip="{x:Static properties:Resources.Ribbon_About}"
+                        Click="OnAboutDialog_Clicked"
+                        x:FieldModifier="private">
+                    <Image Source="/Core.Common.Gui;component\Resources\information.png"/>
+                </Button>
+                <Button ToolTip="{x:Static properties:Resources.Ribbon_Exit}"
+                        Click="OnFileExitClicked">
+                    <Image Source="/Core.Common.Gui;component\Resources\ClosePreviewHH.png"/>
+                </Button>
+            </StackPanel>
+        </Grid>
     </Grid>
 </fluent:RibbonWindow>
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r3d088548dfdebfd5c3adbbd67075b42e134f5c03 -ra5e4ebcce8619e8154972b937bfde6495ade4836
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 3d088548dfdebfd5c3adbbd67075b42e134f5c03)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision a5e4ebcce8619e8154972b937bfde6495ade4836)
@@ -459,9 +459,6 @@
 
             FileManualButton.IsEnabled = File.Exists(settings.FixedSettings.ManualFilePath);
 
-            ButtonQuickAccessOpenProject.IsEnabled = ButtonMenuFileOpenProject.IsEnabled;
-            ButtonQuickAccessSaveProject.IsEnabled = ButtonMenuFileSaveProject.IsEnabled;
-
             UpdateRibbonExtensions(gui);
 
             ValidateItems();
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r3d088548dfdebfd5c3adbbd67075b42e134f5c03 -ra5e4ebcce8619e8154972b937bfde6495ade4836
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 3d088548dfdebfd5c3adbbd67075b42e134f5c03)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a5e4ebcce8619e8154972b937bfde6495ade4836)
@@ -227,16 +227,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap ClosePreviewHH {
-            get {
-                object obj = ResourceManager.GetObject("ClosePreviewHH", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Alles i&amp;nklappen.
         /// </summary>
         public static string Collapse_all {
@@ -395,16 +385,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap DocumentHS {
-            get {
-                object obj = ResourceManager.GetObject("DocumentHS", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to DynamicPropertyOrderEvaluationMethod heeft een incorrect aantal argumenten. Zou er één moeten zijn. Klasse: {0}..
         /// </summary>
         public static string DynamicPropertyOrderEvaluationMethod_incorrect_argument_count_must_be_one_string_argument_on_Class_0_ {
@@ -1095,16 +1075,6 @@
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
-        public static System.Drawing.Bitmap openfolderHS {
-            get {
-                object obj = ResourceManager.GetObject("openfolderHS", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
         public static System.Drawing.Bitmap OpenIcon {
             get {
                 object obj = ResourceManager.GetObject("OpenIcon", resourceCulture);
@@ -1325,15 +1295,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Weergeven/Verbergen.
-        /// </summary>
-        public static string Ribbon_GroupBox_Show_Hide {
-            get {
-                return ResourceManager.GetString("Ribbon_GroupBox_Show_Hide", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Berichten.
         /// </summary>
         public static string Ribbon_Messages {
@@ -1379,24 +1340,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Start.
-        /// </summary>
-        public static string Ribbon_TabItem_Start {
-            get {
-                return ResourceManager.GetString("Ribbon_TabItem_Start", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Beeld.
-        /// </summary>
-        public static string Ribbon_TabItem_View {
-            get {
-                return ResourceManager.GetString("Ribbon_TabItem_View", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
         public static System.Drawing.Icon Riskeer {
@@ -1407,16 +1350,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap SaveAsHH {
-            get {
-                object obj = ResourceManager.GetObject("SaveAsHH", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Opslaan als.
         /// </summary>
         public static string SaveFileDialog_Title {
@@ -1426,16 +1359,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap saveHS {
-            get {
-                object obj = ResourceManager.GetObject("saveHS", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Initialiseren van opgeslagen project.
         /// </summary>
         public static string SaveProjectActivity_ProgressTextStepName_InitializeSavedProject {
@@ -1544,16 +1467,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap SplashScreenBackground {
-            get {
-                object obj = ResourceManager.GetObject("SplashScreenBackground", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Project afsluiten.
         /// </summary>
         public static string StorageCommandHandler_ClosingProject_Title {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -r6a1093e75bdf23c60232116445c086ebb5319558 -ra5e4ebcce8619e8154972b937bfde6495ade4836
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 6a1093e75bdf23c60232116445c086ebb5319558)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision a5e4ebcce8619e8154972b937bfde6495ade4836)
@@ -121,30 +121,18 @@
     <value>Eigenschappen</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="SplashScreenBackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\SplashScreenBackground.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Ribbon_Command_New" xml:space="preserve">
     <value>Nieuw</value>
   </data>
   <data name="App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Riskeer_Please_close_the_other_instance_first" xml:space="preserve">
     <value>Kan niet meerdere instanties van Riskeer starten. Sluit eerst de andere instantie.</value>
   </data>
-  <data name="ClosePreviewHH" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ClosePreviewHH.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="exclamation" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="App_Unhandled_exception" xml:space="preserve">
     <value>Onbekende kritieke fout opgetreden.</value>
   </data>
-  <data name="Ribbon_GroupBox_Show_Hide" xml:space="preserve">
-    <value>Weergeven/Verbergen</value>
-  </data>
-  <data name="openfolderHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\openfolderHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Ribbon_Command_Save" xml:space="preserve">
     <value>Opslaan</value>
   </data>
@@ -160,18 +148,12 @@
   <data name="application_view_list" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\application_view_list.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="DocumentHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DocumentHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="ApplicationFeatureiCommandHandler_OpenLogFileExternal_Unable_to_open_log_file_Opening_log_file_directory_instead" xml:space="preserve">
     <value>Het is niet mogelijk het logbestand te openen. In plaats hiervan wordt de folder waarin het logbestand staat geopend.</value>
   </data>
   <data name="DeleteIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>../Resources/DeleteHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="saveHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\saveHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="GuiImportHandler_SelectImportInfo_No_importer_available_for_this_item_0_" xml:space="preserve">
     <value>Geen enkele 'Importer' is beschikbaar voor dit element ({0}).</value>
   </data>
@@ -202,18 +184,12 @@
   <data name="Creating_new_project_successful" xml:space="preserve">
     <value>Nieuw project aanmaken is gelukt.</value>
   </data>
-  <data name="Ribbon_TabItem_View" xml:space="preserve">
-    <value>Beeld</value>
-  </data>
   <data name="Ribbon_Open_Manual" xml:space="preserve">
     <value>Gebruikershandleiding Openen</value>
   </data>
   <data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SaveAsHH" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\SaveAsHH.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="GuiCore_Run_Started_in_0_f2_sec" xml:space="preserve">
     <value>Gestart in {0:f2} seconden.</value>
   </data>
@@ -502,9 +478,6 @@
   <data name="ProjectIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\project-16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Ribbon_TabItem_Start" xml:space="preserve">
-    <value>Start</value>
-  </data>
   <data name="GuiExportHandler_GetSupportedExportInfoUsingDialog_Select_exporter" xml:space="preserve">
     <value>Kies wat u wilt exporteren</value>
   </data>