fixed async save problem and added toast for save