Minor fixes in header and footer