Refactored page