Added event delegation for data-view and data-action