REFACTOR: Refactored pages new