[New] changes in form and tree view