added neat layout to header widths
Merge branch 'layout'