Editor improvements
New tree logic, collapsible tree