Pages, header and footer cleanup