created JobTypes and converted to haml, also some spacing issues