AUI-1651 Group Scheduler Controls Into One Bar