More edits on header and footer