Change size of images
Solved some conflicts