Change status_order and step to status_groups and group