Class name fix; more missing markup