fix main tree, add equipment widget and fix users model