Making cosnsistant layout, added more fields to jobs (observers, etc)