add class and fix span