Updated structure in all template files

Updated the header/footer structure in all template files