src/MayShow.Shared/Views/CreatePDFReportView.axaml

@@ -15,6 +15,9 @@
   </UserControl.Resources>
   <Grid ColumnDefinitions="*"
         RowDefinitions="Auto, 2*, Auto, Auto, *">
+    <StackPanel Orientation="Vertical"
+                Spacing="2"
+                Margin="0,4,0,0">
         <Button Command="{Binding ReturnToMainMenu}"
                 Grid.Row="0"
                 HorizontalAlignment="Left"
@@ -22,13 +25,6 @@
                 Margin="4,4,0,4">
             <TextBlock><Run Text="&#xf060;" FontFamily="{StaticResource FontAwesomeSolid}"/> Return to Main Menu</TextBlock>
         </Button>
-    <StackPanel Orientation="Vertical"
-                Spacing="2"
-                Margin="0,4,0,0">
-        <Label Content="MayShow: Report Builder"
-               FontSize="20"
-               FontWeight="Bold"
-               HorizontalAlignment="Center"/>
         <Grid ColumnDefinitions="Auto, *"
               Margin="4,0,0,0">
             <Button Content="Choose Receipt Folder"

src/MayShow.Shared/Views/EditFile.axaml

@@ -11,14 +11,17 @@
              xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
              x:DataType="vm:EditFileViewModel"
              MaxWidth="350">
-    <ScrollViewer AllowAutoHide="False">
+    <Grid RowDefinitions="Auto, *, Auto">
-        <StackPanel Orientation="Vertical"
-                    Spacing="4"
-                    Margin="12,4,12,0">
         <Label Content="Edit File Details"
+               Grid.Row="0"
                HorizontalAlignment="Center"
                FontSize="16"
                FontWeight="Bold" />
+        <ScrollViewer AllowAutoHide="False"
+                      Grid.Row="1">
+            <StackPanel Orientation="Vertical"
+                        Spacing="4"
+                        Margin="12,4,12,0">
                 <Label Content="Title" />
                 <TextBox Watermark="Title"
                             Text="{Binding ClonedFile.Title}"
@@ -36,9 +39,12 @@
                             SelectedDate="{Binding ClonedFile.ReceiptDateTime}" 
                             DisplayDate="{Binding ClonedFile.ReceiptDateTime}"
                             IsTodayHighlighted="False" />
+            </StackPanel>
+        </ScrollViewer>
         <StackPanel Orientation="Horizontal"
                     Spacing="12"
-                        Margin="0,4,0,0"
+                    Margin="0,8,0,0"
+                    Grid.Row="2"
                     HorizontalAlignment="Right">
             <Button Command="{Binding Cancel}">
                 <TextBlock>
@@ -52,6 +58,5 @@
                         FontFamily="{StaticResource FontAwesomeSolid}" /> Save</TextBlock>
             </Button>
         </StackPanel>
-        </StackPanel>
+    </Grid>
-    </ScrollViewer>
 </UserControl>

src/MayShow.Shared/Views/StartNewChooseReport.axaml

@@ -38,7 +38,7 @@
         </TextBlock>
         <Image Source="avares://MayShow/Assets/MayShowIcon.png" 
                Width="125"
-               Margin="0,24,0,0"
+               Margin="0,12,0,0"
                HorizontalAlignment="Center"
                Grid.Column="1"
                Grid.Row="1" />