RD-2037 Tree component - improved UI