Items are now grouped by group and using proper names.