modified for row-fluid issue