Some major enhancements to reports and UI