Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -ra5e4ebcce8619e8154972b937bfde6495ade4836 -r01bc18ea6df0cbf06f5086d77b9f772857c924ec
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision a5e4ebcce8619e8154972b937bfde6495ade4836)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 01bc18ea6df0cbf06f5086d77b9f772857c924ec)
@@ -20,8 +20,7 @@
 Stichting Deltares and remain full property of Stichting Deltares at all times.
 All rights reserved.
 -->
-<fluent:RibbonWindow
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
         xmlns:fluent="clr-namespace:Fluent;assembly=Fluent"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
@@ -60,19 +59,13 @@
     
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
             <RowDefinition Height="30"/>
         </Grid.RowDefinitions>
 
-        <fluent:Ribbon Focusable="True" x:Name="Ribbon" AutomaticStateManagement="False" x:FieldModifier="protected">
+        <viewHost:AvalonDockViewHost Grid.Row="0" x:Name="AvalonDockViewHost" />
 
-        </fluent:Ribbon>
-
-        <viewHost:AvalonDockViewHost Grid.Row="1" x:Name="AvalonDockViewHost" />
-
-        <Grid Grid.Row="3">
+        <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="100"/>
                 <ColumnDefinition Width="160"/>
@@ -140,4 +133,4 @@
             </StackPanel>
         </Grid>
     </Grid>
-</fluent:RibbonWindow>
+</Window>