Changed to simpler header and footer