small template tweaks