Panning and zooming now work properly again