improve the header layout
Merge branch 'develop'