updated with row-fluid fix