Improve new header titles. Fix #102