fix bugs and change user view