Remove unnecessary decorator and add JQuery highlight for events