Improve settings for labels and moves