Replaced tree with new widget