Edit options not working - low priority #20