Fixing issue with header and footer