Moved event to the template that it occurs in
Trying to fix the way click actions are occuring