big changes to template design, tweaks made around other classes