Improved pageStack navigation