order page refactoring