Fixed add/edit item