Fix UI bug
Change UI