Update header line heights
Fix merge conflict with webwire
Fix merge conflict with webwire