Added ability to use subpages
Small cosmetic changes