Fix layout issues with header style updates