Improve multipage navigation