fix report page
fix edit bugs
modified report