Fix layout in headers