some UX improvements