Refactored page layout