Add more fields to job and changed layout