Replaced letter codes with status icons
Removed redundant component