add style class and fix style bugs