Expand/Collapse functionality now working