Updated row-fluid related changes