Added zooming, fixed various panning issues