ReportGenerator and UI updates