Redo ReportViewer class