modify views and user flow