Updated templates: move click event to th extension template