Added remove row and fixed context of local event handlers