edit list still need some fixes