Collapse Expand Nodes integrated

Fixed Bugs