Merge pull request #155 from kordero/job_view_fixes

Job view fixes for #142
done the job
Merge pull request #156 from qboss/19716

Code Review for Job #19716