Add missing class names
Update styles and template classes