REFACTOR: Refactored pages