Adjustments on ViewReport class