Condensing employment down to 4 steps (from 5)

This is consistent with earlier prototypes and a user story to move the
address capture into the main employment details