Fixing the issue with header and footer