Cleaned up bugs for the image view