Fix labels not moving to the right places