Used ```Html::addCssClass``` and ```Html::removeCssClass``` more effectively.