pages refactored