Updated Footer and Header work