Pass router reference to view
Main view event handling fixes