Bug fixes and adjusting the image size