Refactor page layout