Add in better panning and zooming