minor changes for edit/cancel and empty rows