more UX improvements