Improved job model code; adapted client partials