small cleanup and added NavigateToView event.