Cleaned up header and footer