minor template formatting and fixes
Merge remote-tracking branch 'origin/master' into andy-edits