src/MayShow.Shared/ViewModels/CreatePDFReportViewModel.cs

@@ -340,11 +340,6 @@ class CreatePDFReportViewModel : BaseViewModel, ICanCheckShutdown, ILogger
         }
         NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled));
     }
-    
-    public void ShowAbout()
-    {
-        DialogHost.Show(new AboutViewModel());
-    }
 
     public async Task ShowSettings()
     {

src/MayShow.Shared/ViewModels/StartNewChooseReportViewModel.cs

@@ -130,6 +130,21 @@ class StartNewChooseReportViewModel : BaseViewModel, ICanCheckShutdown, IUpdateR
             await _settings.SaveSettingsAsync(); // update saved items list
         }
     }
+    
+    public void ShowAbout()
+    {
+        DialogHost.Show(new AboutViewModel());
+    }
+
+    public async Task ShowSettings()
+    {
+        var updatedSettings = await DialogHost.Show(new SettingsViewModel(_settings, TopLevelGrabber));
+        if (updatedSettings != null)
+        {
+            _settings = (Settings)updatedSettings;
+            await _settings.SaveSettingsAsync();
+        }
+    }
 
     public async Task<bool> CheckIsSafeToShutdown()
     {

src/MayShow.Shared/Views/CreatePDFReportView.axaml

@@ -15,20 +15,6 @@
   </UserControl.Resources>
   <Grid ColumnDefinitions="*"
         RowDefinitions="Auto, 2*, Auto, Auto, *">
-    <Button Command="{Binding ShowSettings}"
-            Grid.Row="0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Margin="4,4,0,4">
-        <TextBlock><Run Text="&#xf013;" FontFamily="{StaticResource FontAwesomeSolid}"/> Settings</TextBlock>
-    </Button>
-    <Button Command="{Binding ShowAbout}"
-            Grid.Row="0"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Top"
-            Margin="0,4,4,4">
-        <TextBlock><Run Text="&#xf059;" FontFamily="{StaticResource FontAwesomeSolid}"/> About</TextBlock>
-    </Button>
     <StackPanel Orientation="Vertical"
                 Spacing="2"
                 Margin="0,4,0,0">

src/MayShow.Shared/Views/StartNewChooseReport.axaml

@@ -12,6 +12,22 @@
              x:DataType="vm:StartNewChooseReportViewModel">
     <Grid ColumnDefinitions="100, *, 100"
           RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, *">
+        <Button Command="{Binding ShowSettings}"
+                Grid.Row="0"
+                Grid.Column="0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Margin="4,4,0,4">
+            <TextBlock><Run Text="&#xf013;" FontFamily="{StaticResource FontAwesomeSolid}"/> Settings</TextBlock>
+        </Button>
+        <Button Command="{Binding ShowAbout}"
+                Grid.Row="0"
+                Grid.Column="2"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                Margin="0,4,4,4">
+            <TextBlock><Run Text="&#xf059;" FontFamily="{StaticResource FontAwesomeSolid}"/> About</TextBlock>
+        </Button>
         <TextBlock HorizontalAlignment="Center"
                    FontSize="36"
                    FontWeight="Bold"