Added users list
Modified several components