Small fix
Changes to view and flow