Fiddling with collapseRow logic