CORE-347 improved tree redesign and added missing items
CORE-347 tree items improvements
Merge pull request #2097 from reciprocity/feature/tree-improve

CORE-347 improved tree redesign and added missing items