Fixing headers and footers again