Fixing images and remove button