Page link refactor along with the page selector module