- Some UI bug fixed