fix self references in short methods
add icon container to nodes
remove toggle handle from tree nodes, if no selectable children
available
add container around selection list