Some pages refactored