Added some layouts and test pages