Updated template to put all class names on one line