nicer formatting for titles
Merge branch 'titles/better_display'