Template tweaks

toaccomodate the differences between Foundation and Zoundation