Refactored pages