More template tweaks
More template fixes