Update pages. See main branch for changes