Moved groupbars to staff-picks