Some improvements for grid-row