Some UI bug fixed