[update] fixed some UX problems