fix edit, add loading gif