Improve control labeling