viewability toggle fixes, template updates