Feature 12 tree widget retain structure

See Issue #12 for comments.