Changed some images, fixed some bugs