- rewrite of report page
- bug fix