Fix header style bugs