change user status indicator

and some refactoring