fix up templates to make things look right