Further CSS class name fixes