I agree with that improvement.
Same think could apply for label color.