Refactored ZoomTo method