Continued work on new tree widget