refactor pagepart bundle