Added more classnames to HTML