Changed views to use event delegation, added in tests for this