fixed layout for jobs page
updated jobs page, and merging branches