improve user edit and view