Modifications for simplified presentation
Changes to expand appropriate entries in the tree.