Format changes, small fixes to bring templates between espace and fez into alignment

[#62818578]