Added classes back to template