Some labels moved to proper location