add subpages back, and start fixing other issues around Entity Page Areas and context