lots of changes on layouts to add header and footer support