diff --git a/src/MayShow.Shared/Views/CreatePDFReportView.axaml b/src/MayShow.Shared/Views/CreatePDFReportView.axaml
index 728ec32..a1c4e40 100644
--- a/src/MayShow.Shared/Views/CreatePDFReportView.axaml
+++ b/src/MayShow.Shared/Views/CreatePDFReportView.axaml
@@ -15,20 +15,16 @@
   </UserControl.Resources>
   <Grid ColumnDefinitions="*"
         RowDefinitions="Auto, 2*, Auto, Auto, *">
-    <Button Command="{Binding ReturnToMainMenu}"
-            Grid.Row="0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            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"/>
+        <Button Command="{Binding ReturnToMainMenu}"
+                Grid.Row="0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Margin="4,4,0,4">
+            <TextBlock><Run Text="&#xf060;" FontFamily="{StaticResource FontAwesomeSolid}"/> Return to Main Menu</TextBlock>
+        </Button>
         <Grid ColumnDefinitions="Auto, *"
               Margin="4,0,0,0">
             <Button Content="Choose Receipt Folder"
diff --git a/src/MayShow.Shared/Views/EditFile.axaml b/src/MayShow.Shared/Views/EditFile.axaml
index 4db5c22..2902db7 100644
--- a/src/MayShow.Shared/Views/EditFile.axaml
+++ b/src/MayShow.Shared/Views/EditFile.axaml
@@ -11,47 +11,52 @@
              xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
              x:DataType="vm:EditFileViewModel"
              MaxWidth="350">
-    <ScrollViewer AllowAutoHide="False">
-        <StackPanel Orientation="Vertical"
-                    Spacing="4"
-                    Margin="12,4,12,0">
-            <Label Content="Edit File Details"
-                    HorizontalAlignment="Center"
-                    FontSize="16"
-                    FontWeight="Bold" />
-            <Label Content="Title" />
-            <TextBox Watermark="Title"
-                        Text="{Binding ClonedFile.Title}"
-                        VerticalAlignment="Stretch"
-                        TextWrapping="Wrap" />
-            <Label Content="Notes" />
-            <TextBox Watermark="Notes"
-                        Text="{Binding ClonedFile.Notes}"
-                        VerticalAlignment="Stretch"
-                        AcceptsReturn="True"
-                        ScrollViewer.AllowAutoHide="False"
-                        Height="75" />
-            <Label Content="Receipt Date" />
-            <Calendar SelectionMode="SingleDate"
-                        SelectedDate="{Binding ClonedFile.ReceiptDateTime}" 
-                        DisplayDate="{Binding ClonedFile.ReceiptDateTime}"
-                        IsTodayHighlighted="False" />
-            <StackPanel Orientation="Horizontal"
-                        Spacing="12"
-                        Margin="0,4,0,0"
-                        HorizontalAlignment="Right">
-                <Button Command="{Binding Cancel}">
-                    <TextBlock>
-                        <Run Text="&#xf0e2;"
-                            FontFamily="{StaticResource FontAwesomeSolid}" /> Cancel</TextBlock>
-                </Button>
-                <Button Command="{Binding Save}"
-                        Classes="accent">
-                    <TextBlock>
-                        <Run Text="&#xf0c7;"
-                            FontFamily="{StaticResource FontAwesomeSolid}" /> Save</TextBlock>
-                </Button>
+    <Grid RowDefinitions="Auto, *, Auto">
+        <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}"
+                            VerticalAlignment="Stretch"
+                            TextWrapping="Wrap" />
+                <Label Content="Notes" />
+                <TextBox Watermark="Notes"
+                            Text="{Binding ClonedFile.Notes}"
+                            VerticalAlignment="Stretch"
+                            AcceptsReturn="True"
+                            ScrollViewer.AllowAutoHide="False"
+                            Height="75" />
+                <Label Content="Receipt Date" />
+                <Calendar SelectionMode="SingleDate"
+                            SelectedDate="{Binding ClonedFile.ReceiptDateTime}" 
+                            DisplayDate="{Binding ClonedFile.ReceiptDateTime}"
+                            IsTodayHighlighted="False" />
             </StackPanel>
+        </ScrollViewer>
+        <StackPanel Orientation="Horizontal"
+                    Spacing="12"
+                    Margin="0,8,0,0"
+                    Grid.Row="2"
+                    HorizontalAlignment="Right">
+            <Button Command="{Binding Cancel}">
+                <TextBlock>
+                    <Run Text="&#xf0e2;"
+                        FontFamily="{StaticResource FontAwesomeSolid}" /> Cancel</TextBlock>
+            </Button>
+            <Button Command="{Binding Save}"
+                    Classes="accent">
+                <TextBlock>
+                    <Run Text="&#xf0c7;"
+                        FontFamily="{StaticResource FontAwesomeSolid}" /> Save</TextBlock>
+            </Button>
         </StackPanel>
-    </ScrollViewer>
+    </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/MayShow.Shared/Views/StartNewChooseReport.axaml b/src/MayShow.Shared/Views/StartNewChooseReport.axaml
index c969fc2..a4501ec 100644
--- a/src/MayShow.Shared/Views/StartNewChooseReport.axaml
+++ b/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" />