Zoom and pan behaviour fixed