fixed roolback bug
fixed some ui