Fix heading display and indent
Merge branch '2013_rewrite'