23 expend collapse

Fixed Expand and Collapse Issue. please review code changes.

@rsaravind @vinoopraj