Added more classes and skeleton elements