Fix merge conflict
More headline height rules
Charcount on tail headlines
More headline heights
Fix merge conflict
Fix merge conflict