Fixes in the reports and main page