Improve tree expand behavior
Improve tree behavior