Some layout enhancements in TreeView