ref #6694 Improve UI and feature tree creation