small refactoring
Many changes in tree + tree toolbar