page layouts moved to standard layout folder, various code enhancements