Reorganized how infopage is built