Latest clean up and now with a Job View page!