some changes to UX
fixed some UX