Modified the images and made some bug fixing