add more UX improvements