Clean up
Fix Reporting form look