Improve label display and styling