Fix for our header and footer woes