Refactor page structure