Refined header/footer include and content injection

No longer including header/footer in separate files. All are now in same with section for content