Groups are now sorted by name and by type