Fixed Expand/Collapse issues on Grid Widget