Added classes and removed placeholders