Added user list, added client edit