UI bug fixing