Headers and footers more consistent