More intelligent header label sizing
Merge branch 'better-headers' into develop