Panning and Scrolling now working correctly