Improved page routing