CSS cleanup, update some class names