Moved header/footer code out of pages and to where it needed to be.