More enhancements and new report layout.