More fixes

Fixed all of the remaining problems David had. All tests still pass.

Post a job is still in the nav-menu because that change is in my other pull request.