Further work on unified header and footer