Small fixes on header and footer