diff --git a/CPAP-Exporter.UI/Pages/SelectNights/SelectNightsViewModel.cs b/CPAP-Exporter.UI/Pages/SelectNights/SelectNightsViewModel.cs
index bc4afa6..ef53f59 100644
--- a/CPAP-Exporter.UI/Pages/SelectNights/SelectNightsViewModel.cs
+++ b/CPAP-Exporter.UI/Pages/SelectNights/SelectNightsViewModel.cs
@@ -3,9 +3,7 @@
 using System.ComponentModel;
 using System.IO;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 
@@ -33,6 +31,7 @@ public class SelectNightsViewModel : PageViewModel
         /// </summary>
         public SelectNightsViewModel() : base(Resources.PageTitle_SelectNights, Resources.PageDesc_SelectNights)
         {
+            this.ReservedNotificationHeight = 50;
         }
 
         public SelectNightsViewModel(ExportParameters exportParameters) : this()
@@ -158,7 +157,6 @@ public void LoadFromFolder(string folder, bool replaceExisting)
             this.IsBusy = true;
             this.ShowBusyStatus();
             this.ExportParameters.SourcePath = folder;
-            ApplicationComponentProvider.Status.StatusText = string.Format(Resources.ReadingFolder, folder);
 
             // Prepare to load reports
             List<DailyReport> reports = null;
@@ -171,7 +169,7 @@ public void LoadFromFolder(string folder, bool replaceExisting)
             }
             catch (Exception ex)
             {
-                ApplicationComponentProvider.Status.StatusText += ex.ToString();
+                Application.Current.Dispatcher.Invoke(() => { this.StatusContent = new ErrorToast(ex.Message); });
             }
 
             // And now it's time to process them.
@@ -260,8 +258,6 @@ public void Work()
                 return;
             }
 
-            ApplicationComponentProvider.Status.StatusText = Resources.Working;
-
             Task.Run(() =>
             {
                 this.LoadFromFolder(this.ExportParameters.SourcePath, this.ClearReportsBeforeAdding);
diff --git a/CPAP-Exporter.UI/Pages/SelectSignals/SelectSignalsViewModel.cs b/CPAP-Exporter.UI/Pages/SelectSignals/SelectSignalsViewModel.cs
index 8861fc4..7753718 100644
--- a/CPAP-Exporter.UI/Pages/SelectSignals/SelectSignalsViewModel.cs
+++ b/CPAP-Exporter.UI/Pages/SelectSignals/SelectSignalsViewModel.cs
@@ -13,6 +13,7 @@ public class SelectSignalsViewModel : PageViewModel
 
         public SelectSignalsViewModel() : base(Resources.PageTitle_SelectSignals, Resources.PageDesc_SelectSignals)
         {
+            this.ReservedNotificationHeight = 50;
         }
 
         public SelectSignalsViewModel(ExportParameters exportParameters) : this()
diff --git a/CPAP-Exporter.UI/Views/PageView.xaml b/CPAP-Exporter.UI/Views/PageView.xaml
index b3c2a13..839e505 100644
--- a/CPAP-Exporter.UI/Views/PageView.xaml
+++ b/CPAP-Exporter.UI/Views/PageView.xaml
@@ -16,8 +16,8 @@
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
                 <RowDefinition Height="Auto" />
+                <RowDefinition MinHeight="{Binding CurrentView.DataContext.ReservedNotificationHeight}" />
             </Grid.RowDefinitions>
 
             <TextBlock
@@ -50,6 +50,7 @@
             <local:AuraPresenter
                 x:Name="StatusHost"
                 Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2"
+                VerticalAlignment="Top"
                 Visibility="{Binding CurrentView.DataContext.StatusContent, Converter={StaticResource NullableObjectToVisibilityConverter}}"
                 Content="{Binding CurrentView.DataContext.StatusContent}">
                 <local:AuraPresenter.StylingCueProvider>