Fixes to templates and overall improvement of font use