Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -r78333ca12bf530e439a5dcdb655714d799a0ce12 -r9bf385f7c9ad886edabf3e7e0a5a977fd2e18a03
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 78333ca12bf530e439a5dcdb655714d799a0ce12)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 9bf385f7c9ad886edabf3e7e0a5a977fd2e18a03)
@@ -14,7 +14,6 @@
     FlowDirection="LeftToRight"
     Loaded="MainWindow_OnLoaded">
 
-    <!--ShortCut keys-->
     <Window.CommandBindings>
         <CommandBinding Command="New"  Executed="OnFileNewClicked" />
         <CommandBinding Command="Save"  Executed="OnFileSaveClicked" />
@@ -109,7 +108,7 @@
                                 <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 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 Name ="LicenseButton" Header="{x:Static Properties:Resources.Ribbon_License}" Icon="/Core.Common.Gui;component\Resources\information.png" fluent:KeyTip.Keys="L" Click="OnFileHelpLicense_Clicked" />
-                                <fluent:Button Name ="AboutButton" Header="{x:Static Properties:Resources.Ribbon_About}" Icon="/Core.Common.Gui;component\Resources\information.png" fluent:KeyTip.Keys="A" />
+                                <fluent:Button 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:Button Name ="FeedbackButton" Header="{x:Static Properties:Resources.Ribbon_Submit_Feedback}" Icon="/Core.Common.Gui;component\Resources\feedback.png" fluent:KeyTip.Keys="F" Click="OnFileHelpSubmitFeedback_Clicked" />
                             </fluent:BackstageTabControl>
                         </fluent:BackstageTabItem>
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -rc12ff7f28c27dd40613a002c2053f6457f40854a -r9bf385f7c9ad886edabf3e7e0a5a977fd2e18a03
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision c12ff7f28c27dd40613a002c2053f6457f40854a)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 9bf385f7c9ad886edabf3e7e0a5a977fd2e18a03)
@@ -951,13 +951,12 @@
             FileManualButton.IsEnabled = File.Exists(ConfigurationManager.AppSettings["manualFileName"]);
 
             // TODO: Enable as soon as relevant/implemented
-            AboutButton.IsEnabled = false;
             LicenseButton.IsEnabled = false;
             FeedbackButton.IsEnabled = false;
 
             ButtonQuickAccessOpenProject.IsEnabled = false;
             ButtonQuickAccessSaveProject.IsEnabled = false;
-            
+
             UpdateMainWindowRibbonElements();
             UpdateRibbonExtensions();
 
@@ -1172,16 +1171,6 @@
                 InitMessagesWindowOrActivate();
                 ButtonShowMessages.IsChecked = true;
             }
-
-/*
-            if (Gui.ToolWindowViews != null)
-            {
-                ButtonShowProperties.IsChecked = Gui.ToolWindowViews.Contains(PropertyGrid);
-            }
-
-            if()
-            ValidateMainWindowRibbonItems();
-*/
         }
 
         private void OnFileHelpStartPage_Clicked(object sender, RoutedEventArgs e)
@@ -1295,5 +1284,31 @@
         {
             resetDefaultLayout = resetUIButton.IsChecked ?? false;
         }
+
+        private void OnAboutDialog_Clicked(object sender, RoutedEventArgs e)
+        {
+            var aboutDialog = new SplashScreen.SplashScreen()
+            {
+                HasProgress = false,
+                VersionText = SettingsHelper.ApplicationVersion,
+                CopyrightText = Gui.Application.Settings["copyright"],
+                LicenseText = Gui.Application.Settings["license"],
+                CompanyText = SettingsHelper.ApplicationCompany,
+                AllowsTransparency = false,
+                WindowStyle = WindowStyle.SingleBorderWindow
+            };
+
+            aboutDialog.PreviewKeyDown += (s, ev) =>
+            {
+                if (ev.Key == Key.Escape)
+                {
+                    ev.Handled = true;
+                    aboutDialog.Close();
+                }
+            };
+
+            aboutDialog.ShowDialog();
+            
+        }
     }
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml
===================================================================
diff -u -r4a6a8a31c6c542576272e0b6cc0b322f940a4135 -r9bf385f7c9ad886edabf3e7e0a5a977fd2e18a03
--- Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml	(.../SplashScreen.xaml)	(revision 4a6a8a31c6c542576272e0b6cc0b322f940a4135)
+++ Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml	(.../SplashScreen.xaml)	(revision 9bf385f7c9ad886edabf3e7e0a5a977fd2e18a03)
@@ -19,13 +19,17 @@
         <Label x:Name="labelProgressMessage" Content="{x:Static Properties:Resources.SplashScreen_Starting}" HorizontalAlignment="Left" Margin="5,249,0,0" VerticalAlignment="Top" FontSize="9px" Foreground="Black" FontFamily="Arial" BorderBrush="Black" RenderTransformOrigin="0.51,-1.4"/>
         <Label x:Name="labelProgressBar" Content="0 %" Margin="0,274,0,0" VerticalAlignment="Top" HorizontalContentAlignment="Center" Padding="0" Height="18px" VerticalContentAlignment="Center" FontSize="9px" HorizontalAlignment="Right" Width="455"
                x:FieldModifier="protected" />
-        <Label x:Name="labelVersionTitle"  Content="{x:Static Properties:Resources.SplashScreen_Version}" Height="18px" HorizontalAlignment="Left" Margin="13,299,0,0" Padding="0"  VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial" FontWeight="Bold"/>
-        <Label x:Name="labelVersion" Content="1.0.0.0" Height="18px" HorizontalAlignment="Left" Margin="97,299,0,0" Padding="0" VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial" />
-        <Label x:Name="labelCompanyTitle" Content="{x:Static Properties:Resources.SplashScreen_Company}" Height="18px" HorizontalAlignment="Left" Margin="13,317,0,0" VerticalAlignment="Top" Padding="0" FontSize="10pt" FontFamily="Arial" FontWeight="Bold"/>
-        <Label x:Name="labelCompany" Content="Deltares" Height="18px" HorizontalAlignment="Left" Margin="97,317,0,0" Padding="0" VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial"/>
-        <Label x:Name="labelLicenseTitle" Content="{x:Static Properties:Resources.SplashScreen_License}" Height="18px" HorizontalAlignment="Left" Margin="13,335,0,0" Padding="0" VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial" FontWeight="Bold"/>
-        <Label x:Name="labelLicense" Content="{x:Static Properties:Resources.SplashScreen_Free}" Height="18px" HorizontalAlignment="Left" Margin="97,335,0,0" Padding="0" VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial"/>
-        <Label x:Name="labelCopyrightTitle" Content="{x:Static Properties:Resources.SplashScreen_CopyRights}" Height="18px" HorizontalAlignment="Left" Margin="13,353,0,0" Padding="0" VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial" FontWeight="Bold" />
-        <Label x:Name="labelCopyright" Content="© Deltares 2009-2015" Height="18px" HorizontalAlignment="Left" Padding="0" Margin="97,353,0,0" VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial"/>
+        <Border x:Name="labelsBox" Margin="10,300,230,16" >
+            <Grid>
+                <Label x:Name="labelVersionTitle"  Content="{x:Static Properties:Resources.SplashScreen_Version}" Height="18px" HorizontalAlignment="Left" Padding="0"  VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial" FontWeight="Bold"/>
+                <Label x:Name="labelVersion" Content="1.0.0.0" Height="18px" HorizontalAlignment="Left" Padding="0" VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial" Margin="84,0,0,0" />
+                <Label x:Name="labelCompanyTitle" Content="{x:Static Properties:Resources.SplashScreen_Company}" Height="18px" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="0" FontSize="10pt" FontFamily="Arial" FontWeight="Bold" Margin="0,18,0,0"/>
+                <Label x:Name="labelCompany" Content="Deltares" Height="18px" HorizontalAlignment="Left" Padding="0" VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial" Margin="84,18,0,0"/>
+                <Label x:Name="labelLicenseTitle" Content="{x:Static Properties:Resources.SplashScreen_License}" Height="18px" HorizontalAlignment="Left" Padding="0" VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial" FontWeight="Bold" Margin="0,36,0,0"/>
+                <Label x:Name="labelLicense" Content="{x:Static Properties:Resources.SplashScreen_Free}" Height="18px" HorizontalAlignment="Left" Padding="0" VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial" Margin="84,36,0,0"/>
+                <Label x:Name="labelCopyrightTitle" Content="{x:Static Properties:Resources.SplashScreen_CopyRights}" Height="18px" HorizontalAlignment="Left" Padding="0" VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial" FontWeight="Bold" Margin="0,54,0,0" />
+                <Label x:Name="labelCopyright" Content="© Deltares 2009-2015" Height="18px" HorizontalAlignment="Left" Padding="0" VerticalAlignment="Top" FontSize="10pt" FontFamily="Arial" Margin="84,54,0,0"/>
+            </Grid>
+        </Border>
     </Grid>
 </Window>
Index: Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml.cs
===================================================================
diff -u -r4a6a8a31c6c542576272e0b6cc0b322f940a4135 -r9bf385f7c9ad886edabf3e7e0a5a977fd2e18a03
--- Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml.cs	(.../SplashScreen.xaml.cs)	(revision 4a6a8a31c6c542576272e0b6cc0b322f940a4135)
+++ Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml.cs	(.../SplashScreen.xaml.cs)	(revision 9bf385f7c9ad886edabf3e7e0a5a977fd2e18a03)
@@ -162,10 +162,17 @@
             base.OnRender(drawingContext);
 
             var progressVisibility = (HasProgress) ? (Visibility.Visible) : (Visibility.Hidden);
+            
             progressBar.Visibility = progressVisibility;
             labelProgressBar.Visibility = progressVisibility;
             labelProgressMessage.Visibility = progressVisibility;
 
+            if (!HasProgress)
+            {
+                // missing progress bar leaves a gap between dike-picture above and labels below, fixing it by setting a new margin
+                labelsBox.Margin = new Thickness(labelsBox.Margin.Left, progressBar.Margin.Top, labelsBox.Margin.Right, labelsBox.Margin.Bottom);
+            }
+
             if (progressBar.Value != ProgressValuePercent)
             {
                 progressBar.Value = ProgressValuePercent;