Fixed class break issue, label positioning