fixed more kinks re collapsing rows