lots of changes to subpages