More small template tweaks.