diff --git a/Views/MainView.axaml b/Views/MainView.axaml
index fe707a6..c5e4594 100644
--- a/Views/MainView.axaml
+++ b/Views/MainView.axaml
@@ -54,10 +54,22 @@
                                 Binding="{Binding Title}"
                                 IsReadOnly="False"
                                 Width="*"/>
-            <DataGridTextColumn Header="Receipt Date"  
-                                Binding="{Binding ReceiptDate}"
-                                IsReadOnly="True"
-                                Width="*"/>
+            <DataGridTemplateColumn Header="Receipt Date"
+                                IsReadOnly="False"
+                                Width="*">
+                <DataGridTemplateColumn.CellTemplate>
+                    <DataTemplate>
+                        <Label Content="{Binding ReceiptDate}" 
+                               VerticalAlignment="Center"/>
+                    </DataTemplate>
+                </DataGridTemplateColumn.CellTemplate>
+                <DataGridTemplateColumn.CellEditingTemplate>
+                    <DataTemplate DataType="models:ReportFile">
+                        <CalendarDatePicker SelectedDate="{Binding ReceiptDateTime}"
+                                            DisplayDate="{Binding ReceiptDateTime}"/>
+                    </DataTemplate>
+                </DataGridTemplateColumn.CellEditingTemplate>
+            </DataGridTemplateColumn>
             <DataGridTextColumn Header="File Name" 
                                 Binding="{Binding FileName}"
                                 IsReadOnly="True"
@@ -95,6 +107,8 @@
         <DataGrid.RowDetailsTemplate>
             <DataTemplate x:DataType="models:ReportFile">
                 <TextBlock TextWrapping="Wrap" Margin="4,4,4,0">
+                    <Run FontWeight="Bold" Text="File Name"/>: <Run Text="{Binding FileName}"/>
+                    <LineBreak/>
                     <Run FontWeight="Bold" Text="Notes"/>: <Run Text="{Binding Notes}"/>
                 </TextBlock>
             </DataTemplate>