removed unused templates
updated fields
added filter for approved events