remove todos on job page
working through some of the display issues
Merge remote-tracking branch 'origin/develop' into develop