Fix bug, modify UI