Some organization of code

Organization of te code, to support non-conflict mode.
This way is easy to extend the component with more features (like open a branch or find a tree element etc)
Modified the less code, as the vertical line was too long on the last elements.