made the jobs based on the model rather than just using divs
resolved conflict