Improve handling of row divs