Added zooming and improved panning