Added icons and skeleton