Fix the header, footer bugs