Update AbstractView to the new event based design
Fix merge conflict