- initial refactoring for the Job Screens