Small fixes to flow and view
Small fix to updateEvent event listener
Various fixes to view and controller