#21 working on report view page