Refactored Pages