Refactor of UI/SvgTree