changed screen UserFlow to improve usability