Make changes on header and footer issues