added various includesand modified default layout