Fixed row() and remove_row() bugs