Improved the display labels