Refactored templates and fixed event selection trigged display issues