Integrated the header and footer from master in skeleton
updated class names, merged more of master templates into skeleton