#580, #581 Editable options grid modifications