Added even more sub-page support
Fully implemented sub-page support