a bit of design for header
Merge branch 'redesign'