Improved grouping UI