Pages page refactored