Show nicer group names, more work on grouping