refactor page names
expand results page, refactoring

things getting to shape!
correct page flow