Simplified close method and fixed issue with original image view rect