Updated graphic inview event and updated templates