Updated layout, include and page files to v4.0
Merge pull request #46 from pjackson28/master

Updated layout, include and page files to v4.0