#21 Working on report view page