#19871 Implement new jobs view - code cleanup