Extracted header and footer from master template
Updated master layout, footer is final