Added panning and zooming