Improve display of labels