Tweak title spacing
Tweak title wrapping
Merge branch 'master' into dev