more pages refactored