Added icons to entries and groups with a mapping Created a Converter to handle pluralization Several UI enhancements