add some other code improvemnts related to users screen