Refactor select page