A few more CSS class updates

#2086