completed refactor on select pages