Now cancels the editing of the ingredients properly
also, other fixes as suggested by Vova