Moved some code around
Fixed bug with updating the JTree
Fixed bug with duplicate entry in the user list
Fixed bug with user list order