Adding in proper class names, and class styles