Modified UI to support the new groupBy features.