moved more classnames
fix
fix merge conflicts