#21 Fixing reports page bugs