Finishing the style changes for the class switch