Added classes and tweaked items