incorporated Zhexi's jobs_view and changes to job