Refactored site tables (events) templates