Fixed many bugs in user jounrney