Fixed bug with report page
Updated templates