Make header better
Merge branch 'make-header-better'