Moving header and footer calls to layout files
Moving includes to common header and footer to layout file