Added a few tweaks making pinch zoom work better