Patch 1

Ok this time I branched the correct file and builtin my changes that allow collapsing rows.