Reformat header and footer HTML. #1810