Update header bar css
Resolve conflict