Some class name fixing (CSS needs work!)