Template updates to be slightly easier to edit.