fix edit and new