User management screen update and some bug fix