Updated layout, include and page files to v4.0