* Refactor reporting module
* Update reporting template
* Fix minor bugs