Refactored report screens