#6 New adjustments in header and footer