UI bug fixed