update header layout
clean up layout and design
Merge branch 'develop', remote-tracking branch 'origin'