some mroe header and footer changes