Some UI bug changed