Fixed header and footer issues