grid row modified + fixes