Additional changes for footer and header