Added zoom, fixed pan