:lipstick: Improve label display