Some bug fixed in UI