Change classes to simplify CSS