Revert "Revert "Changes to pages""

This reverts commit 3a847586bb9c7fac02c53567cac3eb174e77e72e.
revert to f6f85176f81c324c85374e988af138f13b7c8606
boh