refactored report generation form page(s)