Improve image interaction