Fix some UX
impmrove UX