Fixed header and footer again