Improve labels