* Refactor reporting module
* Update theme