Fix bug and UI enhancement