update design modify some bugs
merge