Handle partial presence of roles, stages and options. Increase column margins.