Added page order support for subpages; Misc tweaks