Fixed some name spavin'.
Fixed changing a template rendering the add callout button funky.