Label position fixes