Added basic routes and layouts for non-core pages
merge