sortiment changes and some images
resolved conflicts
added some images