Refactored pages design