Improved zooming + better tracking of current page